# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1387209583 -3600
# Node ID 92fb71afdc0e5d1b14a2b5121ee807cf6ebaf3e8
# Parent  700087d2a5d34dd7816acc42c0b4919800214900
Moving implementation classes into org.netbeans.html namespace

diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/main/java/net/java/html/boot/fx/FXBrowsers.java
--- a/boot-fx/src/main/java/net/java/html/boot/fx/FXBrowsers.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/boot-fx/src/main/java/net/java/html/boot/fx/FXBrowsers.java	Mon Dec 16 16:59:43 2013 +0100
@@ -49,7 +49,7 @@
 import javafx.scene.web.WebView;
 import net.java.html.boot.BrowserBuilder;
 import net.java.html.js.JavaScriptBody;
-import org.apidesign.html.boot.fx.AbstractFXPresenter;
+import org.netbeans.html.boot.fx.AbstractFXPresenter;
 
 /** Utility methods for working with <em>JavaFX</em> <code>WebView</code>s.
  *
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/main/java/org/apidesign/html/boot/fx/AbstractFXPresenter.java
--- a/boot-fx/src/main/java/org/apidesign/html/boot/fx/AbstractFXPresenter.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.fx;
-
-import java.io.BufferedReader;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javafx.application.Platform;
-import javafx.scene.web.WebEngine;
-import javafx.scene.web.WebView;
-import netscape.javascript.JSObject;
-import org.apidesign.html.boot.spi.Fn;
-
-/**
- *
- * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- */
-public abstract class AbstractFXPresenter implements Fn.Presenter {
-    static final Logger LOG = Logger.getLogger(FXPresenter.class.getName());
-    protected static int cnt;
-    protected List<String> scripts;
-    protected Runnable onLoad;
-    protected WebEngine engine;
-
-    @Override
-    public Fn defineFn(String code, String... names) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("(function() {");
-        sb.append("  return function(");
-        String sep = "";
-        for (String n : names) {
-            sb.append(sep).append(n);
-            sep = ",";
-        }
-        sb.append(") {\n");
-        sb.append(code);
-        sb.append("};");
-        sb.append("})()");
-        if (LOG.isLoggable(Level.FINE)) {
-            LOG.log(Level.FINE, 
-                "defining function #{0}:\n{1}\n", 
-                new Object[] { ++cnt, code }
-            );
-        }
-        JSObject x = (JSObject) engine.executeScript(sb.toString());
-        return new JSFn(this, x, cnt);
-    }
-
-    @Override
-    public void loadScript(Reader code) throws Exception {
-        BufferedReader r = new BufferedReader(code);
-        StringBuilder sb = new StringBuilder();
-        for (;;) {
-            String l = r.readLine();
-            if (l == null) {
-                break;
-            }
-            sb.append(l).append('\n');
-        }
-        final String script = sb.toString();
-        if (scripts != null) {
-            scripts.add(script);
-        }
-        engine.executeScript(script);
-    }
-
-    protected final void onPageLoad() {
-        if (scripts != null) {
-            for (String s : scripts) {
-                engine.executeScript(s);
-            }
-        }
-        onLoad.run();
-    }
-
-    @Override
-    public void displayPage(final URL resource, final Runnable onLoad) {
-        this.onLoad = onLoad;
-        final WebView view = findView(resource);
-        this.engine = view.getEngine();
-        try {
-            if (FXInspect.initialize(engine)) {
-                scripts = new ArrayList<String>();
-            }
-        } catch (Throwable ex) {
-            ex.printStackTrace();
-        }
-
-        class Run implements Runnable {
-
-            @Override
-            public void run() {
-                if (scripts != null) {
-                    view.setContextMenuEnabled(true);
-                }
-                engine.load(resource.toExternalForm());
-            }
-        }
-        Run run = new Run();
-        if (Platform.isFxApplicationThread()) {
-            run.run();
-        } else {
-            Platform.runLater(run);
-        }
-        waitFinished();
-    }
-
-    protected abstract void waitFinished();
-
-    protected abstract WebView findView(final URL resource);
-
-    private static final class JSFn extends Fn {
-
-        private final JSObject fn;
-        private static int call;
-        private final int id;
-
-        public JSFn(AbstractFXPresenter p, JSObject fn, int id) {
-            super(p);
-            this.fn = fn;
-            this.id = id;
-        }
-
-        @Override
-        public Object invoke(Object thiz, Object... args) throws Exception {
-            try {
-                if (LOG.isLoggable(Level.FINE)) {
-                    LOG.log(Level.FINE, "calling {0} function #{1}", new Object[]{++call, id});
-                }
-                List<Object> all = new ArrayList<Object>(args.length + 1);
-                all.add(thiz == null ? fn : thiz);
-                all.addAll(Arrays.asList(args));
-                Object ret = fn.call("call", all.toArray()); // NOI18N
-                return ret == fn ? null : ret;
-            } catch (Error t) {
-                t.printStackTrace();
-                throw t;
-            } catch (Exception t) {
-                t.printStackTrace();
-                throw t;
-            }
-        }
-    }
-    
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/main/java/org/apidesign/html/boot/fx/Dbgr.java
--- a/boot-fx/src/main/java/org/apidesign/html/boot/fx/Dbgr.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.fx;
-
-import java.lang.reflect.Method;
-import java.util.logging.Level;
-import javafx.scene.web.WebEngine;
-import javafx.util.Callback;
-import static org.apidesign.html.boot.fx.AbstractFXPresenter.LOG;
-
-/** Debugger bridge to shield us from propriatory impl APIs.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-final class Dbgr {
-    final Object dbg;
-    final Method sendMsg;
-    
-    Dbgr(WebEngine eng, Callback<String,Void> callback) {
-        Object d;
-        Method m;
-        try {
-            d = eng.getClass().getMethod("impl_getDebugger").invoke(eng); // NOI18N
-            Class<?> debugger = eng.getClass().getClassLoader().loadClass("com.sun.javafx.scene.web.Debugger"); // NOI18N
-            debugger.getMethod("setEnabled", boolean.class).invoke(d, true); // NOI18N
-            debugger.getMethod("setMessageCallback", Callback.class).invoke(d, callback); // NOI18N
-            m = debugger.getMethod("sendMessage", String.class); // NOI18N
-        } catch (Exception ex) {
-            LOG.log(Level.INFO, null, ex);
-            d = null;
-            m = null;
-        }
-        dbg = d;
-        sendMsg = m;
-    }
-
-    void sendMessage(String msg) {
-        try {
-            if (dbg != null) {
-                sendMsg.invoke(dbg, msg);
-            }
-        } catch (Exception ex) {
-            LOG.log(Level.INFO, null, ex);
-        }
-    }
-    
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/main/java/org/apidesign/html/boot/fx/FXBrwsr.java
--- a/boot-fx/src/main/java/org/apidesign/html/boot/fx/FXBrwsr.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.fx;
-
-import java.net.URL;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executors;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javafx.application.Application;
-import javafx.application.Platform;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.concurrent.Worker;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
-import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.text.Text;
-import javafx.scene.web.WebEvent;
-import javafx.scene.web.WebView;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
-
-/** This is an implementation class, use {@link BrowserBuilder} API. Just
- * include this JAR on classpath and the {@link BrowserBuilder} API will find
- * this implementation automatically.
- */
-public class FXBrwsr extends Application {
-    private static final Logger LOG = Logger.getLogger(FXBrwsr.class.getName());
-    private static FXBrwsr INSTANCE;
-    private static final CountDownLatch FINISHED = new CountDownLatch(1);
-    private BorderPane root;
-
-    public static synchronized WebView findWebView(final URL url, final FXPresenter onLoad) {
-        if (INSTANCE == null) {
-            Executors.newFixedThreadPool(1).submit(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        FXBrwsr.launch(FXBrwsr.class);
-                    } catch (Throwable ex) {
-                        ex.printStackTrace();
-                    } finally {
-                        FINISHED.countDown();
-                    }
-                }
-            });
-        }
-        while (INSTANCE == null) {
-            try {
-                FXBrwsr.class.wait();
-            } catch (InterruptedException ex) {
-                // wait more
-            }
-        }
-        if (!Platform.isFxApplicationThread()) {
-            final WebView[] arr = {null};
-            final CountDownLatch waitForResult = new CountDownLatch(1);
-            Platform.runLater(new Runnable() {
-                @Override
-                public void run() {
-                    arr[0] = INSTANCE.newView(url, onLoad);
-                    waitForResult.countDown();
-                }
-            });
-            for (;;) {
-                try {
-                    waitForResult.await();
-                    break;
-                } catch (InterruptedException ex) {
-                    LOG.log(Level.INFO, null, ex);
-                }
-            }
-            return arr[0];
-        } else {
-            return INSTANCE.newView(url, onLoad);
-        }
-    }
-
-    @Override
-    public void start(Stage primaryStage) throws Exception {
-        synchronized (FXBrwsr.class) {
-            INSTANCE = this;
-            FXBrwsr.class.notifyAll();
-        }
-        BorderPane r = new BorderPane();
-        Scene scene = new Scene(r, 800, 600);
-        primaryStage.setScene(scene);
-        primaryStage.show();
-        this.root = r;
-    }
-
-    private WebView newView(final URL url, final FXPresenter onLoad) {
-        final WebView view = new WebView();
-        view.setContextMenuEnabled(false);
-        view.getEngine().setOnAlert(new EventHandler<WebEvent<String>>() {
-            @Override
-            public void handle(WebEvent<String> t) {
-                final Stage dialogStage = new Stage();
-                dialogStage.initModality(Modality.WINDOW_MODAL);
-                dialogStage.setTitle("Warning");
-                final Button button = new Button("Close");
-                final Text text = new Text(t.getData());
-                VBox box = new VBox();
-                box.setAlignment(Pos.CENTER);
-                box.setSpacing(10);
-                box.setPadding(new Insets(10));
-                box.getChildren().addAll(text, button);
-                dialogStage.setScene(new Scene(box));
-                button.setCancelButton(true);
-                button.setOnAction(new EventHandler<ActionEvent>() {
-                    @Override
-                    public void handle(ActionEvent t) {
-                        dialogStage.close();
-                    }
-                });
-                dialogStage.centerOnScreen();
-                dialogStage.showAndWait();
-            }
-        });
-        root.setCenter(view);
-        final Worker<Void> w = view.getEngine().getLoadWorker();
-        w.stateProperty().addListener(new ChangeListener<Worker.State>() {
-            @Override
-            public void changed(ObservableValue<? extends Worker.State> ov, Worker.State t, Worker.State newState) {
-                if (newState.equals(Worker.State.SUCCEEDED)) {
-                    onLoad.onPageLoad();
-                }
-                if (newState.equals(Worker.State.FAILED)) {
-                    throw new IllegalStateException("Failed to load " + url);
-                }
-            }
-        });
-        return view;
-    }
-
-    static void waitFinished() {
-        for (;;) {
-            try {
-                FINISHED.await();
-                break;
-            } catch (InterruptedException ex) {
-                LOG.log(Level.INFO, null, ex);
-            }
-        }
-    }
-    
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/main/java/org/apidesign/html/boot/fx/FXInspect.java
--- a/boot-fx/src/main/java/org/apidesign/html/boot/fx/FXInspect.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.fx;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.nio.charset.StandardCharsets;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javafx.application.Platform;
-import javafx.scene.web.WebEngine;
-import javafx.util.Callback;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-final class FXInspect implements Runnable {
-    private static final Logger LOG = Logger.getLogger(FXInspect.class.getName());
-    
-    
-    private final WebEngine engine;
-    private final ObjectInputStream input;
-    private Dbgr dbg;
-    
-    private FXInspect(WebEngine engine, int port) throws IOException {
-        this.engine = engine;
-        
-        Socket socket = new Socket(InetAddress.getByName(null), port);
-        ObjectOutputStream output = new ObjectOutputStream(socket.getOutputStream());
-        this.input = new ObjectInputStream(socket.getInputStream());
-        initializeDebugger(output);
-    }
-    
-    static boolean initialize(WebEngine engine) {
-        final int inspectPort = Integer.getInteger("netbeans.inspect.port", -1); // NOI18N
-        if (inspectPort != -1) {
-            try {
-                FXInspect inspector = new FXInspect(engine, inspectPort);
-                Thread t = new Thread(inspector, "FX<->NetBeans Inspector");
-                t.start();
-                return true;
-            } catch (IOException ex) {
-                LOG.log(Level.INFO, "Cannot connect to NetBeans IDE to port " + inspectPort, ex); // NOI18N
-            }
-        }
-        return false;
-    }
-    
-    private void initializeDebugger(final ObjectOutputStream output) {
-        Platform.runLater(new Runnable() {
-            @Override
-            public void run() {
-                dbg = new Dbgr(engine, new Callback<String,Void>() {
-                    @Override
-                    public Void call(String message) {
-                        try {
-                            byte[] bytes = message.getBytes(StandardCharsets.UTF_8);
-                            output.writeInt(bytes.length);
-                            output.write(bytes);
-                            output.flush();
-                        } catch (IOException ioex) {
-                            ioex.printStackTrace();
-                        }
-                        return null;
-                    }
-                });
-            }
-        });
-    }
-
-    @Override
-    public void run() {
-        try {
-            while (true) {
-                int length = input.readInt();
-                byte[] bytes = new byte[length];
-                input.readFully(bytes);
-                final String message = new String(bytes, StandardCharsets.UTF_8);
-                Platform.runLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        dbg.sendMessage(message);
-                    }
-                });
-            }
-        } catch (IOException ex) {
-            LOG.log(Level.WARNING, null, ex);
-        }
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/main/java/org/apidesign/html/boot/fx/FXPresenter.java
--- a/boot-fx/src/main/java/org/apidesign/html/boot/fx/FXPresenter.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.fx;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.Reader;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javafx.application.Platform;
-import javafx.scene.web.WebEngine;
-import javafx.scene.web.WebView;
-import net.java.html.boot.BrowserBuilder;
-import netscape.javascript.JSObject;
-import org.apidesign.html.boot.spi.Fn;
-import org.openide.util.lookup.ServiceProvider;
-
-/** This is an implementation class, use {@link BrowserBuilder} API. Just
- * include this JAR on classpath and the {@link BrowserBuilder} API will find
- * this implementation automatically.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@ServiceProvider(service = Fn.Presenter.class)
-public final class FXPresenter extends AbstractFXPresenter {
-    static {
-        try {
-            try {
-                Class<?> c = Class.forName("javafx.application.Platform");
-                // OK, on classpath
-            } catch (ClassNotFoundException classNotFoundException) {
-                Method m = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
-                m.setAccessible(true);
-                File f = new File(System.getProperty("java.home"), "lib/jfxrt.jar");
-                if (f.exists()) {
-                    URL l = f.toURI().toURL();
-                    m.invoke(ClassLoader.getSystemClassLoader(), l);
-                }
-            }
-        } catch (Exception ex) {
-            throw new LinkageError("Can't add jfxrt.jar on the classpath", ex);
-        }
-    }
-
-    protected void waitFinished() {
-        FXBrwsr.waitFinished();
-    }
-
-    protected WebView findView(final URL resource) {
-        return FXBrwsr.findWebView(resource, this);
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/main/java/org/netbeans/html/boot/fx/AbstractFXPresenter.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot-fx/src/main/java/org/netbeans/html/boot/fx/AbstractFXPresenter.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,190 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.fx;
+
+import java.io.BufferedReader;
+import java.io.Reader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javafx.application.Platform;
+import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebView;
+import netscape.javascript.JSObject;
+import org.apidesign.html.boot.spi.Fn;
+
+/**
+ *
+ * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ */
+public abstract class AbstractFXPresenter implements Fn.Presenter {
+    static final Logger LOG = Logger.getLogger(FXPresenter.class.getName());
+    protected static int cnt;
+    protected List<String> scripts;
+    protected Runnable onLoad;
+    protected WebEngine engine;
+
+    @Override
+    public Fn defineFn(String code, String... names) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("(function() {");
+        sb.append("  return function(");
+        String sep = "";
+        for (String n : names) {
+            sb.append(sep).append(n);
+            sep = ",";
+        }
+        sb.append(") {\n");
+        sb.append(code);
+        sb.append("};");
+        sb.append("})()");
+        if (LOG.isLoggable(Level.FINE)) {
+            LOG.log(Level.FINE, 
+                "defining function #{0}:\n{1}\n", 
+                new Object[] { ++cnt, code }
+            );
+        }
+        JSObject x = (JSObject) engine.executeScript(sb.toString());
+        return new JSFn(this, x, cnt);
+    }
+
+    @Override
+    public void loadScript(Reader code) throws Exception {
+        BufferedReader r = new BufferedReader(code);
+        StringBuilder sb = new StringBuilder();
+        for (;;) {
+            String l = r.readLine();
+            if (l == null) {
+                break;
+            }
+            sb.append(l).append('\n');
+        }
+        final String script = sb.toString();
+        if (scripts != null) {
+            scripts.add(script);
+        }
+        engine.executeScript(script);
+    }
+
+    protected final void onPageLoad() {
+        if (scripts != null) {
+            for (String s : scripts) {
+                engine.executeScript(s);
+            }
+        }
+        onLoad.run();
+    }
+
+    @Override
+    public void displayPage(final URL resource, final Runnable onLoad) {
+        this.onLoad = onLoad;
+        final WebView view = findView(resource);
+        this.engine = view.getEngine();
+        try {
+            if (FXInspect.initialize(engine)) {
+                scripts = new ArrayList<String>();
+            }
+        } catch (Throwable ex) {
+            ex.printStackTrace();
+        }
+
+        class Run implements Runnable {
+
+            @Override
+            public void run() {
+                if (scripts != null) {
+                    view.setContextMenuEnabled(true);
+                }
+                engine.load(resource.toExternalForm());
+            }
+        }
+        Run run = new Run();
+        if (Platform.isFxApplicationThread()) {
+            run.run();
+        } else {
+            Platform.runLater(run);
+        }
+        waitFinished();
+    }
+
+    protected abstract void waitFinished();
+
+    protected abstract WebView findView(final URL resource);
+
+    private static final class JSFn extends Fn {
+
+        private final JSObject fn;
+        private static int call;
+        private final int id;
+
+        public JSFn(AbstractFXPresenter p, JSObject fn, int id) {
+            super(p);
+            this.fn = fn;
+            this.id = id;
+        }
+
+        @Override
+        public Object invoke(Object thiz, Object... args) throws Exception {
+            try {
+                if (LOG.isLoggable(Level.FINE)) {
+                    LOG.log(Level.FINE, "calling {0} function #{1}", new Object[]{++call, id});
+                }
+                List<Object> all = new ArrayList<Object>(args.length + 1);
+                all.add(thiz == null ? fn : thiz);
+                all.addAll(Arrays.asList(args));
+                Object ret = fn.call("call", all.toArray()); // NOI18N
+                return ret == fn ? null : ret;
+            } catch (Error t) {
+                t.printStackTrace();
+                throw t;
+            } catch (Exception t) {
+                t.printStackTrace();
+                throw t;
+            }
+        }
+    }
+    
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/main/java/org/netbeans/html/boot/fx/Dbgr.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot-fx/src/main/java/org/netbeans/html/boot/fx/Dbgr.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,87 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.fx;
+
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import javafx.scene.web.WebEngine;
+import javafx.util.Callback;
+import static org.netbeans.html.boot.fx.AbstractFXPresenter.LOG;
+
+/** Debugger bridge to shield us from propriatory impl APIs.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class Dbgr {
+    final Object dbg;
+    final Method sendMsg;
+    
+    Dbgr(WebEngine eng, Callback<String,Void> callback) {
+        Object d;
+        Method m;
+        try {
+            d = eng.getClass().getMethod("impl_getDebugger").invoke(eng); // NOI18N
+            Class<?> debugger = eng.getClass().getClassLoader().loadClass("com.sun.javafx.scene.web.Debugger"); // NOI18N
+            debugger.getMethod("setEnabled", boolean.class).invoke(d, true); // NOI18N
+            debugger.getMethod("setMessageCallback", Callback.class).invoke(d, callback); // NOI18N
+            m = debugger.getMethod("sendMessage", String.class); // NOI18N
+        } catch (Exception ex) {
+            LOG.log(Level.INFO, null, ex);
+            d = null;
+            m = null;
+        }
+        dbg = d;
+        sendMsg = m;
+    }
+
+    void sendMessage(String msg) {
+        try {
+            if (dbg != null) {
+                sendMsg.invoke(dbg, msg);
+            }
+        } catch (Exception ex) {
+            LOG.log(Level.INFO, null, ex);
+        }
+    }
+    
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/main/java/org/netbeans/html/boot/fx/FXBrwsr.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot-fx/src/main/java/org/netbeans/html/boot/fx/FXBrwsr.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,193 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.fx;
+
+import java.net.URL;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.concurrent.Worker;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.VBox;
+import javafx.scene.text.Text;
+import javafx.scene.web.WebEvent;
+import javafx.scene.web.WebView;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+
+/** This is an implementation class, use {@link BrowserBuilder} API. Just
+ * include this JAR on classpath and the {@link BrowserBuilder} API will find
+ * this implementation automatically.
+ */
+public class FXBrwsr extends Application {
+    private static final Logger LOG = Logger.getLogger(FXBrwsr.class.getName());
+    private static FXBrwsr INSTANCE;
+    private static final CountDownLatch FINISHED = new CountDownLatch(1);
+    private BorderPane root;
+
+    public static synchronized WebView findWebView(final URL url, final FXPresenter onLoad) {
+        if (INSTANCE == null) {
+            Executors.newFixedThreadPool(1).submit(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        FXBrwsr.launch(FXBrwsr.class);
+                    } catch (Throwable ex) {
+                        ex.printStackTrace();
+                    } finally {
+                        FINISHED.countDown();
+                    }
+                }
+            });
+        }
+        while (INSTANCE == null) {
+            try {
+                FXBrwsr.class.wait();
+            } catch (InterruptedException ex) {
+                // wait more
+            }
+        }
+        if (!Platform.isFxApplicationThread()) {
+            final WebView[] arr = {null};
+            final CountDownLatch waitForResult = new CountDownLatch(1);
+            Platform.runLater(new Runnable() {
+                @Override
+                public void run() {
+                    arr[0] = INSTANCE.newView(url, onLoad);
+                    waitForResult.countDown();
+                }
+            });
+            for (;;) {
+                try {
+                    waitForResult.await();
+                    break;
+                } catch (InterruptedException ex) {
+                    LOG.log(Level.INFO, null, ex);
+                }
+            }
+            return arr[0];
+        } else {
+            return INSTANCE.newView(url, onLoad);
+        }
+    }
+
+    @Override
+    public void start(Stage primaryStage) throws Exception {
+        synchronized (FXBrwsr.class) {
+            INSTANCE = this;
+            FXBrwsr.class.notifyAll();
+        }
+        BorderPane r = new BorderPane();
+        Scene scene = new Scene(r, 800, 600);
+        primaryStage.setScene(scene);
+        primaryStage.show();
+        this.root = r;
+    }
+
+    private WebView newView(final URL url, final FXPresenter onLoad) {
+        final WebView view = new WebView();
+        view.setContextMenuEnabled(false);
+        view.getEngine().setOnAlert(new EventHandler<WebEvent<String>>() {
+            @Override
+            public void handle(WebEvent<String> t) {
+                final Stage dialogStage = new Stage();
+                dialogStage.initModality(Modality.WINDOW_MODAL);
+                dialogStage.setTitle("Warning");
+                final Button button = new Button("Close");
+                final Text text = new Text(t.getData());
+                VBox box = new VBox();
+                box.setAlignment(Pos.CENTER);
+                box.setSpacing(10);
+                box.setPadding(new Insets(10));
+                box.getChildren().addAll(text, button);
+                dialogStage.setScene(new Scene(box));
+                button.setCancelButton(true);
+                button.setOnAction(new EventHandler<ActionEvent>() {
+                    @Override
+                    public void handle(ActionEvent t) {
+                        dialogStage.close();
+                    }
+                });
+                dialogStage.centerOnScreen();
+                dialogStage.showAndWait();
+            }
+        });
+        root.setCenter(view);
+        final Worker<Void> w = view.getEngine().getLoadWorker();
+        w.stateProperty().addListener(new ChangeListener<Worker.State>() {
+            @Override
+            public void changed(ObservableValue<? extends Worker.State> ov, Worker.State t, Worker.State newState) {
+                if (newState.equals(Worker.State.SUCCEEDED)) {
+                    onLoad.onPageLoad();
+                }
+                if (newState.equals(Worker.State.FAILED)) {
+                    throw new IllegalStateException("Failed to load " + url);
+                }
+            }
+        });
+        return view;
+    }
+
+    static void waitFinished() {
+        for (;;) {
+            try {
+                FINISHED.await();
+                break;
+            } catch (InterruptedException ex) {
+                LOG.log(Level.INFO, null, ex);
+            }
+        }
+    }
+    
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/main/java/org/netbeans/html/boot/fx/FXInspect.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot-fx/src/main/java/org/netbeans/html/boot/fx/FXInspect.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,134 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.fx;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javafx.application.Platform;
+import javafx.scene.web.WebEngine;
+import javafx.util.Callback;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class FXInspect implements Runnable {
+    private static final Logger LOG = Logger.getLogger(FXInspect.class.getName());
+    
+    
+    private final WebEngine engine;
+    private final ObjectInputStream input;
+    private Dbgr dbg;
+    
+    private FXInspect(WebEngine engine, int port) throws IOException {
+        this.engine = engine;
+        
+        Socket socket = new Socket(InetAddress.getByName(null), port);
+        ObjectOutputStream output = new ObjectOutputStream(socket.getOutputStream());
+        this.input = new ObjectInputStream(socket.getInputStream());
+        initializeDebugger(output);
+    }
+    
+    static boolean initialize(WebEngine engine) {
+        final int inspectPort = Integer.getInteger("netbeans.inspect.port", -1); // NOI18N
+        if (inspectPort != -1) {
+            try {
+                FXInspect inspector = new FXInspect(engine, inspectPort);
+                Thread t = new Thread(inspector, "FX<->NetBeans Inspector");
+                t.start();
+                return true;
+            } catch (IOException ex) {
+                LOG.log(Level.INFO, "Cannot connect to NetBeans IDE to port " + inspectPort, ex); // NOI18N
+            }
+        }
+        return false;
+    }
+    
+    private void initializeDebugger(final ObjectOutputStream output) {
+        Platform.runLater(new Runnable() {
+            @Override
+            public void run() {
+                dbg = new Dbgr(engine, new Callback<String,Void>() {
+                    @Override
+                    public Void call(String message) {
+                        try {
+                            byte[] bytes = message.getBytes(StandardCharsets.UTF_8);
+                            output.writeInt(bytes.length);
+                            output.write(bytes);
+                            output.flush();
+                        } catch (IOException ioex) {
+                            ioex.printStackTrace();
+                        }
+                        return null;
+                    }
+                });
+            }
+        });
+    }
+
+    @Override
+    public void run() {
+        try {
+            while (true) {
+                int length = input.readInt();
+                byte[] bytes = new byte[length];
+                input.readFully(bytes);
+                final String message = new String(bytes, StandardCharsets.UTF_8);
+                Platform.runLater(new Runnable() {
+                    @Override
+                    public void run() {
+                        dbg.sendMessage(message);
+                    }
+                });
+            }
+        } catch (IOException ex) {
+            LOG.log(Level.WARNING, null, ex);
+        }
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/main/java/org/netbeans/html/boot/fx/FXPresenter.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot-fx/src/main/java/org/netbeans/html/boot/fx/FXPresenter.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,98 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.fx;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.Reader;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javafx.application.Platform;
+import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebView;
+import net.java.html.boot.BrowserBuilder;
+import netscape.javascript.JSObject;
+import org.apidesign.html.boot.spi.Fn;
+import org.openide.util.lookup.ServiceProvider;
+
+/** This is an implementation class, use {@link BrowserBuilder} API. Just
+ * include this JAR on classpath and the {@link BrowserBuilder} API will find
+ * this implementation automatically.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@ServiceProvider(service = Fn.Presenter.class)
+public final class FXPresenter extends AbstractFXPresenter {
+    static {
+        try {
+            try {
+                Class<?> c = Class.forName("javafx.application.Platform");
+                // OK, on classpath
+            } catch (ClassNotFoundException classNotFoundException) {
+                Method m = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
+                m.setAccessible(true);
+                File f = new File(System.getProperty("java.home"), "lib/jfxrt.jar");
+                if (f.exists()) {
+                    URL l = f.toURI().toURL();
+                    m.invoke(ClassLoader.getSystemClassLoader(), l);
+                }
+            }
+        } catch (Exception ex) {
+            throw new LinkageError("Can't add jfxrt.jar on the classpath", ex);
+        }
+    }
+
+    protected void waitFinished() {
+        FXBrwsr.waitFinished();
+    }
+
+    protected WebView findView(final URL resource) {
+        return FXBrwsr.findWebView(resource, this);
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/test/java/net/java/html/boot/fx/FXBrowsersOnResourceTest.java
--- a/boot-fx/src/test/java/net/java/html/boot/fx/FXBrowsersOnResourceTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/boot-fx/src/test/java/net/java/html/boot/fx/FXBrowsersOnResourceTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -95,7 +95,7 @@
             }
             
             private void doTest() throws Throwable {
-                URL u = FXBrowsersOnResourceTest.class.getResource("/org/apidesign/html/boot/fx/empty.html");
+                URL u = FXBrowsersOnResourceTest.class.getResource("/org/netbeans/html/boot/fx/empty.html");
                 assertNotNull(u, "URL found");
                 FXBrowsers.load(App.getV1(), u, OnPages.class, "first");
                 
@@ -131,7 +131,7 @@
             
             assertEquals(increment(), 1, "Now it is one");
             
-            URL u = FXBrowsersOnResourceTest.class.getResource("/org/apidesign/html/boot/fx/empty.html");
+            URL u = FXBrowsersOnResourceTest.class.getResource("/org/netbeans/html/boot/fx/empty.html");
             assertNotNull(u, "URL found");
             FXBrowsers.load(App.getV2(), u, OnPages.class, "second", "Hello");
             
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/test/java/net/java/html/boot/fx/FXBrowsersTest.java
--- a/boot-fx/src/test/java/net/java/html/boot/fx/FXBrowsersTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/boot-fx/src/test/java/net/java/html/boot/fx/FXBrowsersTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -95,7 +95,7 @@
             }
             
             private void doTest() throws Throwable {
-                URL u = FXBrowsersTest.class.getResource("/org/apidesign/html/boot/fx/empty.html");
+                URL u = FXBrowsersTest.class.getResource("/org/netbeans/html/boot/fx/empty.html");
                 assertNotNull(u, "URL found");
                 FXBrowsers.load(App.getV1(), u, OnPages.class, "first");
                 
@@ -130,7 +130,7 @@
             
             assertEquals(increment(), 1, "Now it is one");
             
-            URL u = FXBrowsersTest.class.getResource("/org/apidesign/html/boot/fx/empty.html");
+            URL u = FXBrowsersTest.class.getResource("/org/netbeans/html/boot/fx/empty.html");
             assertNotNull(u, "URL found");
             FXBrowsers.load(App.getV2(), u, OnPages.class, "second", "Hello");
             
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/test/java/org/apidesign/html/boot/fx/BootstrapTest.java
--- a/boot-fx/src/test/java/org/apidesign/html/boot/fx/BootstrapTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.fx;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Executors;
-import net.java.html.boot.BrowserBuilder;
-import org.apidesign.html.boot.impl.FnContext;
-import org.apidesign.html.boot.spi.Fn;
-import org.testng.annotations.Factory;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class BootstrapTest {
-    private static Class<?> browserClass;
-    private static Fn.Presenter browserPresenter;
-    
-    public BootstrapTest() {
-    }
-
-    @Factory public static Object[] compatibilityTests() throws Exception {
-        final BrowserBuilder bb = BrowserBuilder.newBrowser().loadClass(BootstrapTest.class).
-            loadPage("empty.html").
-            invoke("initialized");
-
-        Executors.newSingleThreadExecutor().submit(new Runnable() {
-            @Override
-            public void run() {
-                bb.showAndWait();
-            }
-        });
-
-        List<Object> res = new ArrayList<Object>();
-        Class<? extends Annotation> test = 
-            loadClass().getClassLoader().loadClass(Test.class.getName()).
-            asSubclass(Annotation.class);
-        for (Method m : loadClass().getMethods()) {
-            if (m.getAnnotation(test) != null) {
-                res.add(new KOFx(browserPresenter, m));
-            }
-        }
-        return res.toArray();
-    }
-
-    static synchronized Class<?> loadClass() throws InterruptedException {
-        while (browserClass == null) {
-            BootstrapTest.class.wait();
-        }
-        return browserClass;
-    }
-    
-    public static synchronized void ready(Class<?> browserCls) throws Exception {
-        browserClass = browserCls;
-        browserPresenter = FnContext.currentPresenter();
-        BootstrapTest.class.notifyAll();
-    }
-    
-    public static void initialized() throws Exception {
-        Class<?> classpathClass = ClassLoader.getSystemClassLoader().loadClass(BootstrapTest.class.getName());
-        Method m = classpathClass.getMethod("ready", Class.class);
-        m.invoke(null, FXPresenterTst.class);
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/test/java/org/apidesign/html/boot/fx/FXPresenterTst.java
--- a/boot-fx/src/test/java/org/apidesign/html/boot/fx/FXPresenterTst.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.fx;
-
-import net.java.html.js.JavaScriptBody;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class FXPresenterTst {
-    @Test public void showClassLoader() {
-        R run = new R();
-        callback(run);
-        assertEquals(run.cnt, 1, "Can call even private implementation classes");
-    }
-    
-    @JavaScriptBody(args = { "r" }, javacall = true, body = "r.@java.lang.Runnable::run()();")
-    private static native void callback(Runnable r);
-
-    private static class R implements Runnable {
-        int cnt;
-
-        @Override
-        public void run() {
-            cnt++;
-        }
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/test/java/org/apidesign/html/boot/fx/KOFx.java
--- a/boot-fx/src/test/java/org/apidesign/html/boot/fx/KOFx.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.fx;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import javafx.application.Platform;
-import org.apidesign.html.boot.impl.FnContext;
-import org.apidesign.html.boot.spi.Fn;
-import org.testng.IHookCallBack;
-import org.testng.IHookable;
-import org.testng.ITest;
-import org.testng.ITestResult;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class KOFx implements ITest, IHookable, Runnable {
-    private final Fn.Presenter p;
-    private final Method m;
-    private Object result;
-    private Object inst;
-
-    KOFx(Fn.Presenter p, Method m) {
-        this.p = p;
-        this.m = m;
-    }
-
-    @Override
-    public String getTestName() {
-        return m.getName();
-    }
-
-    @Test
-    public synchronized void executeTest() throws Exception {
-        if (result == null) {
-            Platform.runLater(this);
-            wait();
-        }
-        if (result instanceof Exception) {
-            throw (Exception)result;
-        }
-        if (result instanceof Error) {
-            throw (Error)result;
-        }
-    }
-
-    @Override
-    public synchronized void run() {
-        boolean notify = true;
-        try {
-            FnContext.currentPresenter(p);
-            if (inst == null) {
-                inst = m.getDeclaringClass().newInstance();
-            }
-            result = m.invoke(inst);
-            if (result == null) {
-                result = this;
-            }
-        } catch (InvocationTargetException ex) {
-            Throwable r = ex.getTargetException();
-            if (r instanceof InterruptedException) {
-                notify = false;
-                Platform.runLater(this);
-                return;
-            }
-            result = r;
-        } catch (Exception ex) {
-            result = ex;
-        } finally {
-            if (notify) {
-                notifyAll();
-            }
-            FnContext.currentPresenter(null);
-        }
-    }
-
-    @Override
-    public void run(IHookCallBack ihcb, ITestResult itr) {
-        ihcb.runTestMethod(itr);
-    }
-    
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/test/java/org/netbeans/html/boot/fx/BootstrapTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot-fx/src/test/java/org/netbeans/html/boot/fx/BootstrapTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,109 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.fx;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Executors;
+import net.java.html.boot.BrowserBuilder;
+import org.netbeans.html.boot.impl.FnContext;
+import org.apidesign.html.boot.spi.Fn;
+import org.testng.annotations.Factory;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class BootstrapTest {
+    private static Class<?> browserClass;
+    private static Fn.Presenter browserPresenter;
+    
+    public BootstrapTest() {
+    }
+
+    @Factory public static Object[] compatibilityTests() throws Exception {
+        final BrowserBuilder bb = BrowserBuilder.newBrowser().loadClass(BootstrapTest.class).
+            loadPage("empty.html").
+            invoke("initialized");
+
+        Executors.newSingleThreadExecutor().submit(new Runnable() {
+            @Override
+            public void run() {
+                bb.showAndWait();
+            }
+        });
+
+        List<Object> res = new ArrayList<Object>();
+        Class<? extends Annotation> test = 
+            loadClass().getClassLoader().loadClass(Test.class.getName()).
+            asSubclass(Annotation.class);
+        for (Method m : loadClass().getMethods()) {
+            if (m.getAnnotation(test) != null) {
+                res.add(new KOFx(browserPresenter, m));
+            }
+        }
+        return res.toArray();
+    }
+
+    static synchronized Class<?> loadClass() throws InterruptedException {
+        while (browserClass == null) {
+            BootstrapTest.class.wait();
+        }
+        return browserClass;
+    }
+    
+    public static synchronized void ready(Class<?> browserCls) throws Exception {
+        browserClass = browserCls;
+        browserPresenter = FnContext.currentPresenter();
+        BootstrapTest.class.notifyAll();
+    }
+    
+    public static void initialized() throws Exception {
+        Class<?> classpathClass = ClassLoader.getSystemClassLoader().loadClass(BootstrapTest.class.getName());
+        Method m = classpathClass.getMethod("ready", Class.class);
+        m.invoke(null, FXPresenterTst.class);
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/test/java/org/netbeans/html/boot/fx/FXPresenterTst.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot-fx/src/test/java/org/netbeans/html/boot/fx/FXPresenterTst.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,71 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.fx;
+
+import net.java.html.js.JavaScriptBody;
+import static org.testng.Assert.*;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class FXPresenterTst {
+    @Test public void showClassLoader() {
+        R run = new R();
+        callback(run);
+        assertEquals(run.cnt, 1, "Can call even private implementation classes");
+    }
+    
+    @JavaScriptBody(args = { "r" }, javacall = true, body = "r.@java.lang.Runnable::run()();")
+    private static native void callback(Runnable r);
+
+    private static class R implements Runnable {
+        int cnt;
+
+        @Override
+        public void run() {
+            cnt++;
+        }
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/test/java/org/netbeans/html/boot/fx/KOFx.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot-fx/src/test/java/org/netbeans/html/boot/fx/KOFx.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,125 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.fx;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import javafx.application.Platform;
+import org.netbeans.html.boot.impl.FnContext;
+import org.apidesign.html.boot.spi.Fn;
+import org.testng.IHookCallBack;
+import org.testng.IHookable;
+import org.testng.ITest;
+import org.testng.ITestResult;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class KOFx implements ITest, IHookable, Runnable {
+    private final Fn.Presenter p;
+    private final Method m;
+    private Object result;
+    private Object inst;
+
+    KOFx(Fn.Presenter p, Method m) {
+        this.p = p;
+        this.m = m;
+    }
+
+    @Override
+    public String getTestName() {
+        return m.getName();
+    }
+
+    @Test
+    public synchronized void executeTest() throws Exception {
+        if (result == null) {
+            Platform.runLater(this);
+            wait();
+        }
+        if (result instanceof Exception) {
+            throw (Exception)result;
+        }
+        if (result instanceof Error) {
+            throw (Error)result;
+        }
+    }
+
+    @Override
+    public synchronized void run() {
+        boolean notify = true;
+        try {
+            FnContext.currentPresenter(p);
+            if (inst == null) {
+                inst = m.getDeclaringClass().newInstance();
+            }
+            result = m.invoke(inst);
+            if (result == null) {
+                result = this;
+            }
+        } catch (InvocationTargetException ex) {
+            Throwable r = ex.getTargetException();
+            if (r instanceof InterruptedException) {
+                notify = false;
+                Platform.runLater(this);
+                return;
+            }
+            result = r;
+        } catch (Exception ex) {
+            result = ex;
+        } finally {
+            if (notify) {
+                notifyAll();
+            }
+            FnContext.currentPresenter(null);
+        }
+    }
+
+    @Override
+    public void run(IHookCallBack ihcb, ITestResult itr) {
+        ihcb.runTestMethod(itr);
+    }
+    
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/test/resources/org/apidesign/html/boot/fx/empty.html
--- a/boot-fx/src/test/resources/org/apidesign/html/boot/fx/empty.html	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-<!--
-
-    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-    Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-    Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-    Other names may be trademarks of their respective owners.
-
-    The contents of this file are subject to the terms of either the GNU
-    General Public License Version 2 only ("GPL") or the Common
-    Development and Distribution License("CDDL") (collectively, the
-    "License"). You may not use this file except in compliance with the
-    License. You can obtain a copy of the License at
-    http://www.netbeans.org/cddl-gplv2.html
-    or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-    specific language governing permissions and limitations under the
-    License.  When distributing the software, include this License Header
-    Notice in each file and include the License file at
-    nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-    particular file as subject to the "Classpath" exception as provided
-    by Oracle in the GPL Version 2 section of the License file that
-    accompanied this code. If applicable, add the following below the
-    License Header, with the fields enclosed by brackets [] replaced by
-    your own identifying information:
-    "Portions Copyrighted [year] [name of copyright owner]"
-
-    Contributor(s):
-
-    The Original Software is NetBeans. The Initial Developer of the Original
-    Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
-
-    If you wish your version of this file to be governed by only the CDDL
-    or only the GPL Version 2, indicate your decision by adding
-    "[Contributor] elects to include this software in this distribution
-    under the [CDDL or GPL Version 2] license." If you do not indicate a
-    single choice of license, a recipient has the option to distribute
-    your version of this file under either the CDDL, the GPL Version 2 or
-    to extend the choice of license to its licensees as provided above.
-    However, if you add GPL Version 2 code and therefore, elected the GPL
-    Version 2 license, then the option applies only if the new code is
-    made subject to such option by the copyright holder.
-
--->
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>FX Presenter Harness</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <meta name="viewport" content="width=device-width">
-    </head>
-    <body>
-        <div>FX Presenter Harness</div>
-    </body>
-</html>
diff -r 700087d2a5d3 -r 92fb71afdc0e boot-fx/src/test/resources/org/netbeans/html/boot/fx/empty.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot-fx/src/test/resources/org/netbeans/html/boot/fx/empty.html	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,55 @@
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+
+    Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+    Other names may be trademarks of their respective owners.
+
+    The contents of this file are subject to the terms of either the GNU
+    General Public License Version 2 only ("GPL") or the Common
+    Development and Distribution License("CDDL") (collectively, the
+    "License"). You may not use this file except in compliance with the
+    License. You can obtain a copy of the License at
+    http://www.netbeans.org/cddl-gplv2.html
+    or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+    specific language governing permissions and limitations under the
+    License.  When distributing the software, include this License Header
+    Notice in each file and include the License file at
+    nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+    particular file as subject to the "Classpath" exception as provided
+    by Oracle in the GPL Version 2 section of the License file that
+    accompanied this code. If applicable, add the following below the
+    License Header, with the fields enclosed by brackets [] replaced by
+    your own identifying information:
+    "Portions Copyrighted [year] [name of copyright owner]"
+
+    Contributor(s):
+
+    The Original Software is NetBeans. The Initial Developer of the Original
+    Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+
+    If you wish your version of this file to be governed by only the CDDL
+    or only the GPL Version 2, indicate your decision by adding
+    "[Contributor] elects to include this software in this distribution
+    under the [CDDL or GPL Version 2] license." If you do not indicate a
+    single choice of license, a recipient has the option to distribute
+    your version of this file under either the CDDL, the GPL Version 2 or
+    to extend the choice of license to its licensees as provided above.
+    However, if you add GPL Version 2 code and therefore, elected the GPL
+    Version 2 license, then the option applies only if the new code is
+    made subject to such option by the copyright holder.
+
+-->
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>FX Presenter Harness</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width">
+    </head>
+    <body>
+        <div>FX Presenter Harness</div>
+    </body>
+</html>
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/net/java/html/boot/BrowserBuilder.java
--- a/boot/src/main/java/net/java/html/boot/BrowserBuilder.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/boot/src/main/java/net/java/html/boot/BrowserBuilder.java	Mon Dec 16 16:59:43 2013 +0100
@@ -54,10 +54,10 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import net.java.html.js.JavaScriptBody;
-import org.apidesign.html.boot.impl.FnUtils;
+import org.netbeans.html.boot.impl.FnUtils;
 import org.apidesign.html.boot.spi.Fn;
-import org.apidesign.html.boot.impl.FindResources;
-import org.apidesign.html.boot.impl.FnContext;
+import org.netbeans.html.boot.impl.FindResources;
+import org.netbeans.html.boot.impl.FnContext;
 
 /** Use this builder to launch your Java/HTML based application. Typical
  * usage in a main method of your application looks like this: 
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/apidesign/html/boot/impl/FindResources.java
--- a/boot/src/main/java/org/apidesign/html/boot/impl/FindResources.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.impl;
-
-import java.net.URL;
-import java.util.Collection;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public interface FindResources {
-
-    public void findResources(String path, Collection<? super URL> results, boolean oneIsEnough);
-    
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/apidesign/html/boot/impl/FnContext.java
--- a/boot/src/main/java/org/apidesign/html/boot/impl/FnContext.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.impl;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.logging.Logger;
-import org.apidesign.html.boot.spi.Fn;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class FnContext implements Closeable {
-    private static final Logger LOG = Logger.getLogger(FnContext.class.getName());
-
-    private Object prev;
-    private FnContext(Fn.Presenter p) {
-        this.prev = p;
-    }
-
-    @Override
-    public void close() throws IOException {
-        if (prev != this) {
-            currentPresenter((Fn.Presenter)prev);
-            prev = this;
-        }
-    }
-/*
-    @Override
-    protected void finalize() throws Throwable {
-        if (prev != null) {
-            LOG.warning("Unclosed context!");
-        }
-    }
-*/
-    public static Closeable activate(Fn.Presenter newP) {
-        return new FnContext(currentPresenter(newP));
-    }
-    
-    
-    private static final ThreadLocal<Fn.Presenter> CURRENT = new ThreadLocal<Fn.Presenter>();
-
-    public static Fn.Presenter currentPresenter(Fn.Presenter p) {
-        Fn.Presenter prev = CURRENT.get();
-        CURRENT.set(p);
-        return prev;
-    }
-
-    public static Fn.Presenter currentPresenter() {
-        Fn.Presenter p = CURRENT.get();
-        if (p == null) {
-            throw new IllegalStateException("No current WebView context around!");
-        }
-        return p;
-    }
-    
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/apidesign/html/boot/impl/FnUtils.java
--- a/boot/src/main/java/org/apidesign/html/boot/impl/FnUtils.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,597 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.impl;
-
-import java.io.Closeable;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.concurrent.Callable;
-import org.apidesign.html.boot.spi.Fn;
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.signature.SignatureReader;
-import org.objectweb.asm.signature.SignatureVisitor;
-import org.objectweb.asm.signature.SignatureWriter;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class FnUtils implements Fn.Presenter {
-    
-    private FnUtils() {
-    }
-    
-    public static boolean isJavaScriptCapable(ClassLoader l) {
-        if (l instanceof JsClassLoader) {
-            return true;
-        }
-        Class<?> clazz;
-        try (Closeable c = Fn.activate(new FnUtils())) {
-            clazz = Class.forName(Test.class.getName(), true, l);
-            final Object is = ((Callable<?>)clazz.newInstance()).call();
-            return Boolean.TRUE.equals(is);
-        } catch (Exception ex) {
-            return false;
-        }
-    }
-    
-    public static boolean isValid(Fn fn) {
-        return fn != null && fn.isValid();
-    }
-
-    public static ClassLoader newLoader(final FindResources f, final Fn.Presenter d, ClassLoader parent) {
-        return new JsClassLoader(parent) {
-            @Override
-            protected URL findResource(String name) {
-                List<URL> l = res(name, true);
-                return l.isEmpty() ? null : l.get(0);
-            }
-            
-            @Override
-            protected Enumeration<URL> findResources(String name) {
-                return Collections.enumeration(res(name, false));
-            }
-            
-            private List<URL> res(String name, boolean oneIsEnough) {
-                List<URL> l = new ArrayList<URL>();
-                f.findResources(name, l, oneIsEnough);
-                return l;
-            }
-            
-            @Override
-            protected Fn defineFn(String code, String... names) {
-                return d.defineFn(code, names);
-            }
-
-            @Override
-            protected void loadScript(Reader code) throws Exception {
-                d.loadScript(code);
-            }
-        };
-    }
-
-    static String callback(final String body) {
-        return new JsCallback() {
-            @Override
-            protected CharSequence callMethod(
-                String ident, String fqn, String method, String params
-            ) {
-                StringBuilder sb = new StringBuilder();
-                sb.append("vm.").append(mangle(fqn, method, params));
-                sb.append("(");
-                if (ident != null) {
-                    sb.append(ident);
-                }
-                return sb;
-            }
-
-        }.parse(body);
-    }
-
-    static void loadScript(ClassLoader jcl, String resource) {
-        final InputStream script = jcl.getResourceAsStream(resource);
-        if (script == null) {
-            throw new NullPointerException("Can't find " + resource);
-        }
-        try {
-            Reader isr = null;
-            try {
-                isr = new InputStreamReader(script, "UTF-8");
-                FnContext.currentPresenter().loadScript(isr);
-            } finally {
-                if (isr != null) {
-                    isr.close();
-                }
-            }
-        } catch (Exception ex) {
-            throw new IllegalStateException("Can't execute " + resource, ex);
-        } 
-    }
-
-    @Override
-    public Fn defineFn(String code, String... names) {
-        return new TrueFn();
-    }
-
-    @Override
-    public void displayPage(URL page, Runnable onPageLoad) {
-    }
-
-    @Override
-    public void loadScript(Reader code) throws Exception {
-    }
-    
-    private static final class FindInClass extends ClassVisitor {
-        private String name;
-        private int found;
-        private ClassLoader loader;
-        private String resource;
-
-        public FindInClass(ClassLoader l, ClassVisitor cv) {
-            super(Opcodes.ASM4, cv);
-            this.loader = l;
-        }
-
-        @Override
-        public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-            this.name = name;
-            super.visit(version, access, name, signature, superName, interfaces);
-        }
-
-        @Override
-        public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
-            if ("Lnet/java/html/js/JavaScriptResource;".equals(desc)) {
-                return new LoadResource();
-            }
-            return super.visitAnnotation(desc, visible);
-        }
-
-        @Override
-        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-            return new FindInMethod(access, name, desc,
-                    super.visitMethod(access & (~Opcodes.ACC_NATIVE), name, desc, signature, exceptions)
-            );
-        }
-
-        private final class FindInMethod extends MethodVisitor {
-
-            private final String name;
-            private final String desc;
-            private final int access;
-            private List<String> args;
-            private String body;
-            private boolean bodyGenerated;
-
-            public FindInMethod(int access, String name, String desc, MethodVisitor mv) {
-                super(Opcodes.ASM4, mv);
-                this.access = access;
-                this.name = name;
-                this.desc = desc;
-            }
-
-            @Override
-            public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
-                if ("Lnet/java/html/js/JavaScriptBody;".equals(desc) // NOI18N
-                        || "Lorg/apidesign/bck2brwsr/core/JavaScriptBody;".equals(desc) // NOI18N
-                        ) {
-                    found++;
-                    return new FindInAnno();
-                }
-                return super.visitAnnotation(desc, visible);
-            }
-
-            private void generateJSBody(List<String> args, String body) {
-                this.args = args;
-                this.body = body;
-            }
-
-            @Override
-            public void visitCode() {
-                if (body == null) {
-                    return;
-                }
-                generateBody();
-            }
-
-            private boolean generateBody() {
-                if (bodyGenerated) {
-                    return false;
-                }
-                bodyGenerated = true;
-
-                super.visitFieldInsn(
-                        Opcodes.GETSTATIC, FindInClass.this.name,
-                        "$$fn$$" + name + "_" + found,
-                        "Lorg/apidesign/html/boot/spi/Fn;"
-                );
-                super.visitInsn(Opcodes.DUP);
-                super.visitMethodInsn(
-                        Opcodes.INVOKESTATIC,
-                        "org/apidesign/html/boot/spi/Fn", "isValid",
-                        "(Lorg/apidesign/html/boot/spi/Fn;)Z"
-                );
-                Label ifNotNull = new Label();
-                super.visitJumpInsn(Opcodes.IFNE, ifNotNull);
-
-                // init Fn
-                super.visitInsn(Opcodes.POP);
-                super.visitLdcInsn(Type.getObjectType(FindInClass.this.name));
-                super.visitLdcInsn(body);
-                super.visitIntInsn(Opcodes.SIPUSH, args.size());
-                super.visitTypeInsn(Opcodes.ANEWARRAY, "java/lang/String");
-                boolean needsVM = false;
-                for (int i = 0; i < args.size(); i++) {
-                    assert !needsVM;
-                    String argName = args.get(i);
-                    needsVM = "vm".equals(argName);
-                    super.visitInsn(Opcodes.DUP);
-                    super.visitIntInsn(Opcodes.BIPUSH, i);
-                    super.visitLdcInsn(argName);
-                    super.visitInsn(Opcodes.AASTORE);
-                }
-                super.visitMethodInsn(Opcodes.INVOKESTATIC,
-                        "org/apidesign/html/boot/spi/Fn", "define",
-                        "(Ljava/lang/Class;Ljava/lang/String;[Ljava/lang/String;)Lorg/apidesign/html/boot/spi/Fn;"
-                );
-                if (resource != null) {
-                    super.visitLdcInsn(Type.getObjectType(FindInClass.this.name));
-                    super.visitLdcInsn(resource);
-                    super.visitMethodInsn(Opcodes.INVOKESTATIC,
-                            "org/apidesign/html/boot/spi/Fn", "preload",
-                            "(Lorg/apidesign/html/boot/spi/Fn;Ljava/lang/Class;Ljava/lang/String;)Lorg/apidesign/html/boot/spi/Fn;"
-                    );
-                }
-                super.visitInsn(Opcodes.DUP);
-                super.visitFieldInsn(
-                        Opcodes.PUTSTATIC, FindInClass.this.name,
-                        "$$fn$$" + name + "_" + found,
-                        "Lorg/apidesign/html/boot/spi/Fn;"
-                );
-                // end of Fn init
-
-                super.visitLabel(ifNotNull);
-
-                final int offset;
-                if ((access & Opcodes.ACC_STATIC) == 0) {
-                    offset = 1;
-                    super.visitIntInsn(Opcodes.ALOAD, 0);
-                } else {
-                    offset = 0;
-                    super.visitInsn(Opcodes.ACONST_NULL);
-                }
-
-                super.visitIntInsn(Opcodes.SIPUSH, args.size());
-                super.visitTypeInsn(Opcodes.ANEWARRAY, "java/lang/Object");
-
-                class SV extends SignatureVisitor {
-
-                    private boolean nowReturn;
-                    private Type returnType;
-                    private int index;
-                    private int loadIndex = offset;
-
-                    public SV() {
-                        super(Opcodes.ASM4);
-                    }
-
-                    @Override
-                    public void visitBaseType(char descriptor) {
-                        final Type t = Type.getType("" + descriptor);
-                        if (nowReturn) {
-                            returnType = t;
-                            return;
-                        }
-                        FindInMethod.super.visitInsn(Opcodes.DUP);
-                        FindInMethod.super.visitIntInsn(Opcodes.SIPUSH, index++);
-                        FindInMethod.super.visitVarInsn(t.getOpcode(Opcodes.ILOAD), loadIndex++);
-                        String factory;
-                        switch (descriptor) {
-                            case 'I':
-                                factory = "java/lang/Integer";
-                                break;
-                            case 'J':
-                                factory = "java/lang/Long";
-                                loadIndex++;
-                                break;
-                            case 'S':
-                                factory = "java/lang/Short";
-                                break;
-                            case 'F':
-                                factory = "java/lang/Float";
-                                break;
-                            case 'D':
-                                factory = "java/lang/Double";
-                                loadIndex++;
-                                break;
-                            case 'Z':
-                                factory = "java/lang/Boolean";
-                                break;
-                            case 'C':
-                                factory = "java/lang/Character";
-                                break;
-                            case 'B':
-                                factory = "java/lang/Byte";
-                                break;
-                            default:
-                                throw new IllegalStateException(t.toString());
-                        }
-                        FindInMethod.super.visitMethodInsn(Opcodes.INVOKESTATIC,
-                                factory, "valueOf", "(" + descriptor + ")L" + factory + ";"
-                        );
-                        FindInMethod.super.visitInsn(Opcodes.AASTORE);
-                    }
-
-                    @Override
-                    public SignatureVisitor visitArrayType() {
-                        if (nowReturn) {
-                            throw new IllegalStateException("Not supported yet");
-                        }
-                        loadObject();
-                        return new SignatureWriter();
-                    }
-
-                    @Override
-                    public void visitClassType(String name) {
-                        if (nowReturn) {
-                            returnType = Type.getObjectType(name);
-                            return;
-                        }
-                        loadObject();
-                    }
-
-                    @Override
-                    public SignatureVisitor visitReturnType() {
-                        nowReturn = true;
-                        return this;
-                    }
-
-                    private void loadObject() {
-                        FindInMethod.super.visitInsn(Opcodes.DUP);
-                        FindInMethod.super.visitIntInsn(Opcodes.SIPUSH, index++);
-                        FindInMethod.super.visitVarInsn(Opcodes.ALOAD, loadIndex++);
-                        FindInMethod.super.visitInsn(Opcodes.AASTORE);
-                    }
-
-                }
-                SV sv = new SV();
-                SignatureReader sr = new SignatureReader(desc);
-                sr.accept(sv);
-
-                if (needsVM) {
-                    FindInMethod.super.visitInsn(Opcodes.DUP);
-                    FindInMethod.super.visitIntInsn(Opcodes.SIPUSH, sv.index);
-                    int lastSlash = FindInClass.this.name.lastIndexOf('/');
-                    String jsCallbacks = FindInClass.this.name.substring(0, lastSlash + 1) + "$JsCallbacks$";
-                    FindInMethod.super.visitFieldInsn(Opcodes.GETSTATIC, jsCallbacks, "VM", "L" + jsCallbacks + ";");
-                    FindInMethod.super.visitMethodInsn(Opcodes.INVOKEVIRTUAL, jsCallbacks, "current", "()L" + jsCallbacks + ";");
-                    FindInMethod.super.visitInsn(Opcodes.AASTORE);
-                }
-
-                super.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
-                        "org/apidesign/html/boot/spi/Fn", "invoke", "(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;"
-                );
-                switch (sv.returnType.getSort()) {
-                    case Type.VOID:
-                        super.visitInsn(Opcodes.RETURN);
-                        break;
-                    case Type.ARRAY:
-                    case Type.OBJECT:
-                        super.visitTypeInsn(Opcodes.CHECKCAST, sv.returnType.getInternalName());
-                        super.visitInsn(Opcodes.ARETURN);
-                        break;
-                    case Type.BOOLEAN:
-                        super.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Boolean");
-                        super.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
-                                "java/lang/Boolean", "booleanValue", "()Z"
-                        );
-                        super.visitInsn(Opcodes.IRETURN);
-                        break;
-                    default:
-                        super.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Number");
-                        super.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
-                                "java/lang/Number", sv.returnType.getClassName() + "Value", "()" + sv.returnType.getDescriptor()
-                        );
-                        super.visitInsn(sv.returnType.getOpcode(Opcodes.IRETURN));
-                }
-                return true;
-            }
-
-            @Override
-            public void visitEnd() {
-                super.visitEnd();
-                if (body != null) {
-                    if (generateBody()) {
-                        // native method
-                        super.visitMaxs(1, 0);
-                    }
-                    FindInClass.this.visitField(
-                            Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC,
-                            "$$fn$$" + name + "_" + found,
-                            "Lorg/apidesign/html/boot/spi/Fn;",
-                            null, null
-                    );
-                }
-            }
-
-            private final class FindInAnno extends AnnotationVisitor {
-
-                private List<String> args = new ArrayList<String>();
-                private String body;
-                private boolean javacall = false;
-
-                public FindInAnno() {
-                    super(Opcodes.ASM4);
-                }
-
-                @Override
-                public void visit(String name, Object value) {
-                    if (name == null) {
-                        args.add((String) value);
-                        return;
-                    }
-                    if (name.equals("javacall")) { // NOI18N
-                        javacall = (Boolean) value;
-                        return;
-                    }
-                    assert name.equals("body");
-                    body = (String) value;
-                }
-
-                @Override
-                public AnnotationVisitor visitArray(String name) {
-                    return this;
-                }
-
-                @Override
-                public void visitEnd() {
-                    if (body != null) {
-                        if (javacall) {
-                            body = callback(body);
-                            args.add("vm");
-                        }
-                        generateJSBody(args, body);
-                    }
-                }
-            }
-        }
-
-        private final class LoadResource extends AnnotationVisitor {
-
-            public LoadResource() {
-                super(Opcodes.ASM4);
-            }
-
-            @Override
-            public void visit(String attrName, Object value) {
-                String relPath = (String) value;
-                if (relPath.startsWith("/")) {
-                    resource = relPath;
-                } else {
-                    int last = name.lastIndexOf('/');
-                    String fullPath = name.substring(0, last + 1) + relPath;
-                    resource = fullPath;
-                }
-            }
-        }
-    }
-
-    private static class ClassWriterEx extends ClassWriter {
-
-        private ClassLoader loader;
-
-        public ClassWriterEx(ClassLoader l, ClassReader classReader, int flags) {
-            super(classReader, flags);
-            this.loader = l;
-        }
-
-        @Override
-        protected String getCommonSuperClass(final String type1, final String type2) {
-            Class<?> c, d;
-            try {
-                c = Class.forName(type1.replace('/', '.'), false, loader);
-                d = Class.forName(type2.replace('/', '.'), false, loader);
-            } catch (Exception e) {
-                throw new RuntimeException(e.toString());
-            }
-            if (c.isAssignableFrom(d)) {
-                return type1;
-            }
-            if (d.isAssignableFrom(c)) {
-                return type2;
-            }
-            if (c.isInterface() || d.isInterface()) {
-                return "java/lang/Object";
-            } else {
-                do {
-                    c = c.getSuperclass();
-                } while (!c.isAssignableFrom(d));
-                return c.getName().replace('.', '/');
-            }
-        }
-    }
-
-    static byte[] transform(ClassLoader loader, byte[] arr) {
-        ClassReader cr = new ClassReader(arr) {
-            // to allow us to compile with -profile compact1 on 
-            // JDK8 while processing the class as JDK7, the highest
-            // class format asm 4.1 understands to
-            @Override
-            public short readShort(int index) {
-                short s = super.readShort(index);
-                if (index == 6 && s > Opcodes.V1_7) {
-                    return Opcodes.V1_7;
-                }
-                return s;
-            }
-        };
-        FindInClass tst = new FindInClass(loader, null);
-        cr.accept(tst, 0);
-        if (tst.found > 0) {
-            ClassWriter w = new ClassWriterEx(loader, cr, ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
-            FindInClass fic = new FindInClass(loader, w);
-            cr.accept(fic, 0);
-            arr = w.toByteArray();
-        }
-        return arr;
-    }
-
-    private static final class TrueFn extends Fn {
-        @Override
-        public Object invoke(Object thiz, Object... args) throws Exception {
-            return Boolean.TRUE;
-        }
-    } // end of TrueFn
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/apidesign/html/boot/impl/JavaScriptProcesor.java
--- a/boot/src/main/java/org/apidesign/html/boot/impl/JavaScriptProcesor.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,369 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.impl;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.Completion;
-import javax.annotation.processing.Completions;
-import javax.annotation.processing.Messager;
-import javax.annotation.processing.Processor;
-import javax.annotation.processing.RoundEnvironment;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
-import javax.lang.model.type.ArrayType;
-import javax.lang.model.type.ExecutableType;
-import javax.lang.model.type.TypeKind;
-import javax.lang.model.type.TypeMirror;
-import javax.tools.Diagnostic;
-import javax.tools.FileObject;
-import javax.tools.StandardLocation;
-import net.java.html.js.JavaScriptBody;
-import net.java.html.js.JavaScriptResource;
-import org.openide.util.lookup.ServiceProvider;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@ServiceProvider(service = Processor.class)
-public final class JavaScriptProcesor extends AbstractProcessor {
-    private final Map<String,Map<String,ExecutableElement>> javacalls = 
-        new HashMap<String,Map<String,ExecutableElement>>();
-    
-    @Override
-    public Set<String> getSupportedAnnotationTypes() {
-        Set<String> set = new HashSet<String>();
-        set.add(JavaScriptBody.class.getName());
-        set.add(JavaScriptResource.class.getName());
-        return set;
-    }
-    
-    @Override
-    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        final Messager msg = processingEnv.getMessager();
-        for (Element e : roundEnv.getElementsAnnotatedWith(JavaScriptBody.class)) {
-            if (e.getKind() != ElementKind.METHOD && e.getKind() != ElementKind.CONSTRUCTOR) {
-                continue;
-            }
-            ExecutableElement ee = (ExecutableElement)e;
-            List<? extends VariableElement> params = ee.getParameters();
-            
-            JavaScriptBody jsb = e.getAnnotation(JavaScriptBody.class);
-            if (jsb == null) {
-                continue;
-            }
-            String[] arr = jsb.args();
-            if (params.size() != arr.length) {
-                msg.printMessage(Diagnostic.Kind.ERROR, "Number of args arguments does not match real arguments!", e);
-            }
-            if (!jsb.javacall() && jsb.body().contains(".@")) {
-                msg.printMessage(Diagnostic.Kind.WARNING, "Usage of .@ usually requires javacall=true", e);
-            }
-            if (jsb.javacall()) {
-                JsCallback verify = new VerifyCallback(e);
-                try {
-                    verify.parse(jsb.body());
-                } catch (IllegalStateException ex) {
-                    msg.printMessage(Diagnostic.Kind.ERROR, ex.getLocalizedMessage(), e);
-                }
-            }
-        }
-        for (Element e : roundEnv.getElementsAnnotatedWith(JavaScriptResource.class)) {
-            JavaScriptResource r = e.getAnnotation(JavaScriptResource.class);
-            if (r == null) {
-                continue;
-            }
-            final String res;
-            if (r.value().startsWith("/")) {
-                res = r.value();
-            } else {
-                res = findPkg(e).replace('.', '/') + "/" + r.value();
-            }
-            
-            try {
-                FileObject os = processingEnv.getFiler().getResource(StandardLocation.SOURCE_PATH, "", res);
-                os.openInputStream().close();
-            } catch (IOException ex1) {
-                try {
-                    FileObject os2 = processingEnv.getFiler().getResource(StandardLocation.CLASS_OUTPUT, "", res);
-                    os2.openInputStream().close();
-                } catch (IOException ex2) {
-                    msg.printMessage(Diagnostic.Kind.ERROR, "Cannot find " + res + " in " + res + " package", e);
-                }
-            }
-        }
-
-        if (roundEnv.processingOver()) {
-            generateCallbackClass(javacalls);
-            javacalls.clear();
-        }
-        return true;
-    }
-
-    @Override
-    public Iterable<? extends Completion> getCompletions(Element e, 
-        AnnotationMirror annotation, ExecutableElement member, String userText
-    ) {
-        StringBuilder sb = new StringBuilder();
-        if (e.getKind() == ElementKind.METHOD && member.getSimpleName().contentEquals("args")) {
-            ExecutableElement ee = (ExecutableElement) e;
-            String sep = "";
-            sb.append("{ ");
-            for (VariableElement ve : ee.getParameters()) {
-                sb.append(sep).append('"').append(ve.getSimpleName())
-                    .append('"');
-                sep = ", ";
-            }
-            sb.append(" }");
-            return Collections.nCopies(1, Completions.of(sb.toString()));
-        }
-        return null;
-    }
-
-    private class VerifyCallback extends JsCallback {
-        private final Element e;
-        public VerifyCallback(Element e) {
-            this.e = e;
-        }
-
-        @Override
-        protected CharSequence callMethod(String ident, String fqn, String method, String params) {
-            final TypeElement type = processingEnv.getElementUtils().getTypeElement(fqn);
-            if (type == null) {
-                processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, 
-                    "Callback to non-existing class " + fqn, e
-                );
-                return "";
-            }
-            ExecutableElement found = null;
-            StringBuilder foundParams = new StringBuilder();
-            for (Element m : type.getEnclosedElements()) {
-                if (m.getKind() != ElementKind.METHOD) {
-                    continue;
-                }
-                if (m.getSimpleName().contentEquals(method)) {
-                    String paramTypes = findParamTypes((ExecutableElement)m);
-                    if (paramTypes.equals(params)) {
-                        found = (ExecutableElement) m;
-                        break;
-                    }
-                    foundParams.append(paramTypes).append("\n");
-                }
-            }
-            if (found == null) {
-                if (foundParams.length() == 0) {
-                    processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, 
-                        "Callback to class " + fqn + " with unknown method " + method, e
-                    );
-                } else {
-                    processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, 
-                        "Callback to " + fqn + "." + method + " with wrong parameters: " + 
-                        params + ". Only known parameters are " + foundParams, e
-                    );
-                }
-            } else {
-                Map<String,ExecutableElement> mangledOnes = javacalls.get(findPkg(e));
-                if (mangledOnes == null) {
-                    mangledOnes = new TreeMap<String, ExecutableElement>();
-                    javacalls.put(findPkg(e), mangledOnes);
-                }
-                String mangled = JsCallback.mangle(fqn, method, findParamTypes(found));
-                mangledOnes.put(mangled, found);
-            }
-            return "";
-        }
-
-        private String findParamTypes(ExecutableElement method) {
-            ExecutableType t = (ExecutableType) method.asType();
-            StringBuilder sb = new StringBuilder();
-            sb.append('(');
-            for (TypeMirror tm : t.getParameterTypes()) {
-                if (tm.getKind().isPrimitive()) {
-                    switch (tm.getKind()) {
-                        case INT: sb.append('I'); break;
-                        case BOOLEAN: sb.append('Z'); break;
-                        case BYTE: sb.append('B'); break;
-                        case CHAR: sb.append('C'); break;
-                        case SHORT: sb.append('S'); break;
-                        case DOUBLE: sb.append('D'); break;
-                        case FLOAT: sb.append('F'); break;
-                        case LONG: sb.append('J'); break;
-                        default:
-                            throw new IllegalStateException("Uknown " + tm.getKind());
-                    }
-                } else {
-                    while (tm.getKind() == TypeKind.ARRAY) {
-                        sb.append('[');
-                        tm = ((ArrayType)tm).getComponentType();
-                    }
-                    sb.append('L');
-                    sb.append(tm.toString().replace('.', '/'));
-                    sb.append(';');
-                }
-            }
-            sb.append(')');
-            return sb.toString();
-        }
-    }
-    
-    private void generateCallbackClass(Map<String,Map<String, ExecutableElement>> process) {
-        for (Map.Entry<String, Map<String, ExecutableElement>> pkgEn : process.entrySet()) {
-            String pkgName = pkgEn.getKey();
-            Map<String, ExecutableElement> map = pkgEn.getValue();
-            StringBuilder source = new StringBuilder();
-            source.append("package ").append(pkgName).append(";\n");
-            source.append("public final class $JsCallbacks$ {\n");
-            source.append("  static final $JsCallbacks$ VM = new $JsCallbacks$(null);\n");
-            source.append("  private final org.apidesign.html.boot.spi.Fn.Presenter p;\n");
-            source.append("  private $JsCallbacks$ last;\n");
-            source.append("  private $JsCallbacks$(org.apidesign.html.boot.spi.Fn.Presenter p) {\n");
-            source.append("    this.p = p;\n");
-            source.append("  }\n");
-            source.append("  final $JsCallbacks$ current() {\n");
-            source.append("    org.apidesign.html.boot.spi.Fn.Presenter now = org.apidesign.html.boot.spi.Fn.activePresenter();\n");
-            source.append("    if (now == p) return this;\n");
-            source.append("    if (last != null && now == last.p) return last;\n");
-            source.append("    return last = new $JsCallbacks$(now);\n");
-            source.append("  }\n");
-            for (Map.Entry<String, ExecutableElement> entry : map.entrySet()) {
-                final String mangled = entry.getKey();
-                final ExecutableElement m = entry.getValue();
-                final boolean isStatic = m.getModifiers().contains(Modifier.STATIC);
-                
-                source.append("\n  public java.lang.Object ")
-                    .append(mangled)
-                    .append("(");
-                
-                String sep = "";
-                if (!isStatic) {
-                    source.append(((TypeElement)m.getEnclosingElement()).getQualifiedName());
-                    source.append(" self");
-                    sep = ", ";
-                }
-                
-                int cnt = 0;
-                for (VariableElement ve : m.getParameters()) {
-                    source.append(sep);
-                    source.append(ve.asType());
-                    source.append(" arg").append(++cnt);
-                    sep = ", ";
-                }
-                source.append(") throws Throwable {\n");
-                if (processingEnv.getSourceVersion().compareTo(SourceVersion.RELEASE_7) >= 0) {
-                    source.append("    try (java.io.Closeable a = org.apidesign.html.boot.spi.Fn.activate(p)) { \n");
-                } else {
-                    source.append("    java.io.Closeable a = org.apidesign.html.boot.spi.Fn.activate(p); try {\n");
-                }
-                source.append("    ");
-                if (m.getReturnType().getKind() != TypeKind.VOID) {
-                    source.append("return ");
-                }
-                if (isStatic) {
-                    source.append(((TypeElement)m.getEnclosingElement()).getQualifiedName());
-                    source.append('.');
-                } else {
-                    source.append("self.");
-                }
-                source.append(m.getSimpleName());
-                source.append("(");
-                cnt = 0;
-                sep = "";
-                for (VariableElement ve : m.getParameters()) {
-                    source.append(sep);
-                    source.append("arg").append(++cnt);
-                    sep = ", ";
-                }
-                source.append(");\n");
-                if (m.getReturnType().getKind() == TypeKind.VOID) {
-                    source.append("    return null;\n");
-                }
-                if (processingEnv.getSourceVersion().compareTo(SourceVersion.RELEASE_7) >= 0) {
-                    source.append("    }\n");
-                } else {
-                    
-                    source.append("    } finally {\n");
-                    source.append("      a.close();\n");
-                    source.append("    }\n");
-                }
-                source.append("  }\n");
-            }
-            source.append("}\n");
-            final String srcName = pkgName + ".$JsCallbacks$";
-            try {
-                Writer w = processingEnv.getFiler().createSourceFile(srcName,
-                    map.values().toArray(new Element[map.size()])
-                ).openWriter();
-                w.write(source.toString());
-                w.close();
-            } catch (IOException ex) {
-                processingEnv.getMessager().printMessage(
-                    Diagnostic.Kind.ERROR, "Can't write " + srcName + ": " + ex.getMessage()
-                );
-            }
-        }
-    }
-    
-    private static String findPkg(Element e) {
-        while (e.getKind() != ElementKind.PACKAGE) {
-            e = e.getEnclosingElement();
-        }
-        return ((PackageElement)e).getQualifiedName().toString();
-    }
-    
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/apidesign/html/boot/impl/JsAgent.java
--- a/boot/src/main/java/org/apidesign/html/boot/impl/JsAgent.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.impl;
-
-import java.lang.instrument.ClassFileTransformer;
-import java.lang.instrument.IllegalClassFormatException;
-import java.lang.instrument.Instrumentation;
-import java.security.ProtectionDomain;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class JsAgent implements ClassFileTransformer {
-    public static void agentmain(String args, Instrumentation instr) {
-        instr.addTransformer(new JsAgent());
-    }
-
-    @Override
-    public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException {
-        try {
-            return FnUtils.transform(loader, classfileBuffer);
-        } catch (Exception ex) {
-            return classfileBuffer;
-        }
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/apidesign/html/boot/impl/JsCallback.java
--- a/boot/src/main/java/org/apidesign/html/boot/impl/JsCallback.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.impl;
-
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-abstract class JsCallback {
-    final String parse(String body) {
-        StringBuilder sb = new StringBuilder();
-        int pos = 0;
-        for (;;) {
-            int next = body.indexOf(".@", pos);
-            if (next == -1) {
-                sb.append(body.substring(pos));
-                body = sb.toString();
-                break;
-            }
-            int ident = next;
-            while (ident > 0) {
-                if (!Character.isJavaIdentifierPart(body.charAt(--ident))) {
-                    ident++;
-                    break;
-                }
-            }
-            String refId = body.substring(ident, next);
-            
-            sb.append(body.substring(pos, ident));
-            
-            int sigBeg = body.indexOf('(', next);
-            int sigEnd = body.indexOf(')', sigBeg);
-            int colon4 = body.indexOf("::", next);
-            if (sigBeg == -1 || sigEnd == -1 || colon4 == -1) {
-                throw new IllegalStateException(
-                    "Wrong format of instance callback. "
-                    + "Should be: 'inst.@pkg.Class::method(Ljava/lang/Object;)(param)':\n" 
-                    + body
-                );
-            }
-            String fqn = body.substring(next + 2, colon4);
-            String method = body.substring(colon4 + 2, sigBeg);
-            String params = body.substring(sigBeg, sigEnd + 1);
-
-            int paramBeg = body.indexOf('(', sigEnd + 1);
-            if (paramBeg == -1) {
-                throw new IllegalStateException(
-                    "Wrong format of instance callback. "
-                    + "Should be: 'inst.@pkg.Class::method(Ljava/lang/Object;)(param)':\n" 
-                    + body
-                );
-            }
-            
-            sb.append(callMethod(refId, fqn, method, params));
-            if (body.charAt(paramBeg + 1) != (')')) {
-                sb.append(",");
-            }
-            pos = paramBeg + 1;
-        }
-        pos = 0;
-        sb = null;
-        for (;;) {
-            int next = body.indexOf("@", pos);
-            if (next == -1) {
-                if (sb == null) {
-                    return body;
-                }
-                sb.append(body.substring(pos));
-                return sb.toString();
-            }
-            if (sb == null) {
-                sb = new StringBuilder();
-            }
-            
-            sb.append(body.substring(pos, next));
-            
-            int sigBeg = body.indexOf('(', next);
-            int sigEnd = body.indexOf(')', sigBeg);
-            int colon4 = body.indexOf("::", next);
-            if (sigBeg == -1 || sigEnd == -1 || colon4 == -1) {
-                throw new IllegalStateException(
-                    "Wrong format of static callback. "
-                    + "Should be: '@pkg.Class::staticMethod(Ljava/lang/Object;)(param)':\n" 
-                    + body
-                );
-            }
-            String fqn = body.substring(next + 1, colon4);
-            String method = body.substring(colon4 + 2, sigBeg);
-            String params = body.substring(sigBeg, sigEnd + 1);
-
-            int paramBeg = body.indexOf('(', sigEnd + 1);
-            
-            sb.append(callMethod(null, fqn, method, params));
-            pos = paramBeg + 1;
-        }
-    }
-
-    protected abstract CharSequence callMethod(
-        String ident, String fqn, String method, String params
-    );
-
-    static String mangle(String fqn, String method, String params) {
-        if (params.startsWith("(")) {
-            params = params.substring(1);
-        }
-        if (params.endsWith(")")) {
-            params = params.substring(0, params.length() - 1);
-        }
-        return 
-            replace(fqn) + "$" + replace(method) + "$" + replace(params);
-    }
-    
-    private static String replace(String orig) {
-        return orig.replace("_", "_1").
-            replace(";", "_2").
-            replace("[", "_3").
-            replace('.', '_').replace('/', '_');
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/apidesign/html/boot/impl/JsClassLoader.java
--- a/boot/src/main/java/org/apidesign/html/boot/impl/JsClassLoader.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.impl;
-
-import org.apidesign.html.boot.spi.Fn;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.net.URL;
-import java.util.Enumeration;
-
-/** 
- *
- * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- */
-abstract class JsClassLoader extends ClassLoader {
-    JsClassLoader(ClassLoader parent) {
-        super(parent);
-        setDefaultAssertionStatus(JsClassLoader.class.desiredAssertionStatus());
-    }
-    
-    @Override
-    protected abstract URL findResource(String name);
-    
-    @Override
-    protected abstract Enumeration<URL> findResources(String name);
-
-    @Override
-    protected Class<?> findClass(String name) throws ClassNotFoundException {
-        if (name.startsWith("javafx")) {
-            return Class.forName(name);
-        }
-        if (name.startsWith("netscape")) {
-            return Class.forName(name);
-        }
-        if (name.startsWith("com.sun")) {
-            return Class.forName(name);
-        }
-        if (name.equals(JsClassLoader.class.getName())) {
-            return JsClassLoader.class;
-        }
-        if (name.equals(Fn.class.getName())) {
-            return Fn.class;
-        }
-        if (name.equals(Fn.Presenter.class.getName())) {
-            return Fn.Presenter.class;
-        }
-        if (name.equals(FnUtils.class.getName())) {
-            return FnUtils.class;
-        }
-        if (
-            name.equals("org.apidesign.html.boot.spi.Fn") ||
-            name.equals("org.apidesign.html.boot.impl.FnUtils") ||
-            name.equals("org.apidesign.html.boot.impl.FnContext")
-        ) {
-            return Class.forName(name);
-        }
-        URL u = findResource(name.replace('.', '/') + ".class");
-        if (u != null) {
-            InputStream is = null;
-            try {
-                is = u.openStream();
-                byte[] arr = new byte[is.available()];
-                int len = 0;
-                while (len < arr.length) {
-                    int read = is.read(arr, len, arr.length - len);
-                    if (read == -1) {
-                        throw new IOException("Can't read " + u);
-                    }
-                    len += read;
-                }
-                is.close();
-                is = null;
-                arr = FnUtils.transform(JsClassLoader.this, arr);
-                if (arr != null) {
-                    return defineClass(name, arr, 0, arr.length);
-                }
-            } catch (IOException ex) {
-                throw new ClassNotFoundException("Can't load " + name, ex);
-            } finally {
-                try {
-                    if (is != null) is.close();
-                } catch (IOException ex) {
-                    throw new ClassNotFoundException(null, ex);
-                }
-            }
-        }
-        return super.findClass(name);
-    }
-    
-    protected abstract Fn defineFn(String code, String... names);
-    protected abstract void loadScript(Reader code) throws Exception;
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/apidesign/html/boot/impl/Test.java
--- a/boot/src/main/java/org/apidesign/html/boot/impl/Test.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.impl;
-
-import java.util.concurrent.Callable;
-import net.java.html.js.JavaScriptBody;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class Test implements Callable<Boolean> {
-    @Override @JavaScriptBody(args = {}, body = "return true;")
-    public Boolean call() {
-        return false;
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/apidesign/html/boot/spi/Fn.java
--- a/boot/src/main/java/org/apidesign/html/boot/spi/Fn.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/boot/src/main/java/org/apidesign/html/boot/spi/Fn.java	Mon Dec 16 16:59:43 2013 +0100
@@ -51,9 +51,8 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.WeakHashMap;
 import net.java.html.js.JavaScriptBody;
-import org.apidesign.html.boot.impl.FnContext;
+import org.netbeans.html.boot.impl.FnContext;
 
 /** Represents single JavaScript function that can be invoked. 
  * Created via {@link Presenter#defineFn(java.lang.String, java.lang.String...)}.
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/netbeans/html/boot/impl/FindResources.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/main/java/org/netbeans/html/boot/impl/FindResources.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,56 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+import java.net.URL;
+import java.util.Collection;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public interface FindResources {
+
+    public void findResources(String path, Collection<? super URL> results, boolean oneIsEnough);
+    
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/netbeans/html/boot/impl/FnContext.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/main/java/org/netbeans/html/boot/impl/FnContext.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,98 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.logging.Logger;
+import org.apidesign.html.boot.spi.Fn;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class FnContext implements Closeable {
+    private static final Logger LOG = Logger.getLogger(FnContext.class.getName());
+
+    private Object prev;
+    private FnContext(Fn.Presenter p) {
+        this.prev = p;
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (prev != this) {
+            currentPresenter((Fn.Presenter)prev);
+            prev = this;
+        }
+    }
+/*
+    @Override
+    protected void finalize() throws Throwable {
+        if (prev != null) {
+            LOG.warning("Unclosed context!");
+        }
+    }
+*/
+    public static Closeable activate(Fn.Presenter newP) {
+        return new FnContext(currentPresenter(newP));
+    }
+    
+    
+    private static final ThreadLocal<Fn.Presenter> CURRENT = new ThreadLocal<Fn.Presenter>();
+
+    public static Fn.Presenter currentPresenter(Fn.Presenter p) {
+        Fn.Presenter prev = CURRENT.get();
+        CURRENT.set(p);
+        return prev;
+    }
+
+    public static Fn.Presenter currentPresenter() {
+        Fn.Presenter p = CURRENT.get();
+        if (p == null) {
+            throw new IllegalStateException("No current WebView context around!");
+        }
+        return p;
+    }
+    
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,597 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+import java.io.Closeable;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.concurrent.Callable;
+import org.apidesign.html.boot.spi.Fn;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.signature.SignatureReader;
+import org.objectweb.asm.signature.SignatureVisitor;
+import org.objectweb.asm.signature.SignatureWriter;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class FnUtils implements Fn.Presenter {
+    
+    private FnUtils() {
+    }
+    
+    public static boolean isJavaScriptCapable(ClassLoader l) {
+        if (l instanceof JsClassLoader) {
+            return true;
+        }
+        Class<?> clazz;
+        try (Closeable c = Fn.activate(new FnUtils())) {
+            clazz = Class.forName(Test.class.getName(), true, l);
+            final Object is = ((Callable<?>)clazz.newInstance()).call();
+            return Boolean.TRUE.equals(is);
+        } catch (Exception ex) {
+            return false;
+        }
+    }
+    
+    public static boolean isValid(Fn fn) {
+        return fn != null && fn.isValid();
+    }
+
+    public static ClassLoader newLoader(final FindResources f, final Fn.Presenter d, ClassLoader parent) {
+        return new JsClassLoader(parent) {
+            @Override
+            protected URL findResource(String name) {
+                List<URL> l = res(name, true);
+                return l.isEmpty() ? null : l.get(0);
+            }
+            
+            @Override
+            protected Enumeration<URL> findResources(String name) {
+                return Collections.enumeration(res(name, false));
+            }
+            
+            private List<URL> res(String name, boolean oneIsEnough) {
+                List<URL> l = new ArrayList<URL>();
+                f.findResources(name, l, oneIsEnough);
+                return l;
+            }
+            
+            @Override
+            protected Fn defineFn(String code, String... names) {
+                return d.defineFn(code, names);
+            }
+
+            @Override
+            protected void loadScript(Reader code) throws Exception {
+                d.loadScript(code);
+            }
+        };
+    }
+
+    static String callback(final String body) {
+        return new JsCallback() {
+            @Override
+            protected CharSequence callMethod(
+                String ident, String fqn, String method, String params
+            ) {
+                StringBuilder sb = new StringBuilder();
+                sb.append("vm.").append(mangle(fqn, method, params));
+                sb.append("(");
+                if (ident != null) {
+                    sb.append(ident);
+                }
+                return sb;
+            }
+
+        }.parse(body);
+    }
+
+    static void loadScript(ClassLoader jcl, String resource) {
+        final InputStream script = jcl.getResourceAsStream(resource);
+        if (script == null) {
+            throw new NullPointerException("Can't find " + resource);
+        }
+        try {
+            Reader isr = null;
+            try {
+                isr = new InputStreamReader(script, "UTF-8");
+                FnContext.currentPresenter().loadScript(isr);
+            } finally {
+                if (isr != null) {
+                    isr.close();
+                }
+            }
+        } catch (Exception ex) {
+            throw new IllegalStateException("Can't execute " + resource, ex);
+        } 
+    }
+
+    @Override
+    public Fn defineFn(String code, String... names) {
+        return new TrueFn();
+    }
+
+    @Override
+    public void displayPage(URL page, Runnable onPageLoad) {
+    }
+
+    @Override
+    public void loadScript(Reader code) throws Exception {
+    }
+    
+    private static final class FindInClass extends ClassVisitor {
+        private String name;
+        private int found;
+        private ClassLoader loader;
+        private String resource;
+
+        public FindInClass(ClassLoader l, ClassVisitor cv) {
+            super(Opcodes.ASM4, cv);
+            this.loader = l;
+        }
+
+        @Override
+        public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+            this.name = name;
+            super.visit(version, access, name, signature, superName, interfaces);
+        }
+
+        @Override
+        public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+            if ("Lnet/java/html/js/JavaScriptResource;".equals(desc)) {
+                return new LoadResource();
+            }
+            return super.visitAnnotation(desc, visible);
+        }
+
+        @Override
+        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+            return new FindInMethod(access, name, desc,
+                    super.visitMethod(access & (~Opcodes.ACC_NATIVE), name, desc, signature, exceptions)
+            );
+        }
+
+        private final class FindInMethod extends MethodVisitor {
+
+            private final String name;
+            private final String desc;
+            private final int access;
+            private List<String> args;
+            private String body;
+            private boolean bodyGenerated;
+
+            public FindInMethod(int access, String name, String desc, MethodVisitor mv) {
+                super(Opcodes.ASM4, mv);
+                this.access = access;
+                this.name = name;
+                this.desc = desc;
+            }
+
+            @Override
+            public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+                if ("Lnet/java/html/js/JavaScriptBody;".equals(desc) // NOI18N
+                        || "Lorg/apidesign/bck2brwsr/core/JavaScriptBody;".equals(desc) // NOI18N
+                        ) {
+                    found++;
+                    return new FindInAnno();
+                }
+                return super.visitAnnotation(desc, visible);
+            }
+
+            private void generateJSBody(List<String> args, String body) {
+                this.args = args;
+                this.body = body;
+            }
+
+            @Override
+            public void visitCode() {
+                if (body == null) {
+                    return;
+                }
+                generateBody();
+            }
+
+            private boolean generateBody() {
+                if (bodyGenerated) {
+                    return false;
+                }
+                bodyGenerated = true;
+
+                super.visitFieldInsn(
+                        Opcodes.GETSTATIC, FindInClass.this.name,
+                        "$$fn$$" + name + "_" + found,
+                        "Lorg/apidesign/html/boot/spi/Fn;"
+                );
+                super.visitInsn(Opcodes.DUP);
+                super.visitMethodInsn(
+                        Opcodes.INVOKESTATIC,
+                        "org/apidesign/html/boot/spi/Fn", "isValid",
+                        "(Lorg/apidesign/html/boot/spi/Fn;)Z"
+                );
+                Label ifNotNull = new Label();
+                super.visitJumpInsn(Opcodes.IFNE, ifNotNull);
+
+                // init Fn
+                super.visitInsn(Opcodes.POP);
+                super.visitLdcInsn(Type.getObjectType(FindInClass.this.name));
+                super.visitLdcInsn(body);
+                super.visitIntInsn(Opcodes.SIPUSH, args.size());
+                super.visitTypeInsn(Opcodes.ANEWARRAY, "java/lang/String");
+                boolean needsVM = false;
+                for (int i = 0; i < args.size(); i++) {
+                    assert !needsVM;
+                    String argName = args.get(i);
+                    needsVM = "vm".equals(argName);
+                    super.visitInsn(Opcodes.DUP);
+                    super.visitIntInsn(Opcodes.BIPUSH, i);
+                    super.visitLdcInsn(argName);
+                    super.visitInsn(Opcodes.AASTORE);
+                }
+                super.visitMethodInsn(Opcodes.INVOKESTATIC,
+                        "org/apidesign/html/boot/spi/Fn", "define",
+                        "(Ljava/lang/Class;Ljava/lang/String;[Ljava/lang/String;)Lorg/apidesign/html/boot/spi/Fn;"
+                );
+                if (resource != null) {
+                    super.visitLdcInsn(Type.getObjectType(FindInClass.this.name));
+                    super.visitLdcInsn(resource);
+                    super.visitMethodInsn(Opcodes.INVOKESTATIC,
+                            "org/apidesign/html/boot/spi/Fn", "preload",
+                            "(Lorg/apidesign/html/boot/spi/Fn;Ljava/lang/Class;Ljava/lang/String;)Lorg/apidesign/html/boot/spi/Fn;"
+                    );
+                }
+                super.visitInsn(Opcodes.DUP);
+                super.visitFieldInsn(
+                        Opcodes.PUTSTATIC, FindInClass.this.name,
+                        "$$fn$$" + name + "_" + found,
+                        "Lorg/apidesign/html/boot/spi/Fn;"
+                );
+                // end of Fn init
+
+                super.visitLabel(ifNotNull);
+
+                final int offset;
+                if ((access & Opcodes.ACC_STATIC) == 0) {
+                    offset = 1;
+                    super.visitIntInsn(Opcodes.ALOAD, 0);
+                } else {
+                    offset = 0;
+                    super.visitInsn(Opcodes.ACONST_NULL);
+                }
+
+                super.visitIntInsn(Opcodes.SIPUSH, args.size());
+                super.visitTypeInsn(Opcodes.ANEWARRAY, "java/lang/Object");
+
+                class SV extends SignatureVisitor {
+
+                    private boolean nowReturn;
+                    private Type returnType;
+                    private int index;
+                    private int loadIndex = offset;
+
+                    public SV() {
+                        super(Opcodes.ASM4);
+                    }
+
+                    @Override
+                    public void visitBaseType(char descriptor) {
+                        final Type t = Type.getType("" + descriptor);
+                        if (nowReturn) {
+                            returnType = t;
+                            return;
+                        }
+                        FindInMethod.super.visitInsn(Opcodes.DUP);
+                        FindInMethod.super.visitIntInsn(Opcodes.SIPUSH, index++);
+                        FindInMethod.super.visitVarInsn(t.getOpcode(Opcodes.ILOAD), loadIndex++);
+                        String factory;
+                        switch (descriptor) {
+                            case 'I':
+                                factory = "java/lang/Integer";
+                                break;
+                            case 'J':
+                                factory = "java/lang/Long";
+                                loadIndex++;
+                                break;
+                            case 'S':
+                                factory = "java/lang/Short";
+                                break;
+                            case 'F':
+                                factory = "java/lang/Float";
+                                break;
+                            case 'D':
+                                factory = "java/lang/Double";
+                                loadIndex++;
+                                break;
+                            case 'Z':
+                                factory = "java/lang/Boolean";
+                                break;
+                            case 'C':
+                                factory = "java/lang/Character";
+                                break;
+                            case 'B':
+                                factory = "java/lang/Byte";
+                                break;
+                            default:
+                                throw new IllegalStateException(t.toString());
+                        }
+                        FindInMethod.super.visitMethodInsn(Opcodes.INVOKESTATIC,
+                                factory, "valueOf", "(" + descriptor + ")L" + factory + ";"
+                        );
+                        FindInMethod.super.visitInsn(Opcodes.AASTORE);
+                    }
+
+                    @Override
+                    public SignatureVisitor visitArrayType() {
+                        if (nowReturn) {
+                            throw new IllegalStateException("Not supported yet");
+                        }
+                        loadObject();
+                        return new SignatureWriter();
+                    }
+
+                    @Override
+                    public void visitClassType(String name) {
+                        if (nowReturn) {
+                            returnType = Type.getObjectType(name);
+                            return;
+                        }
+                        loadObject();
+                    }
+
+                    @Override
+                    public SignatureVisitor visitReturnType() {
+                        nowReturn = true;
+                        return this;
+                    }
+
+                    private void loadObject() {
+                        FindInMethod.super.visitInsn(Opcodes.DUP);
+                        FindInMethod.super.visitIntInsn(Opcodes.SIPUSH, index++);
+                        FindInMethod.super.visitVarInsn(Opcodes.ALOAD, loadIndex++);
+                        FindInMethod.super.visitInsn(Opcodes.AASTORE);
+                    }
+
+                }
+                SV sv = new SV();
+                SignatureReader sr = new SignatureReader(desc);
+                sr.accept(sv);
+
+                if (needsVM) {
+                    FindInMethod.super.visitInsn(Opcodes.DUP);
+                    FindInMethod.super.visitIntInsn(Opcodes.SIPUSH, sv.index);
+                    int lastSlash = FindInClass.this.name.lastIndexOf('/');
+                    String jsCallbacks = FindInClass.this.name.substring(0, lastSlash + 1) + "$JsCallbacks$";
+                    FindInMethod.super.visitFieldInsn(Opcodes.GETSTATIC, jsCallbacks, "VM", "L" + jsCallbacks + ";");
+                    FindInMethod.super.visitMethodInsn(Opcodes.INVOKEVIRTUAL, jsCallbacks, "current", "()L" + jsCallbacks + ";");
+                    FindInMethod.super.visitInsn(Opcodes.AASTORE);
+                }
+
+                super.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
+                        "org/apidesign/html/boot/spi/Fn", "invoke", "(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;"
+                );
+                switch (sv.returnType.getSort()) {
+                    case Type.VOID:
+                        super.visitInsn(Opcodes.RETURN);
+                        break;
+                    case Type.ARRAY:
+                    case Type.OBJECT:
+                        super.visitTypeInsn(Opcodes.CHECKCAST, sv.returnType.getInternalName());
+                        super.visitInsn(Opcodes.ARETURN);
+                        break;
+                    case Type.BOOLEAN:
+                        super.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Boolean");
+                        super.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
+                                "java/lang/Boolean", "booleanValue", "()Z"
+                        );
+                        super.visitInsn(Opcodes.IRETURN);
+                        break;
+                    default:
+                        super.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Number");
+                        super.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
+                                "java/lang/Number", sv.returnType.getClassName() + "Value", "()" + sv.returnType.getDescriptor()
+                        );
+                        super.visitInsn(sv.returnType.getOpcode(Opcodes.IRETURN));
+                }
+                return true;
+            }
+
+            @Override
+            public void visitEnd() {
+                super.visitEnd();
+                if (body != null) {
+                    if (generateBody()) {
+                        // native method
+                        super.visitMaxs(1, 0);
+                    }
+                    FindInClass.this.visitField(
+                            Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC,
+                            "$$fn$$" + name + "_" + found,
+                            "Lorg/apidesign/html/boot/spi/Fn;",
+                            null, null
+                    );
+                }
+            }
+
+            private final class FindInAnno extends AnnotationVisitor {
+
+                private List<String> args = new ArrayList<String>();
+                private String body;
+                private boolean javacall = false;
+
+                public FindInAnno() {
+                    super(Opcodes.ASM4);
+                }
+
+                @Override
+                public void visit(String name, Object value) {
+                    if (name == null) {
+                        args.add((String) value);
+                        return;
+                    }
+                    if (name.equals("javacall")) { // NOI18N
+                        javacall = (Boolean) value;
+                        return;
+                    }
+                    assert name.equals("body");
+                    body = (String) value;
+                }
+
+                @Override
+                public AnnotationVisitor visitArray(String name) {
+                    return this;
+                }
+
+                @Override
+                public void visitEnd() {
+                    if (body != null) {
+                        if (javacall) {
+                            body = callback(body);
+                            args.add("vm");
+                        }
+                        generateJSBody(args, body);
+                    }
+                }
+            }
+        }
+
+        private final class LoadResource extends AnnotationVisitor {
+
+            public LoadResource() {
+                super(Opcodes.ASM4);
+            }
+
+            @Override
+            public void visit(String attrName, Object value) {
+                String relPath = (String) value;
+                if (relPath.startsWith("/")) {
+                    resource = relPath;
+                } else {
+                    int last = name.lastIndexOf('/');
+                    String fullPath = name.substring(0, last + 1) + relPath;
+                    resource = fullPath;
+                }
+            }
+        }
+    }
+
+    private static class ClassWriterEx extends ClassWriter {
+
+        private ClassLoader loader;
+
+        public ClassWriterEx(ClassLoader l, ClassReader classReader, int flags) {
+            super(classReader, flags);
+            this.loader = l;
+        }
+
+        @Override
+        protected String getCommonSuperClass(final String type1, final String type2) {
+            Class<?> c, d;
+            try {
+                c = Class.forName(type1.replace('/', '.'), false, loader);
+                d = Class.forName(type2.replace('/', '.'), false, loader);
+            } catch (Exception e) {
+                throw new RuntimeException(e.toString());
+            }
+            if (c.isAssignableFrom(d)) {
+                return type1;
+            }
+            if (d.isAssignableFrom(c)) {
+                return type2;
+            }
+            if (c.isInterface() || d.isInterface()) {
+                return "java/lang/Object";
+            } else {
+                do {
+                    c = c.getSuperclass();
+                } while (!c.isAssignableFrom(d));
+                return c.getName().replace('.', '/');
+            }
+        }
+    }
+
+    static byte[] transform(ClassLoader loader, byte[] arr) {
+        ClassReader cr = new ClassReader(arr) {
+            // to allow us to compile with -profile compact1 on 
+            // JDK8 while processing the class as JDK7, the highest
+            // class format asm 4.1 understands to
+            @Override
+            public short readShort(int index) {
+                short s = super.readShort(index);
+                if (index == 6 && s > Opcodes.V1_7) {
+                    return Opcodes.V1_7;
+                }
+                return s;
+            }
+        };
+        FindInClass tst = new FindInClass(loader, null);
+        cr.accept(tst, 0);
+        if (tst.found > 0) {
+            ClassWriter w = new ClassWriterEx(loader, cr, ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
+            FindInClass fic = new FindInClass(loader, w);
+            cr.accept(fic, 0);
+            arr = w.toByteArray();
+        }
+        return arr;
+    }
+
+    private static final class TrueFn extends Fn {
+        @Override
+        public Object invoke(Object thiz, Object... args) throws Exception {
+            return Boolean.TRUE;
+        }
+    } // end of TrueFn
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,369 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.Completion;
+import javax.annotation.processing.Completions;
+import javax.annotation.processing.Messager;
+import javax.annotation.processing.Processor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.ArrayType;
+import javax.lang.model.type.ExecutableType;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.tools.Diagnostic;
+import javax.tools.FileObject;
+import javax.tools.StandardLocation;
+import net.java.html.js.JavaScriptBody;
+import net.java.html.js.JavaScriptResource;
+import org.openide.util.lookup.ServiceProvider;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@ServiceProvider(service = Processor.class)
+public final class JavaScriptProcesor extends AbstractProcessor {
+    private final Map<String,Map<String,ExecutableElement>> javacalls = 
+        new HashMap<String,Map<String,ExecutableElement>>();
+    
+    @Override
+    public Set<String> getSupportedAnnotationTypes() {
+        Set<String> set = new HashSet<String>();
+        set.add(JavaScriptBody.class.getName());
+        set.add(JavaScriptResource.class.getName());
+        return set;
+    }
+    
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        final Messager msg = processingEnv.getMessager();
+        for (Element e : roundEnv.getElementsAnnotatedWith(JavaScriptBody.class)) {
+            if (e.getKind() != ElementKind.METHOD && e.getKind() != ElementKind.CONSTRUCTOR) {
+                continue;
+            }
+            ExecutableElement ee = (ExecutableElement)e;
+            List<? extends VariableElement> params = ee.getParameters();
+            
+            JavaScriptBody jsb = e.getAnnotation(JavaScriptBody.class);
+            if (jsb == null) {
+                continue;
+            }
+            String[] arr = jsb.args();
+            if (params.size() != arr.length) {
+                msg.printMessage(Diagnostic.Kind.ERROR, "Number of args arguments does not match real arguments!", e);
+            }
+            if (!jsb.javacall() && jsb.body().contains(".@")) {
+                msg.printMessage(Diagnostic.Kind.WARNING, "Usage of .@ usually requires javacall=true", e);
+            }
+            if (jsb.javacall()) {
+                JsCallback verify = new VerifyCallback(e);
+                try {
+                    verify.parse(jsb.body());
+                } catch (IllegalStateException ex) {
+                    msg.printMessage(Diagnostic.Kind.ERROR, ex.getLocalizedMessage(), e);
+                }
+            }
+        }
+        for (Element e : roundEnv.getElementsAnnotatedWith(JavaScriptResource.class)) {
+            JavaScriptResource r = e.getAnnotation(JavaScriptResource.class);
+            if (r == null) {
+                continue;
+            }
+            final String res;
+            if (r.value().startsWith("/")) {
+                res = r.value();
+            } else {
+                res = findPkg(e).replace('.', '/') + "/" + r.value();
+            }
+            
+            try {
+                FileObject os = processingEnv.getFiler().getResource(StandardLocation.SOURCE_PATH, "", res);
+                os.openInputStream().close();
+            } catch (IOException ex1) {
+                try {
+                    FileObject os2 = processingEnv.getFiler().getResource(StandardLocation.CLASS_OUTPUT, "", res);
+                    os2.openInputStream().close();
+                } catch (IOException ex2) {
+                    msg.printMessage(Diagnostic.Kind.ERROR, "Cannot find " + res + " in " + res + " package", e);
+                }
+            }
+        }
+
+        if (roundEnv.processingOver()) {
+            generateCallbackClass(javacalls);
+            javacalls.clear();
+        }
+        return true;
+    }
+
+    @Override
+    public Iterable<? extends Completion> getCompletions(Element e, 
+        AnnotationMirror annotation, ExecutableElement member, String userText
+    ) {
+        StringBuilder sb = new StringBuilder();
+        if (e.getKind() == ElementKind.METHOD && member.getSimpleName().contentEquals("args")) {
+            ExecutableElement ee = (ExecutableElement) e;
+            String sep = "";
+            sb.append("{ ");
+            for (VariableElement ve : ee.getParameters()) {
+                sb.append(sep).append('"').append(ve.getSimpleName())
+                    .append('"');
+                sep = ", ";
+            }
+            sb.append(" }");
+            return Collections.nCopies(1, Completions.of(sb.toString()));
+        }
+        return null;
+    }
+
+    private class VerifyCallback extends JsCallback {
+        private final Element e;
+        public VerifyCallback(Element e) {
+            this.e = e;
+        }
+
+        @Override
+        protected CharSequence callMethod(String ident, String fqn, String method, String params) {
+            final TypeElement type = processingEnv.getElementUtils().getTypeElement(fqn);
+            if (type == null) {
+                processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, 
+                    "Callback to non-existing class " + fqn, e
+                );
+                return "";
+            }
+            ExecutableElement found = null;
+            StringBuilder foundParams = new StringBuilder();
+            for (Element m : type.getEnclosedElements()) {
+                if (m.getKind() != ElementKind.METHOD) {
+                    continue;
+                }
+                if (m.getSimpleName().contentEquals(method)) {
+                    String paramTypes = findParamTypes((ExecutableElement)m);
+                    if (paramTypes.equals(params)) {
+                        found = (ExecutableElement) m;
+                        break;
+                    }
+                    foundParams.append(paramTypes).append("\n");
+                }
+            }
+            if (found == null) {
+                if (foundParams.length() == 0) {
+                    processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, 
+                        "Callback to class " + fqn + " with unknown method " + method, e
+                    );
+                } else {
+                    processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, 
+                        "Callback to " + fqn + "." + method + " with wrong parameters: " + 
+                        params + ". Only known parameters are " + foundParams, e
+                    );
+                }
+            } else {
+                Map<String,ExecutableElement> mangledOnes = javacalls.get(findPkg(e));
+                if (mangledOnes == null) {
+                    mangledOnes = new TreeMap<String, ExecutableElement>();
+                    javacalls.put(findPkg(e), mangledOnes);
+                }
+                String mangled = JsCallback.mangle(fqn, method, findParamTypes(found));
+                mangledOnes.put(mangled, found);
+            }
+            return "";
+        }
+
+        private String findParamTypes(ExecutableElement method) {
+            ExecutableType t = (ExecutableType) method.asType();
+            StringBuilder sb = new StringBuilder();
+            sb.append('(');
+            for (TypeMirror tm : t.getParameterTypes()) {
+                if (tm.getKind().isPrimitive()) {
+                    switch (tm.getKind()) {
+                        case INT: sb.append('I'); break;
+                        case BOOLEAN: sb.append('Z'); break;
+                        case BYTE: sb.append('B'); break;
+                        case CHAR: sb.append('C'); break;
+                        case SHORT: sb.append('S'); break;
+                        case DOUBLE: sb.append('D'); break;
+                        case FLOAT: sb.append('F'); break;
+                        case LONG: sb.append('J'); break;
+                        default:
+                            throw new IllegalStateException("Uknown " + tm.getKind());
+                    }
+                } else {
+                    while (tm.getKind() == TypeKind.ARRAY) {
+                        sb.append('[');
+                        tm = ((ArrayType)tm).getComponentType();
+                    }
+                    sb.append('L');
+                    sb.append(tm.toString().replace('.', '/'));
+                    sb.append(';');
+                }
+            }
+            sb.append(')');
+            return sb.toString();
+        }
+    }
+    
+    private void generateCallbackClass(Map<String,Map<String, ExecutableElement>> process) {
+        for (Map.Entry<String, Map<String, ExecutableElement>> pkgEn : process.entrySet()) {
+            String pkgName = pkgEn.getKey();
+            Map<String, ExecutableElement> map = pkgEn.getValue();
+            StringBuilder source = new StringBuilder();
+            source.append("package ").append(pkgName).append(";\n");
+            source.append("public final class $JsCallbacks$ {\n");
+            source.append("  static final $JsCallbacks$ VM = new $JsCallbacks$(null);\n");
+            source.append("  private final org.apidesign.html.boot.spi.Fn.Presenter p;\n");
+            source.append("  private $JsCallbacks$ last;\n");
+            source.append("  private $JsCallbacks$(org.apidesign.html.boot.spi.Fn.Presenter p) {\n");
+            source.append("    this.p = p;\n");
+            source.append("  }\n");
+            source.append("  final $JsCallbacks$ current() {\n");
+            source.append("    org.apidesign.html.boot.spi.Fn.Presenter now = org.apidesign.html.boot.spi.Fn.activePresenter();\n");
+            source.append("    if (now == p) return this;\n");
+            source.append("    if (last != null && now == last.p) return last;\n");
+            source.append("    return last = new $JsCallbacks$(now);\n");
+            source.append("  }\n");
+            for (Map.Entry<String, ExecutableElement> entry : map.entrySet()) {
+                final String mangled = entry.getKey();
+                final ExecutableElement m = entry.getValue();
+                final boolean isStatic = m.getModifiers().contains(Modifier.STATIC);
+                
+                source.append("\n  public java.lang.Object ")
+                    .append(mangled)
+                    .append("(");
+                
+                String sep = "";
+                if (!isStatic) {
+                    source.append(((TypeElement)m.getEnclosingElement()).getQualifiedName());
+                    source.append(" self");
+                    sep = ", ";
+                }
+                
+                int cnt = 0;
+                for (VariableElement ve : m.getParameters()) {
+                    source.append(sep);
+                    source.append(ve.asType());
+                    source.append(" arg").append(++cnt);
+                    sep = ", ";
+                }
+                source.append(") throws Throwable {\n");
+                if (processingEnv.getSourceVersion().compareTo(SourceVersion.RELEASE_7) >= 0) {
+                    source.append("    try (java.io.Closeable a = org.apidesign.html.boot.spi.Fn.activate(p)) { \n");
+                } else {
+                    source.append("    java.io.Closeable a = org.apidesign.html.boot.spi.Fn.activate(p); try {\n");
+                }
+                source.append("    ");
+                if (m.getReturnType().getKind() != TypeKind.VOID) {
+                    source.append("return ");
+                }
+                if (isStatic) {
+                    source.append(((TypeElement)m.getEnclosingElement()).getQualifiedName());
+                    source.append('.');
+                } else {
+                    source.append("self.");
+                }
+                source.append(m.getSimpleName());
+                source.append("(");
+                cnt = 0;
+                sep = "";
+                for (VariableElement ve : m.getParameters()) {
+                    source.append(sep);
+                    source.append("arg").append(++cnt);
+                    sep = ", ";
+                }
+                source.append(");\n");
+                if (m.getReturnType().getKind() == TypeKind.VOID) {
+                    source.append("    return null;\n");
+                }
+                if (processingEnv.getSourceVersion().compareTo(SourceVersion.RELEASE_7) >= 0) {
+                    source.append("    }\n");
+                } else {
+                    
+                    source.append("    } finally {\n");
+                    source.append("      a.close();\n");
+                    source.append("    }\n");
+                }
+                source.append("  }\n");
+            }
+            source.append("}\n");
+            final String srcName = pkgName + ".$JsCallbacks$";
+            try {
+                Writer w = processingEnv.getFiler().createSourceFile(srcName,
+                    map.values().toArray(new Element[map.size()])
+                ).openWriter();
+                w.write(source.toString());
+                w.close();
+            } catch (IOException ex) {
+                processingEnv.getMessager().printMessage(
+                    Diagnostic.Kind.ERROR, "Can't write " + srcName + ": " + ex.getMessage()
+                );
+            }
+        }
+    }
+    
+    private static String findPkg(Element e) {
+        while (e.getKind() != ElementKind.PACKAGE) {
+            e = e.getEnclosingElement();
+        }
+        return ((PackageElement)e).getQualifiedName().toString();
+    }
+    
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/netbeans/html/boot/impl/JsAgent.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/main/java/org/netbeans/html/boot/impl/JsAgent.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,67 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+import java.lang.instrument.ClassFileTransformer;
+import java.lang.instrument.IllegalClassFormatException;
+import java.lang.instrument.Instrumentation;
+import java.security.ProtectionDomain;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class JsAgent implements ClassFileTransformer {
+    public static void agentmain(String args, Instrumentation instr) {
+        instr.addTransformer(new JsAgent());
+    }
+
+    @Override
+    public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException {
+        try {
+            return FnUtils.transform(loader, classfileBuffer);
+        } catch (Exception ex) {
+            return classfileBuffer;
+        }
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/netbeans/html/boot/impl/JsCallback.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/main/java/org/netbeans/html/boot/impl/JsCallback.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,160 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+abstract class JsCallback {
+    final String parse(String body) {
+        StringBuilder sb = new StringBuilder();
+        int pos = 0;
+        for (;;) {
+            int next = body.indexOf(".@", pos);
+            if (next == -1) {
+                sb.append(body.substring(pos));
+                body = sb.toString();
+                break;
+            }
+            int ident = next;
+            while (ident > 0) {
+                if (!Character.isJavaIdentifierPart(body.charAt(--ident))) {
+                    ident++;
+                    break;
+                }
+            }
+            String refId = body.substring(ident, next);
+            
+            sb.append(body.substring(pos, ident));
+            
+            int sigBeg = body.indexOf('(', next);
+            int sigEnd = body.indexOf(')', sigBeg);
+            int colon4 = body.indexOf("::", next);
+            if (sigBeg == -1 || sigEnd == -1 || colon4 == -1) {
+                throw new IllegalStateException(
+                    "Wrong format of instance callback. "
+                    + "Should be: 'inst.@pkg.Class::method(Ljava/lang/Object;)(param)':\n" 
+                    + body
+                );
+            }
+            String fqn = body.substring(next + 2, colon4);
+            String method = body.substring(colon4 + 2, sigBeg);
+            String params = body.substring(sigBeg, sigEnd + 1);
+
+            int paramBeg = body.indexOf('(', sigEnd + 1);
+            if (paramBeg == -1) {
+                throw new IllegalStateException(
+                    "Wrong format of instance callback. "
+                    + "Should be: 'inst.@pkg.Class::method(Ljava/lang/Object;)(param)':\n" 
+                    + body
+                );
+            }
+            
+            sb.append(callMethod(refId, fqn, method, params));
+            if (body.charAt(paramBeg + 1) != (')')) {
+                sb.append(",");
+            }
+            pos = paramBeg + 1;
+        }
+        pos = 0;
+        sb = null;
+        for (;;) {
+            int next = body.indexOf("@", pos);
+            if (next == -1) {
+                if (sb == null) {
+                    return body;
+                }
+                sb.append(body.substring(pos));
+                return sb.toString();
+            }
+            if (sb == null) {
+                sb = new StringBuilder();
+            }
+            
+            sb.append(body.substring(pos, next));
+            
+            int sigBeg = body.indexOf('(', next);
+            int sigEnd = body.indexOf(')', sigBeg);
+            int colon4 = body.indexOf("::", next);
+            if (sigBeg == -1 || sigEnd == -1 || colon4 == -1) {
+                throw new IllegalStateException(
+                    "Wrong format of static callback. "
+                    + "Should be: '@pkg.Class::staticMethod(Ljava/lang/Object;)(param)':\n" 
+                    + body
+                );
+            }
+            String fqn = body.substring(next + 1, colon4);
+            String method = body.substring(colon4 + 2, sigBeg);
+            String params = body.substring(sigBeg, sigEnd + 1);
+
+            int paramBeg = body.indexOf('(', sigEnd + 1);
+            
+            sb.append(callMethod(null, fqn, method, params));
+            pos = paramBeg + 1;
+        }
+    }
+
+    protected abstract CharSequence callMethod(
+        String ident, String fqn, String method, String params
+    );
+
+    static String mangle(String fqn, String method, String params) {
+        if (params.startsWith("(")) {
+            params = params.substring(1);
+        }
+        if (params.endsWith(")")) {
+            params = params.substring(0, params.length() - 1);
+        }
+        return 
+            replace(fqn) + "$" + replace(method) + "$" + replace(params);
+    }
+    
+    private static String replace(String orig) {
+        return orig.replace("_", "_1").
+            replace(";", "_2").
+            replace("[", "_3").
+            replace('.', '_').replace('/', '_');
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/netbeans/html/boot/impl/JsClassLoader.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/main/java/org/netbeans/html/boot/impl/JsClassLoader.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,133 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+import org.apidesign.html.boot.spi.Fn;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.net.URL;
+import java.util.Enumeration;
+
+/** 
+ *
+ * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ */
+abstract class JsClassLoader extends ClassLoader {
+    JsClassLoader(ClassLoader parent) {
+        super(parent);
+        setDefaultAssertionStatus(JsClassLoader.class.desiredAssertionStatus());
+    }
+    
+    @Override
+    protected abstract URL findResource(String name);
+    
+    @Override
+    protected abstract Enumeration<URL> findResources(String name);
+
+    @Override
+    protected Class<?> findClass(String name) throws ClassNotFoundException {
+        if (name.startsWith("javafx")) {
+            return Class.forName(name);
+        }
+        if (name.startsWith("netscape")) {
+            return Class.forName(name);
+        }
+        if (name.startsWith("com.sun")) {
+            return Class.forName(name);
+        }
+        if (name.equals(JsClassLoader.class.getName())) {
+            return JsClassLoader.class;
+        }
+        if (name.equals(Fn.class.getName())) {
+            return Fn.class;
+        }
+        if (name.equals(Fn.Presenter.class.getName())) {
+            return Fn.Presenter.class;
+        }
+        if (name.equals(FnUtils.class.getName())) {
+            return FnUtils.class;
+        }
+        if (
+            name.equals("org.apidesign.html.boot.spi.Fn") ||
+            name.equals("org.netbeans.html.boot.impl.FnUtils") ||
+            name.equals("org.netbeans.html.boot.impl.FnContext")
+        ) {
+            return Class.forName(name);
+        }
+        URL u = findResource(name.replace('.', '/') + ".class");
+        if (u != null) {
+            InputStream is = null;
+            try {
+                is = u.openStream();
+                byte[] arr = new byte[is.available()];
+                int len = 0;
+                while (len < arr.length) {
+                    int read = is.read(arr, len, arr.length - len);
+                    if (read == -1) {
+                        throw new IOException("Can't read " + u);
+                    }
+                    len += read;
+                }
+                is.close();
+                is = null;
+                arr = FnUtils.transform(JsClassLoader.this, arr);
+                if (arr != null) {
+                    return defineClass(name, arr, 0, arr.length);
+                }
+            } catch (IOException ex) {
+                throw new ClassNotFoundException("Can't load " + name, ex);
+            } finally {
+                try {
+                    if (is != null) is.close();
+                } catch (IOException ex) {
+                    throw new ClassNotFoundException(null, ex);
+                }
+            }
+        }
+        return super.findClass(name);
+    }
+    
+    protected abstract Fn defineFn(String code, String... names);
+    protected abstract void loadScript(Reader code) throws Exception;
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/main/java/org/netbeans/html/boot/impl/Test.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/main/java/org/netbeans/html/boot/impl/Test.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,57 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+import java.util.concurrent.Callable;
+import net.java.html.js.JavaScriptBody;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class Test implements Callable<Boolean> {
+    @Override @JavaScriptBody(args = {}, body = "return true;")
+    public Boolean call() {
+        return false;
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/java/org/apidesign/html/boot/impl/Arithm.java
--- a/boot/src/test/java/org/apidesign/html/boot/impl/Arithm.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.impl;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class Arithm {
-    public int sumTwo(int a, int b) {
-        return a + b;
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/java/org/apidesign/html/boot/impl/Compile.java
--- a/boot/src/test/java/org/apidesign/html/boot/impl/Compile.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,291 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.impl;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.tools.Diagnostic;
-import javax.tools.DiagnosticListener;
-import javax.tools.FileObject;
-import javax.tools.ForwardingJavaFileManager;
-import javax.tools.JavaFileManager;
-import javax.tools.JavaFileObject;
-import javax.tools.JavaFileObject.Kind;
-import javax.tools.SimpleJavaFileObject;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.StandardLocation;
-import javax.tools.ToolProvider;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.fail;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-final class Compile implements DiagnosticListener<JavaFileObject> {
-    private final List<Diagnostic<? extends JavaFileObject>> errors = 
-            new ArrayList<Diagnostic<? extends JavaFileObject>>();
-    private final Map<String, byte[]> classes;
-    private final String pkg;
-    private final String cls;
-    private final String html;
-    private final String sourceLevel;
-
-    private Compile(String html, String code, String sl) throws IOException {
-        this.pkg = findPkg(code);
-        this.cls = findCls(code);
-        this.html = html;
-        this.sourceLevel = sl;
-        classes = compile(html, code);
-    }
-
-    /** Performs compilation of given HTML page and associated Java code
-     */
-    public static Compile create(String html, String code) throws IOException {
-        return create(html, code, "1.7");
-    }
-    static Compile create(String html, String code, String sourceLevel) throws IOException {
-        return new Compile(html, code, sourceLevel);
-    }
-    
-    /** Checks for given class among compiled resources */
-    public byte[] get(String res) {
-        return classes.get(res);
-    }
-    
-    /** Obtains errors created during compilation.
-     */
-    public List<Diagnostic<? extends JavaFileObject>> getErrors() {
-        List<Diagnostic<? extends JavaFileObject>> err;
-        err = new ArrayList<Diagnostic<? extends JavaFileObject>>();
-        for (Diagnostic<? extends JavaFileObject> diagnostic : errors) {
-            if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
-                err.add(diagnostic);
-            }
-        }
-        return err;
-    }
-    
-    private Map<String, byte[]> compile(final String html, final String code) throws IOException {
-        StandardJavaFileManager sjfm = ToolProvider.getSystemJavaCompiler().getStandardFileManager(this, null, null);
-
-        final Map<String, ByteArrayOutputStream> class2BAOS;
-        class2BAOS = new HashMap<String, ByteArrayOutputStream>();
-
-        JavaFileObject file = new SimpleJavaFileObject(URI.create("mem://mem"), Kind.SOURCE) {
-            @Override
-            public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
-                return code;
-            }
-        };
-        final JavaFileObject htmlFile = new SimpleJavaFileObject(URI.create("mem://mem2"), Kind.OTHER) {
-            @Override
-            public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
-                return html;
-            }
-
-            @Override
-            public InputStream openInputStream() throws IOException {
-                return new ByteArrayInputStream(html.getBytes());
-            }
-        };
-        
-        final URI scratch;
-        try {
-            scratch = new URI("mem://mem3");
-        } catch (URISyntaxException ex) {
-            throw new IOException(ex);
-        }
-        
-        JavaFileManager jfm = new ForwardingJavaFileManager<JavaFileManager>(sjfm) {
-            @Override
-            public JavaFileObject getJavaFileForOutput(Location location, String className, Kind kind, FileObject sibling) throws IOException {
-                if (kind  == Kind.CLASS) {
-                    final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-
-                    class2BAOS.put(className.replace('.', '/') + ".class", buffer);
-                    return new SimpleJavaFileObject(sibling.toUri(), kind) {
-                        @Override
-                        public OutputStream openOutputStream() throws IOException {
-                            return buffer;
-                        }
-                    };
-                }
-                
-                if (kind == Kind.SOURCE) {
-                    final String n = className.replace('.', '/') + ".java";
-                    final URI un;
-                    try {
-                        un = new URI("mem://" + n);
-                    } catch (URISyntaxException ex) {
-                        throw new IOException(ex);
-                    }
-                    return new VirtFO(un/*sibling.toUri()*/, kind, n);
-                }
-                
-                throw new IllegalStateException();
-            }
-
-            @Override
-            public FileObject getFileForInput(Location location, String packageName, String relativeName) throws IOException {
-                if (location == StandardLocation.SOURCE_PATH) {
-                    if (packageName.equals(pkg)) {
-                        return htmlFile;
-                    }
-                }
-                
-                return null;
-            }
-
-            @Override
-            public boolean isSameFile(FileObject a, FileObject b) {
-                if (a instanceof VirtFO && b instanceof VirtFO) {
-                    return ((VirtFO)a).getName().equals(((VirtFO)b).getName());
-                }
-                
-                return super.isSameFile(a, b);
-            }
-
-            class VirtFO extends SimpleJavaFileObject {
-
-                private final String n;
-
-                public VirtFO(URI uri, Kind kind, String n) {
-                    super(uri, kind);
-                    this.n = n;
-                }
-                private final ByteArrayOutputStream data = new ByteArrayOutputStream();
-
-                @Override
-                public OutputStream openOutputStream() throws IOException {
-                    return data;
-                }
-
-                @Override
-                public String getName() {
-                    return n;
-                }
-
-                @Override
-                public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
-                    data.close();
-                    return new String(data.toByteArray());
-                }
-            }
-        };
-
-        ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", "1.7"), null, Arrays.asList(file)).call();
-
-        Map<String, byte[]> result = new HashMap<String, byte[]>();
-
-        for (Map.Entry<String, ByteArrayOutputStream> e : class2BAOS.entrySet()) {
-            result.put(e.getKey(), e.getValue().toByteArray());
-        }
-
-        return result;
-    }
-
-
-    @Override
-    public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
-        errors.add(diagnostic);
-    }
-    private static String findPkg(String java) throws IOException {
-        Pattern p = Pattern.compile("package\\p{javaWhitespace}*([\\p{Alnum}\\.]+)\\p{javaWhitespace}*;", Pattern.MULTILINE);
-        Matcher m = p.matcher(java);
-        if (!m.find()) {
-            throw new IOException("Can't find package declaration in the java file");
-        }
-        String pkg = m.group(1);
-        return pkg;
-    }
-    private static String findCls(String java) throws IOException {
-        Pattern p = Pattern.compile("class\\p{javaWhitespace}*([\\p{Alnum}\\.]+)\\p{javaWhitespace}", Pattern.MULTILINE);
-        Matcher m = p.matcher(java);
-        if (!m.find()) {
-            throw new IOException("Can't find package declaration in the java file");
-        }
-        String cls = m.group(1);
-        return cls;
-    }
-
-    String getHtml() {
-        String fqn = "'" + pkg + '.' + cls + "'";
-        return html.replace("'${fqn}'", fqn);
-    }
-    void assertErrors() {
-        assertFalse(getErrors().isEmpty(), "There are supposed to be some errors");
-    }
-
-    void assertError(String expMsg) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Can't find ").append(expMsg).append(" among:");
-        for (Diagnostic<? extends JavaFileObject> e : errors) {
-            String msg = e.getMessage(Locale.US);
-            if (msg.contains(expMsg)) {
-                return;
-            }
-            sb.append("\n");
-            sb.append(msg);
-        }
-        fail(sb.toString());
-    }
-
-    void assertNoErrors() {
-        assertTrue(getErrors().isEmpty(), "No errors expected: " + getErrors());
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/java/org/apidesign/html/boot/impl/FnTest.java
--- a/boot/src/test/java/org/apidesign/html/boot/impl/FnTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.impl;
-
-import java.io.Closeable;
-import java.io.Reader;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import javax.script.Invocable;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-import org.apidesign.html.boot.spi.Fn;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class FnTest extends JsClassLoaderBase {
-    private static Fn.Presenter presenter;
-    
-    public FnTest() {
-    }
-
-    @BeforeClass
-    public static void createClassLoader() throws Exception {
-        ScriptEngineManager sem = new ScriptEngineManager();
-        final ScriptEngine eng = sem.getEngineByMimeType("text/javascript");
-        
-        final URL my = FnTest.class.getProtectionDomain().getCodeSource().getLocation();
-        ClassLoader parent = JsClassLoaderTest.class.getClassLoader().getParent();
-        final URLClassLoader ul = new URLClassLoader(new URL[] { my }, parent);
-        
-        class Impl implements FindResources, Fn.Presenter {
-            @Override
-            public void findResources(String path, Collection<? super URL> results, boolean oneIsEnough) {
-                URL u = ul.findResource(path);
-                if (u != null) {
-                    results.add(u);
-                }
-            }
-
-            @Override
-            public Fn defineFn(String code, String... names) {
-                StringBuilder sb = new StringBuilder();
-                sb.append("(function() {");
-                sb.append("return function(");
-                String sep = "";
-                for (String n : names) {
-                    sb.append(sep);
-                    sb.append(n);
-                    sep = ", ";
-                }
-                sb.append(") {");
-                sb.append(code);
-                sb.append("};");
-                sb.append("})()");
-                try {
-                    final Object val = eng.eval(sb.toString());
-                    return new Fn(this) {
-                        @Override
-                        public Object invoke(Object thiz, Object... args) throws Exception {
-                            List<Object> all = new ArrayList<Object>(args.length + 1);
-                            all.add(thiz == null ? val : thiz);
-                            all.addAll(Arrays.asList(args));
-                            Invocable inv = (Invocable)eng;
-                            try {
-                                Object ret = inv.invokeMethod(val, "call", all.toArray());
-                                return val.equals(ret) ? null : ret;
-                            } catch (ScriptException ex) {
-                                throw ex;
-                            }
-                        }
-                    };
-                } catch (ScriptException ex) {
-                    throw new LinkageError("Can't parse: " + sb, ex);
-                }
-            }
-
-            @Override
-            public void displayPage(URL resource, Runnable r) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public void loadScript(Reader code) throws Exception {
-                eng.eval(code);
-            }
-        }
-        Impl impl = new Impl();
-        ClassLoader loader = FnUtils.newLoader(impl, impl, parent);
-        presenter = impl;
-        
-        Closeable close = FnContext.activate(impl);
-        methodClass = loader.loadClass(JsMethods.class.getName());
-        close.close();
-    }
-
-    @BeforeMethod public void initPresenter() {
-        FnContext.currentPresenter(presenter);
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/java/org/apidesign/html/boot/impl/JavaScriptProcesorTest.java
--- a/boot/src/test/java/org/apidesign/html/boot/impl/JavaScriptProcesorTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.impl;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class JavaScriptProcesorTest {
-    
-    @Test public void detectCallbackToNonExistingClass() throws IOException {
-        String code = "package x.y.z;\n"
-            + "import net.java.html.js.JavaScriptBody;\n"
-            + "class X {\n"
-            + "  @JavaScriptBody(args={\"r\"}, javacall=true, body =\n"
-            + "    \"r.@java.lang.Runable::run()();\"\n" // typo
-            + "  )\n"
-            + "  private static native void callback(Runnable r);\n"
-            + "}\n";
-        
-        Compile c = Compile.create("", code);
-        c.assertErrors();
-        c.assertError("java.lang.Runable"); // typo
-    }
-
-    @Test public void detectCallbackToNonExistingMethod() throws IOException {
-        String code = "package x.y.z;\n"
-            + "import net.java.html.js.JavaScriptBody;\n"
-            + "class X {\n"
-            + "  @JavaScriptBody(args={\"r\"}, javacall=true, body =\n"
-            + "    \"r.@java.lang.Runnable::cancel()();\"\n"
-            + "  )\n"
-            + "  private static native void callback(Runnable r);\n"
-            + "}\n";
-        
-        Compile c = Compile.create("", code);
-        c.assertErrors();
-        c.assertError("method cancel");
-    }
-
-    @Test public void detectCallbackToNonExistingParams() throws IOException {
-        String code = "package x.y.z;\n"
-            + "import net.java.html.js.JavaScriptBody;\n"
-            + "class X {\n"
-            + "  @JavaScriptBody(args={\"r\"}, javacall=true, body =\n"
-            + "    \"r.@java.lang.Runnable::run(I)(10);\"\n"
-            + "  )\n"
-            + "  private static native void callback(Runnable r);\n"
-            + "}\n";
-        
-        Compile c = Compile.create("", code);
-        c.assertErrors();
-        c.assertError("wrong parameters: (I)");
-    }
-
-    @Test public void objectTypeParamsAreOK() throws IOException {
-        String code = "package x.y.z;\n"
-            + "import net.java.html.js.JavaScriptBody;\n"
-            + "class X {\n"
-            + "  @JavaScriptBody(args={\"r\"}, javacall=true, body =\n"
-            + "    \"r.@java.lang.Object::equals(Ljava/lang/Object;)(null);\"\n"
-            + "  )\n"
-            + "  private static native void testEqual(Object r);\n"
-            + "}\n";
-        
-        Compile c = Compile.create("", code);
-        c.assertNoErrors();
-    }
-    
-    @Test public void generatesCallbacksThatReturnObject() throws Exception {
-        Class<?> callbacksForTestPkg = Class.forName("org.apidesign.html.boot.impl.$JsCallbacks$");
-        Method m = callbacksForTestPkg.getDeclaredMethod("java_lang_Runnable$run$", Runnable.class);
-        assertEquals(m.getReturnType(), Object.class, "All methods always return object");
-    }
-    
-    @Test public void hasInstanceField() throws Exception {
-        Class<?> callbacksForTestPkg = Class.forName("org.apidesign.html.boot.impl.$JsCallbacks$");
-        Field f = callbacksForTestPkg.getDeclaredField("VM");
-        f.setAccessible(true);
-        assertTrue(callbacksForTestPkg.isInstance(f.get(null)), "Singleton field VM");
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/java/org/apidesign/html/boot/impl/JsClassLoaderBase.java
--- a/boot/src/test/java/org/apidesign/html/boot/impl/JsClassLoaderBase.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.impl;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- */
-public class JsClassLoaderBase {
-    protected static Class<?> methodClass;
-    
-    public JsClassLoaderBase() {
-    }
-    
-    @BeforeMethod
-    public void assertClassDefined() {
-        assertNotNull(methodClass, "BeforeClass set up code should provide methodClass");
-    }
-
-    @Test public void noParamMethod() throws Throwable {
-        Method plus = methodClass.getMethod("fortyTwo");
-        try {
-            final Object val = plus.invoke(null);
-            assertTrue(val instanceof Number, "A number returned " + val);
-            assertEquals(((Number)val).intValue(), 42);
-        } catch (InvocationTargetException ex) {
-            throw ex.getTargetException();
-        }
-    }
-    
-    @Test public void testExecuteScript() throws Throwable {
-        Method plus = methodClass.getMethod("plus", int.class, int.class);
-        try {
-            assertEquals(plus.invoke(null, 10, 20), 30);
-        } catch (InvocationTargetException ex) {
-            throw ex.getTargetException();
-        }
-    }
-
-    @Test public void overloadedMethod() throws Throwable {
-        Method plus = methodClass.getMethod("plus", int.class);
-        try {
-            assertEquals(plus.invoke(null, 10), 10);
-        } catch (InvocationTargetException ex) {
-            throw ex.getTargetException();
-        }
-    }
-    
-    @Test public void instanceMethod() throws Throwable {
-        Method plus = methodClass.getMethod("plusInst", int.class);
-        Object inst = methodClass.newInstance();
-        try {
-            assertEquals(plus.invoke(inst, 10), 10);
-        } catch (InvocationTargetException ex) {
-            throw ex.getTargetException();
-        }
-    }
-    
-    @Test public void staticThis() throws Throwable {
-        Method st = methodClass.getMethod("staticThis");
-        try {
-            assertNull(st.invoke(null));
-        } catch (InvocationTargetException ex) {
-            throw ex.getTargetException();
-        }
-    }
-
-    @Test public void getThis() throws Throwable {
-        Object th = methodClass.newInstance();
-        Method st = methodClass.getMethod("getThis");
-        try {
-            assertEquals(st.invoke(th), th);
-        } catch (InvocationTargetException ex) {
-            throw ex.getTargetException();
-        }
-    }
-    
-    @Test public void truth() throws Throwable {
-        Method st = methodClass.getMethod("truth");
-        assertTrue((st.getModifiers() & Modifier.STATIC) != 0, "Is static");
-        assertEquals(st.invoke(null), Boolean.TRUE, "Can return boolean");
-    }
-    
-    @Test public void callback() throws Throwable {
-        class R implements Runnable {
-            int cnt;
-            
-            @Override
-            public void run() {
-                cnt++;
-            }
-        }
-        R r = new R();
-        
-        Method inc = methodClass.getMethod("callback", Runnable.class);
-        inc.invoke(null, r);
-        
-        assertEquals(r.cnt, 1, "Callback happened");
-    }
-    
-    @Test public void sumArray() throws Throwable {
-        Method st = methodClass.getMethod("sumArr", int[].class);
-        assertEquals(st.invoke(null, new int[] { 1, 2, 3 }), 6, "1+2+3 is six");
-    }
-    
-    @Test public void javaScriptResource() throws Throwable {
-        try {
-            Method st = methodClass.getMethod("useExternalMul", int.class, int.class);
-            assertEquals(st.invoke(null, 6, 7), 42, "Meaning of JavaScript?");
-        } catch (InvocationTargetException ex) {
-            throw ex.getTargetException();
-        }
-    }
-    
-    @Test public void callJavaScriptMethodOnOwnClass() throws Throwable {
-        try {
-            Object thiz = methodClass.newInstance();
-            Method st = methodClass.getMethod("returnYourSelf", methodClass);
-            assertEquals(st.invoke(null, thiz), thiz, "Returns this");
-        } catch (InvocationTargetException ex) {
-            throw ex.getTargetException();
-        }
-    }
-    
-    @Test public void callStaticJavaMethod() throws Throwable {
-        Method st = methodClass.getMethod("staticCallback", int.class, int.class);
-        assertEquals(st.invoke(null, 6, 7), 42, "Meaning of JavaScript?");
-    }
-
-    @Test public void callStaticStringParamMethod() throws Throwable {
-        Method st = methodClass.getMethod("parseInt", String.class);
-        assertEquals(st.invoke(null, "42"), 42, "Meaning of JavaScript?");
-    }
-    
-    @Test public void firstLong() throws Throwable {
-        Method st = methodClass.getMethod("chooseLong", boolean.class, boolean.class, long.class, long.class);
-        assertEquals(st.invoke(null, true, false, 10, 20), 10L, "Take first value");
-    }
-
-    @Test public void secondLong() throws Throwable {
-        Method st = methodClass.getMethod("chooseLong", boolean.class, boolean.class, long.class, long.class);
-        assertEquals(st.invoke(null, false, true, 10, 20), 20L, "Take 2nd value");
-    }
-
-    @Test public void bothLong() throws Throwable {
-        Method st = methodClass.getMethod("chooseLong", boolean.class, boolean.class, long.class, long.class);
-        assertEquals(st.invoke(null, true, true, 10, 20), 30L, "Take both values");
-    }
-    
-    @Test public void recordError() throws Throwable {
-        Method st = methodClass.getMethod("recordError", Object.class);
-        assertEquals(st.invoke(methodClass.newInstance(), "Hello"), "Hello", "The same parameter returned");
-    }
-}
\ No newline at end of file
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/java/org/apidesign/html/boot/impl/JsClassLoaderTest.java
--- a/boot/src/test/java/org/apidesign/html/boot/impl/JsClassLoaderTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.impl;
-
-import java.io.Closeable;
-import java.io.Reader;
-import org.apidesign.html.boot.spi.Fn;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import javax.script.Invocable;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-
-/**
- *
- * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- */
-public class JsClassLoaderTest extends JsClassLoaderBase{
-    private static Fn.Presenter loader;
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        ScriptEngineManager sem = new ScriptEngineManager();
-        final ScriptEngine eng = sem.getEngineByMimeType("text/javascript");
-        
-        final URL my = JsClassLoaderTest.class.getProtectionDomain().getCodeSource().getLocation();
-        ClassLoader parent = JsClassLoaderTest.class.getClassLoader().getParent();
-        final URLClassLoader ul = new URLClassLoader(new URL[] { my }, parent);
-        class MyCL extends JsClassLoader implements Fn.Presenter {
-
-            public MyCL(ClassLoader parent) {
-                super(parent);
-            }
-            
-            @Override
-            protected URL findResource(String name) {
-                return ul.getResource(name);
-            }
-            @Override
-            public Fn defineFn(String code, String... names) {
-                StringBuilder sb = new StringBuilder();
-                sb.append("(function() {");
-                sb.append("return function(");
-                String sep = "";
-                for (String n : names) {
-                    sb.append(sep);
-                    sb.append(n);
-                    sep = ", ";
-                }
-                sb.append(") {");
-                sb.append(code);
-                sb.append("};");
-                sb.append("})()");
-                try {
-                    final Object val = eng.eval(sb.toString());
-                    return new Fn(this) {
-                        @Override
-                        public Object invoke(Object thiz, Object... args) throws Exception {
-                            List<Object> all = new ArrayList<Object>(args.length + 1);
-                            all.add(thiz == null ? val : thiz);
-                            all.addAll(Arrays.asList(args));
-                            Invocable inv = (Invocable)eng;
-                            try {
-                                Object ret = inv.invokeMethod(val, "call", all.toArray());
-                                return val.equals(ret) ? null : ret;
-                            } catch (Exception ex) {
-                                throw ex;
-                            }
-                        }
-                    };
-                } catch (ScriptException ex) {
-                    throw new LinkageError("Can't parse: " + sb, ex);
-                }
-            }
-
-            @Override
-            protected Enumeration<URL> findResources(String name) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public void loadScript(Reader code) throws ScriptException {
-                eng.eval(code);
-            }
-
-            @Override
-            public void displayPage(URL page, Runnable onPageLoad) {
-                throw new UnsupportedOperationException();
-            }
-        };
-        
-        MyCL l = new MyCL(parent);
-        Closeable close = FnContext.activate(l);
-        methodClass = l.loadClass(JsMethods.class.getName());
-        close.close();
-        loader = l;
-    }
-    
-    @BeforeMethod public void initPresenter() {
-        FnContext.currentPresenter(loader);
-    }
-
-    @AfterClass
-    public static void cleanUp() {
-        methodClass = null;
-    }
-}
\ No newline at end of file
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/java/org/apidesign/html/boot/impl/JsMethods.java
--- a/boot/src/test/java/org/apidesign/html/boot/impl/JsMethods.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.boot.impl;
-
-import net.java.html.js.JavaScriptBody;
-import net.java.html.js.JavaScriptResource;
-
-
-/**
- *
- * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- */
-@JavaScriptResource("jsmethods.js")
-public class JsMethods {
-    private Object value;
-    
-    @JavaScriptBody(args = {}, body = "return 42;")
-    public static Object fortyTwo() {
-        return -42;
-    }
-    
-    @JavaScriptBody(args = {"x", "y" }, body = "return x + y;")
-    public static native int plus(int x, int y);
-    
-    @JavaScriptBody(args = {"x"}, body = "return x;")
-    public static native int plus(int x);
-    
-    @JavaScriptBody(args = {}, body = "return this;")
-    public static native Object staticThis();
-    
-    @JavaScriptBody(args = {}, body = "return this;")
-    public native Object getThis();
-    @JavaScriptBody(args = {"x"}, body = "return x;")
-    public native int plusInst(int x);
-    
-    @JavaScriptBody(args = {}, body = "return true;")
-    public static boolean truth() {
-        return false;
-    }
-    
-    @JavaScriptBody(args = { "r" }, javacall=true, body = "r.@java.lang.Runnable::run()();")
-    public static native void callback(Runnable r);
-    
-    @JavaScriptBody(args = { "at", "arr" }, javacall = true, body =
-          "var a = 0;\n"
-        + "for (var i = 0; i < arr.length; i++) {\n"
-        + "  a = at.@org.apidesign.html.boot.impl.Arithm::sumTwo(II)(a, arr[i]);\n"
-        + "}\n"
-        + "return a;"
-    )
-    private static native int sumArr(Arithm at, int... arr);
-    
-    public static int sumArr(int... arr) {
-        return sumArr(new Arithm(), arr);
-    }
-    
-    @JavaScriptBody(args = { "x", "y" }, body = "return mul(x, y);")
-    public static native int useExternalMul(int x, int y);
-    
-    @JavaScriptBody(args = { "m" }, javacall = true, body = "return m.@org.apidesign.html.boot.impl.JsMethods::getThis()();")
-    public static native JsMethods returnYourSelf(JsMethods m);
-    
-    @JavaScriptBody(args = { "x", "y" }, javacall = true, body = "return @org.apidesign.html.boot.impl.JsMethods::useExternalMul(II)(x, y);")
-    public static native int staticCallback(int x, int y);
-
-    @JavaScriptBody(args = { "v" }, javacall = true, body = "return @java.lang.Integer::parseInt(Ljava/lang/String;)(v);")
-    public static native int parseInt(String v);
-    
-    @JavaScriptBody(args = { "useA", "useB", "a", "b" }, body = "var l = 0;"
-        + "if (useA) l += a;\n"
-        + "if (useB) l += b;\n"
-        + "return l;\n"
-    )
-    public static native long chooseLong(boolean useA, boolean useB, long a, long b);
-    
-    protected void onError(Object o) throws Exception {
-        value = o;
-    }
-    
-    Object getError() {
-        return value;
-    }
-    
-    @JavaScriptBody(args = { "err" }, javacall = true, body = 
-        "this.@org.apidesign.html.boot.impl.JsMethods::onError(Ljava/lang/Object;)(err);"
-      + "return this.@org.apidesign.html.boot.impl.JsMethods::getError()();"
-    )
-    public native Object recordError(Object err);
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/java/org/netbeans/html/boot/impl/Arithm.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/test/java/org/netbeans/html/boot/impl/Arithm.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,53 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class Arithm {
+    public int sumTwo(int a, int b) {
+        return a + b;
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/java/org/netbeans/html/boot/impl/Compile.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/test/java/org/netbeans/html/boot/impl/Compile.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,291 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticListener;
+import javax.tools.FileObject;
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+import javax.tools.ToolProvider;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.fail;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class Compile implements DiagnosticListener<JavaFileObject> {
+    private final List<Diagnostic<? extends JavaFileObject>> errors = 
+            new ArrayList<Diagnostic<? extends JavaFileObject>>();
+    private final Map<String, byte[]> classes;
+    private final String pkg;
+    private final String cls;
+    private final String html;
+    private final String sourceLevel;
+
+    private Compile(String html, String code, String sl) throws IOException {
+        this.pkg = findPkg(code);
+        this.cls = findCls(code);
+        this.html = html;
+        this.sourceLevel = sl;
+        classes = compile(html, code);
+    }
+
+    /** Performs compilation of given HTML page and associated Java code
+     */
+    public static Compile create(String html, String code) throws IOException {
+        return create(html, code, "1.7");
+    }
+    static Compile create(String html, String code, String sourceLevel) throws IOException {
+        return new Compile(html, code, sourceLevel);
+    }
+    
+    /** Checks for given class among compiled resources */
+    public byte[] get(String res) {
+        return classes.get(res);
+    }
+    
+    /** Obtains errors created during compilation.
+     */
+    public List<Diagnostic<? extends JavaFileObject>> getErrors() {
+        List<Diagnostic<? extends JavaFileObject>> err;
+        err = new ArrayList<Diagnostic<? extends JavaFileObject>>();
+        for (Diagnostic<? extends JavaFileObject> diagnostic : errors) {
+            if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
+                err.add(diagnostic);
+            }
+        }
+        return err;
+    }
+    
+    private Map<String, byte[]> compile(final String html, final String code) throws IOException {
+        StandardJavaFileManager sjfm = ToolProvider.getSystemJavaCompiler().getStandardFileManager(this, null, null);
+
+        final Map<String, ByteArrayOutputStream> class2BAOS;
+        class2BAOS = new HashMap<String, ByteArrayOutputStream>();
+
+        JavaFileObject file = new SimpleJavaFileObject(URI.create("mem://mem"), Kind.SOURCE) {
+            @Override
+            public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                return code;
+            }
+        };
+        final JavaFileObject htmlFile = new SimpleJavaFileObject(URI.create("mem://mem2"), Kind.OTHER) {
+            @Override
+            public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                return html;
+            }
+
+            @Override
+            public InputStream openInputStream() throws IOException {
+                return new ByteArrayInputStream(html.getBytes());
+            }
+        };
+        
+        final URI scratch;
+        try {
+            scratch = new URI("mem://mem3");
+        } catch (URISyntaxException ex) {
+            throw new IOException(ex);
+        }
+        
+        JavaFileManager jfm = new ForwardingJavaFileManager<JavaFileManager>(sjfm) {
+            @Override
+            public JavaFileObject getJavaFileForOutput(Location location, String className, Kind kind, FileObject sibling) throws IOException {
+                if (kind  == Kind.CLASS) {
+                    final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+
+                    class2BAOS.put(className.replace('.', '/') + ".class", buffer);
+                    return new SimpleJavaFileObject(sibling.toUri(), kind) {
+                        @Override
+                        public OutputStream openOutputStream() throws IOException {
+                            return buffer;
+                        }
+                    };
+                }
+                
+                if (kind == Kind.SOURCE) {
+                    final String n = className.replace('.', '/') + ".java";
+                    final URI un;
+                    try {
+                        un = new URI("mem://" + n);
+                    } catch (URISyntaxException ex) {
+                        throw new IOException(ex);
+                    }
+                    return new VirtFO(un/*sibling.toUri()*/, kind, n);
+                }
+                
+                throw new IllegalStateException();
+            }
+
+            @Override
+            public FileObject getFileForInput(Location location, String packageName, String relativeName) throws IOException {
+                if (location == StandardLocation.SOURCE_PATH) {
+                    if (packageName.equals(pkg)) {
+                        return htmlFile;
+                    }
+                }
+                
+                return null;
+            }
+
+            @Override
+            public boolean isSameFile(FileObject a, FileObject b) {
+                if (a instanceof VirtFO && b instanceof VirtFO) {
+                    return ((VirtFO)a).getName().equals(((VirtFO)b).getName());
+                }
+                
+                return super.isSameFile(a, b);
+            }
+
+            class VirtFO extends SimpleJavaFileObject {
+
+                private final String n;
+
+                public VirtFO(URI uri, Kind kind, String n) {
+                    super(uri, kind);
+                    this.n = n;
+                }
+                private final ByteArrayOutputStream data = new ByteArrayOutputStream();
+
+                @Override
+                public OutputStream openOutputStream() throws IOException {
+                    return data;
+                }
+
+                @Override
+                public String getName() {
+                    return n;
+                }
+
+                @Override
+                public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                    data.close();
+                    return new String(data.toByteArray());
+                }
+            }
+        };
+
+        ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", "1.7"), null, Arrays.asList(file)).call();
+
+        Map<String, byte[]> result = new HashMap<String, byte[]>();
+
+        for (Map.Entry<String, ByteArrayOutputStream> e : class2BAOS.entrySet()) {
+            result.put(e.getKey(), e.getValue().toByteArray());
+        }
+
+        return result;
+    }
+
+
+    @Override
+    public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+        errors.add(diagnostic);
+    }
+    private static String findPkg(String java) throws IOException {
+        Pattern p = Pattern.compile("package\\p{javaWhitespace}*([\\p{Alnum}\\.]+)\\p{javaWhitespace}*;", Pattern.MULTILINE);
+        Matcher m = p.matcher(java);
+        if (!m.find()) {
+            throw new IOException("Can't find package declaration in the java file");
+        }
+        String pkg = m.group(1);
+        return pkg;
+    }
+    private static String findCls(String java) throws IOException {
+        Pattern p = Pattern.compile("class\\p{javaWhitespace}*([\\p{Alnum}\\.]+)\\p{javaWhitespace}", Pattern.MULTILINE);
+        Matcher m = p.matcher(java);
+        if (!m.find()) {
+            throw new IOException("Can't find package declaration in the java file");
+        }
+        String cls = m.group(1);
+        return cls;
+    }
+
+    String getHtml() {
+        String fqn = "'" + pkg + '.' + cls + "'";
+        return html.replace("'${fqn}'", fqn);
+    }
+    void assertErrors() {
+        assertFalse(getErrors().isEmpty(), "There are supposed to be some errors");
+    }
+
+    void assertError(String expMsg) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Can't find ").append(expMsg).append(" among:");
+        for (Diagnostic<? extends JavaFileObject> e : errors) {
+            String msg = e.getMessage(Locale.US);
+            if (msg.contains(expMsg)) {
+                return;
+            }
+            sb.append("\n");
+            sb.append(msg);
+        }
+        fail(sb.toString());
+    }
+
+    void assertNoErrors() {
+        assertTrue(getErrors().isEmpty(), "No errors expected: " + getErrors());
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/java/org/netbeans/html/boot/impl/FnTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/test/java/org/netbeans/html/boot/impl/FnTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,148 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+import java.io.Closeable;
+import java.io.Reader;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import org.apidesign.html.boot.spi.Fn;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class FnTest extends JsClassLoaderBase {
+    private static Fn.Presenter presenter;
+    
+    public FnTest() {
+    }
+
+    @BeforeClass
+    public static void createClassLoader() throws Exception {
+        ScriptEngineManager sem = new ScriptEngineManager();
+        final ScriptEngine eng = sem.getEngineByMimeType("text/javascript");
+        
+        final URL my = FnTest.class.getProtectionDomain().getCodeSource().getLocation();
+        ClassLoader parent = JsClassLoaderTest.class.getClassLoader().getParent();
+        final URLClassLoader ul = new URLClassLoader(new URL[] { my }, parent);
+        
+        class Impl implements FindResources, Fn.Presenter {
+            @Override
+            public void findResources(String path, Collection<? super URL> results, boolean oneIsEnough) {
+                URL u = ul.findResource(path);
+                if (u != null) {
+                    results.add(u);
+                }
+            }
+
+            @Override
+            public Fn defineFn(String code, String... names) {
+                StringBuilder sb = new StringBuilder();
+                sb.append("(function() {");
+                sb.append("return function(");
+                String sep = "";
+                for (String n : names) {
+                    sb.append(sep);
+                    sb.append(n);
+                    sep = ", ";
+                }
+                sb.append(") {");
+                sb.append(code);
+                sb.append("};");
+                sb.append("})()");
+                try {
+                    final Object val = eng.eval(sb.toString());
+                    return new Fn(this) {
+                        @Override
+                        public Object invoke(Object thiz, Object... args) throws Exception {
+                            List<Object> all = new ArrayList<Object>(args.length + 1);
+                            all.add(thiz == null ? val : thiz);
+                            all.addAll(Arrays.asList(args));
+                            Invocable inv = (Invocable)eng;
+                            try {
+                                Object ret = inv.invokeMethod(val, "call", all.toArray());
+                                return val.equals(ret) ? null : ret;
+                            } catch (ScriptException ex) {
+                                throw ex;
+                            }
+                        }
+                    };
+                } catch (ScriptException ex) {
+                    throw new LinkageError("Can't parse: " + sb, ex);
+                }
+            }
+
+            @Override
+            public void displayPage(URL resource, Runnable r) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public void loadScript(Reader code) throws Exception {
+                eng.eval(code);
+            }
+        }
+        Impl impl = new Impl();
+        ClassLoader loader = FnUtils.newLoader(impl, impl, parent);
+        presenter = impl;
+        
+        Closeable close = FnContext.activate(impl);
+        methodClass = loader.loadClass(JsMethods.class.getName());
+        close.close();
+    }
+
+    @BeforeMethod public void initPresenter() {
+        FnContext.currentPresenter(presenter);
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/java/org/netbeans/html/boot/impl/JavaScriptProcesorTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/test/java/org/netbeans/html/boot/impl/JavaScriptProcesorTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,129 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class JavaScriptProcesorTest {
+    
+    @Test public void detectCallbackToNonExistingClass() throws IOException {
+        String code = "package x.y.z;\n"
+            + "import net.java.html.js.JavaScriptBody;\n"
+            + "class X {\n"
+            + "  @JavaScriptBody(args={\"r\"}, javacall=true, body =\n"
+            + "    \"r.@java.lang.Runable::run()();\"\n" // typo
+            + "  )\n"
+            + "  private static native void callback(Runnable r);\n"
+            + "}\n";
+        
+        Compile c = Compile.create("", code);
+        c.assertErrors();
+        c.assertError("java.lang.Runable"); // typo
+    }
+
+    @Test public void detectCallbackToNonExistingMethod() throws IOException {
+        String code = "package x.y.z;\n"
+            + "import net.java.html.js.JavaScriptBody;\n"
+            + "class X {\n"
+            + "  @JavaScriptBody(args={\"r\"}, javacall=true, body =\n"
+            + "    \"r.@java.lang.Runnable::cancel()();\"\n"
+            + "  )\n"
+            + "  private static native void callback(Runnable r);\n"
+            + "}\n";
+        
+        Compile c = Compile.create("", code);
+        c.assertErrors();
+        c.assertError("method cancel");
+    }
+
+    @Test public void detectCallbackToNonExistingParams() throws IOException {
+        String code = "package x.y.z;\n"
+            + "import net.java.html.js.JavaScriptBody;\n"
+            + "class X {\n"
+            + "  @JavaScriptBody(args={\"r\"}, javacall=true, body =\n"
+            + "    \"r.@java.lang.Runnable::run(I)(10);\"\n"
+            + "  )\n"
+            + "  private static native void callback(Runnable r);\n"
+            + "}\n";
+        
+        Compile c = Compile.create("", code);
+        c.assertErrors();
+        c.assertError("wrong parameters: (I)");
+    }
+
+    @Test public void objectTypeParamsAreOK() throws IOException {
+        String code = "package x.y.z;\n"
+            + "import net.java.html.js.JavaScriptBody;\n"
+            + "class X {\n"
+            + "  @JavaScriptBody(args={\"r\"}, javacall=true, body =\n"
+            + "    \"r.@java.lang.Object::equals(Ljava/lang/Object;)(null);\"\n"
+            + "  )\n"
+            + "  private static native void testEqual(Object r);\n"
+            + "}\n";
+        
+        Compile c = Compile.create("", code);
+        c.assertNoErrors();
+    }
+    
+    @Test public void generatesCallbacksThatReturnObject() throws Exception {
+        Class<?> callbacksForTestPkg = Class.forName("org.netbeans.html.boot.impl.$JsCallbacks$");
+        Method m = callbacksForTestPkg.getDeclaredMethod("java_lang_Runnable$run$", Runnable.class);
+        assertEquals(m.getReturnType(), Object.class, "All methods always return object");
+    }
+    
+    @Test public void hasInstanceField() throws Exception {
+        Class<?> callbacksForTestPkg = Class.forName("org.netbeans.html.boot.impl.$JsCallbacks$");
+        Field f = callbacksForTestPkg.getDeclaredField("VM");
+        f.setAccessible(true);
+        assertTrue(callbacksForTestPkg.isInstance(f.get(null)), "Singleton field VM");
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/java/org/netbeans/html/boot/impl/JsClassLoaderBase.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/test/java/org/netbeans/html/boot/impl/JsClassLoaderBase.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,201 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import static org.testng.Assert.*;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ */
+public class JsClassLoaderBase {
+    protected static Class<?> methodClass;
+    
+    public JsClassLoaderBase() {
+    }
+    
+    @BeforeMethod
+    public void assertClassDefined() {
+        assertNotNull(methodClass, "BeforeClass set up code should provide methodClass");
+    }
+
+    @Test public void noParamMethod() throws Throwable {
+        Method plus = methodClass.getMethod("fortyTwo");
+        try {
+            final Object val = plus.invoke(null);
+            assertTrue(val instanceof Number, "A number returned " + val);
+            assertEquals(((Number)val).intValue(), 42);
+        } catch (InvocationTargetException ex) {
+            throw ex.getTargetException();
+        }
+    }
+    
+    @Test public void testExecuteScript() throws Throwable {
+        Method plus = methodClass.getMethod("plus", int.class, int.class);
+        try {
+            assertEquals(plus.invoke(null, 10, 20), 30);
+        } catch (InvocationTargetException ex) {
+            throw ex.getTargetException();
+        }
+    }
+
+    @Test public void overloadedMethod() throws Throwable {
+        Method plus = methodClass.getMethod("plus", int.class);
+        try {
+            assertEquals(plus.invoke(null, 10), 10);
+        } catch (InvocationTargetException ex) {
+            throw ex.getTargetException();
+        }
+    }
+    
+    @Test public void instanceMethod() throws Throwable {
+        Method plus = methodClass.getMethod("plusInst", int.class);
+        Object inst = methodClass.newInstance();
+        try {
+            assertEquals(plus.invoke(inst, 10), 10);
+        } catch (InvocationTargetException ex) {
+            throw ex.getTargetException();
+        }
+    }
+    
+    @Test public void staticThis() throws Throwable {
+        Method st = methodClass.getMethod("staticThis");
+        try {
+            assertNull(st.invoke(null));
+        } catch (InvocationTargetException ex) {
+            throw ex.getTargetException();
+        }
+    }
+
+    @Test public void getThis() throws Throwable {
+        Object th = methodClass.newInstance();
+        Method st = methodClass.getMethod("getThis");
+        try {
+            assertEquals(st.invoke(th), th);
+        } catch (InvocationTargetException ex) {
+            throw ex.getTargetException();
+        }
+    }
+    
+    @Test public void truth() throws Throwable {
+        Method st = methodClass.getMethod("truth");
+        assertTrue((st.getModifiers() & Modifier.STATIC) != 0, "Is static");
+        assertEquals(st.invoke(null), Boolean.TRUE, "Can return boolean");
+    }
+    
+    @Test public void callback() throws Throwable {
+        class R implements Runnable {
+            int cnt;
+            
+            @Override
+            public void run() {
+                cnt++;
+            }
+        }
+        R r = new R();
+        
+        Method inc = methodClass.getMethod("callback", Runnable.class);
+        inc.invoke(null, r);
+        
+        assertEquals(r.cnt, 1, "Callback happened");
+    }
+    
+    @Test public void sumArray() throws Throwable {
+        Method st = methodClass.getMethod("sumArr", int[].class);
+        assertEquals(st.invoke(null, new int[] { 1, 2, 3 }), 6, "1+2+3 is six");
+    }
+    
+    @Test public void javaScriptResource() throws Throwable {
+        try {
+            Method st = methodClass.getMethod("useExternalMul", int.class, int.class);
+            assertEquals(st.invoke(null, 6, 7), 42, "Meaning of JavaScript?");
+        } catch (InvocationTargetException ex) {
+            throw ex.getTargetException();
+        }
+    }
+    
+    @Test public void callJavaScriptMethodOnOwnClass() throws Throwable {
+        try {
+            Object thiz = methodClass.newInstance();
+            Method st = methodClass.getMethod("returnYourSelf", methodClass);
+            assertEquals(st.invoke(null, thiz), thiz, "Returns this");
+        } catch (InvocationTargetException ex) {
+            throw ex.getTargetException();
+        }
+    }
+    
+    @Test public void callStaticJavaMethod() throws Throwable {
+        Method st = methodClass.getMethod("staticCallback", int.class, int.class);
+        assertEquals(st.invoke(null, 6, 7), 42, "Meaning of JavaScript?");
+    }
+
+    @Test public void callStaticStringParamMethod() throws Throwable {
+        Method st = methodClass.getMethod("parseInt", String.class);
+        assertEquals(st.invoke(null, "42"), 42, "Meaning of JavaScript?");
+    }
+    
+    @Test public void firstLong() throws Throwable {
+        Method st = methodClass.getMethod("chooseLong", boolean.class, boolean.class, long.class, long.class);
+        assertEquals(st.invoke(null, true, false, 10, 20), 10L, "Take first value");
+    }
+
+    @Test public void secondLong() throws Throwable {
+        Method st = methodClass.getMethod("chooseLong", boolean.class, boolean.class, long.class, long.class);
+        assertEquals(st.invoke(null, false, true, 10, 20), 20L, "Take 2nd value");
+    }
+
+    @Test public void bothLong() throws Throwable {
+        Method st = methodClass.getMethod("chooseLong", boolean.class, boolean.class, long.class, long.class);
+        assertEquals(st.invoke(null, true, true, 10, 20), 30L, "Take both values");
+    }
+    
+    @Test public void recordError() throws Throwable {
+        Method st = methodClass.getMethod("recordError", Object.class);
+        assertEquals(st.invoke(methodClass.newInstance(), "Hello"), "Hello", "The same parameter returned");
+    }
+}
\ No newline at end of file
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/java/org/netbeans/html/boot/impl/JsClassLoaderTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/test/java/org/netbeans/html/boot/impl/JsClassLoaderTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,155 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+import java.io.Closeable;
+import java.io.Reader;
+import org.apidesign.html.boot.spi.Fn;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+
+/**
+ *
+ * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ */
+public class JsClassLoaderTest extends JsClassLoaderBase{
+    private static Fn.Presenter loader;
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        ScriptEngineManager sem = new ScriptEngineManager();
+        final ScriptEngine eng = sem.getEngineByMimeType("text/javascript");
+        
+        final URL my = JsClassLoaderTest.class.getProtectionDomain().getCodeSource().getLocation();
+        ClassLoader parent = JsClassLoaderTest.class.getClassLoader().getParent();
+        final URLClassLoader ul = new URLClassLoader(new URL[] { my }, parent);
+        class MyCL extends JsClassLoader implements Fn.Presenter {
+
+            public MyCL(ClassLoader parent) {
+                super(parent);
+            }
+            
+            @Override
+            protected URL findResource(String name) {
+                return ul.getResource(name);
+            }
+            @Override
+            public Fn defineFn(String code, String... names) {
+                StringBuilder sb = new StringBuilder();
+                sb.append("(function() {");
+                sb.append("return function(");
+                String sep = "";
+                for (String n : names) {
+                    sb.append(sep);
+                    sb.append(n);
+                    sep = ", ";
+                }
+                sb.append(") {");
+                sb.append(code);
+                sb.append("};");
+                sb.append("})()");
+                try {
+                    final Object val = eng.eval(sb.toString());
+                    return new Fn(this) {
+                        @Override
+                        public Object invoke(Object thiz, Object... args) throws Exception {
+                            List<Object> all = new ArrayList<Object>(args.length + 1);
+                            all.add(thiz == null ? val : thiz);
+                            all.addAll(Arrays.asList(args));
+                            Invocable inv = (Invocable)eng;
+                            try {
+                                Object ret = inv.invokeMethod(val, "call", all.toArray());
+                                return val.equals(ret) ? null : ret;
+                            } catch (Exception ex) {
+                                throw ex;
+                            }
+                        }
+                    };
+                } catch (ScriptException ex) {
+                    throw new LinkageError("Can't parse: " + sb, ex);
+                }
+            }
+
+            @Override
+            protected Enumeration<URL> findResources(String name) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public void loadScript(Reader code) throws ScriptException {
+                eng.eval(code);
+            }
+
+            @Override
+            public void displayPage(URL page, Runnable onPageLoad) {
+                throw new UnsupportedOperationException();
+            }
+        };
+        
+        MyCL l = new MyCL(parent);
+        Closeable close = FnContext.activate(l);
+        methodClass = l.loadClass(JsMethods.class.getName());
+        close.close();
+        loader = l;
+    }
+    
+    @BeforeMethod public void initPresenter() {
+        FnContext.currentPresenter(loader);
+    }
+
+    @AfterClass
+    public static void cleanUp() {
+        methodClass = null;
+    }
+}
\ No newline at end of file
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/java/org/netbeans/html/boot/impl/JsMethods.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/test/java/org/netbeans/html/boot/impl/JsMethods.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,129 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+import net.java.html.js.JavaScriptBody;
+import net.java.html.js.JavaScriptResource;
+
+
+/**
+ *
+ * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ */
+@JavaScriptResource("jsmethods.js")
+public class JsMethods {
+    private Object value;
+    
+    @JavaScriptBody(args = {}, body = "return 42;")
+    public static Object fortyTwo() {
+        return -42;
+    }
+    
+    @JavaScriptBody(args = {"x", "y" }, body = "return x + y;")
+    public static native int plus(int x, int y);
+    
+    @JavaScriptBody(args = {"x"}, body = "return x;")
+    public static native int plus(int x);
+    
+    @JavaScriptBody(args = {}, body = "return this;")
+    public static native Object staticThis();
+    
+    @JavaScriptBody(args = {}, body = "return this;")
+    public native Object getThis();
+    @JavaScriptBody(args = {"x"}, body = "return x;")
+    public native int plusInst(int x);
+    
+    @JavaScriptBody(args = {}, body = "return true;")
+    public static boolean truth() {
+        return false;
+    }
+    
+    @JavaScriptBody(args = { "r" }, javacall=true, body = "r.@java.lang.Runnable::run()();")
+    public static native void callback(Runnable r);
+    
+    @JavaScriptBody(args = { "at", "arr" }, javacall = true, body =
+          "var a = 0;\n"
+        + "for (var i = 0; i < arr.length; i++) {\n"
+        + "  a = at.@org.netbeans.html.boot.impl.Arithm::sumTwo(II)(a, arr[i]);\n"
+        + "}\n"
+        + "return a;"
+    )
+    private static native int sumArr(Arithm at, int... arr);
+    
+    public static int sumArr(int... arr) {
+        return sumArr(new Arithm(), arr);
+    }
+    
+    @JavaScriptBody(args = { "x", "y" }, body = "return mul(x, y);")
+    public static native int useExternalMul(int x, int y);
+    
+    @JavaScriptBody(args = { "m" }, javacall = true, body = "return m.@org.netbeans.html.boot.impl.JsMethods::getThis()();")
+    public static native JsMethods returnYourSelf(JsMethods m);
+    
+    @JavaScriptBody(args = { "x", "y" }, javacall = true, body = "return @org.netbeans.html.boot.impl.JsMethods::useExternalMul(II)(x, y);")
+    public static native int staticCallback(int x, int y);
+
+    @JavaScriptBody(args = { "v" }, javacall = true, body = "return @java.lang.Integer::parseInt(Ljava/lang/String;)(v);")
+    public static native int parseInt(String v);
+    
+    @JavaScriptBody(args = { "useA", "useB", "a", "b" }, body = "var l = 0;"
+        + "if (useA) l += a;\n"
+        + "if (useB) l += b;\n"
+        + "return l;\n"
+    )
+    public static native long chooseLong(boolean useA, boolean useB, long a, long b);
+    
+    protected void onError(Object o) throws Exception {
+        value = o;
+    }
+    
+    Object getError() {
+        return value;
+    }
+    
+    @JavaScriptBody(args = { "err" }, javacall = true, body = 
+        "this.@org.netbeans.html.boot.impl.JsMethods::onError(Ljava/lang/Object;)(err);"
+      + "return this.@org.netbeans.html.boot.impl.JsMethods::getError()();"
+    )
+    public native Object recordError(Object err);
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/resources/org/apidesign/html/boot/impl/jsmethods.js
--- a/boot/src/test/resources/org/apidesign/html/boot/impl/jsmethods.js	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-function mul(x, y) { return x * y; }
diff -r 700087d2a5d3 -r 92fb71afdc0e boot/src/test/resources/org/netbeans/html/boot/impl/jsmethods.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/test/resources/org/netbeans/html/boot/impl/jsmethods.js	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,43 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+function mul(x, y) { return x * y; }
diff -r 700087d2a5d3 -r 92fb71afdc0e context/src/main/java/net/java/html/BrwsrCtx.java
--- a/context/src/main/java/net/java/html/BrwsrCtx.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/context/src/main/java/net/java/html/BrwsrCtx.java	Mon Dec 16 16:59:43 2013 +0100
@@ -44,8 +44,8 @@
 
 import java.util.ServiceLoader;
 import java.util.logging.Logger;
-import org.apidesign.html.context.impl.CtxAccssr;
-import org.apidesign.html.context.impl.CtxImpl;
+import org.netbeans.html.context.impl.CtxAccssr;
+import org.netbeans.html.context.impl.CtxImpl;
 import org.apidesign.html.context.spi.Contexts;
 
 /** Represents context where the <code>net.java.html.json.Model</code>
diff -r 700087d2a5d3 -r 92fb71afdc0e context/src/main/java/org/apidesign/html/context/impl/CtxAccssr.java
--- a/context/src/main/java/org/apidesign/html/context/impl/CtxAccssr.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.context.impl;
-
-import net.java.html.BrwsrCtx;
-
-/** Internal communication between API (e.g. {@link BrwsrCtx}), SPI
- * (e.g. {@link ContextBuilder}) and the implementation package.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public abstract class CtxAccssr {
-    private static CtxAccssr DEFAULT;
-    static {
-        // run initializers
-        try {
-            BrwsrCtx.EMPTY.getClass();
-        } catch (NullPointerException ex) {
-            // ignore
-        }
-    }
-    
-    protected CtxAccssr() {
-        if (DEFAULT != null) throw new IllegalStateException();
-        DEFAULT = this;
-    }
-    
-    protected abstract BrwsrCtx newContext(CtxImpl impl);
-    protected abstract CtxImpl find(BrwsrCtx context);
-    
-    static CtxAccssr getDefault() {
-        return DEFAULT;
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e context/src/main/java/org/apidesign/html/context/impl/CtxImpl.java
--- a/context/src/main/java/org/apidesign/html/context/impl/CtxImpl.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.context.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import net.java.html.BrwsrCtx;
-
-/** Implementation detail. Holds list of technologies for particular
- * {@link BrwsrCtx}.
- *
- * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- */
-public final class CtxImpl {
-    private final List<Bind<?>> techs;
-    
-    public CtxImpl() {
-        techs = new ArrayList<Bind<?>>();
-    }
-    
-    private CtxImpl(List<Bind<?>> techs) {
-        this.techs = techs;
-    }
-    
-    public static <Tech> Tech find(BrwsrCtx context, Class<Tech> technology) {
-        CtxImpl impl = CtxAccssr.getDefault().find(context);
-        for (Bind<?> bind : impl.techs) {
-            if (technology == bind.clazz) {
-                return technology.cast(bind.impl);
-            }
-        }
-        return null;
-    }
-
-    public BrwsrCtx build() {
-        Collections.sort(techs);
-        CtxImpl impl = new CtxImpl(Collections.unmodifiableList(techs));
-        return CtxAccssr.getDefault().newContext(impl);
-    }
-
-    public <Tech> void register(Class<Tech> type, Tech impl, int priority) {
-        techs.add(new Bind<Tech>(type, impl, priority));
-    }
-    
-    private static final class Bind<Tech> implements Comparable<Bind<?>> {
-        private final Class<Tech> clazz;
-        private final Tech impl;
-        private final int priority;
-
-        public Bind(Class<Tech> clazz, Tech impl, int priority) {
-            this.clazz = clazz;
-            this.impl = impl;
-            this.priority = priority;
-        }
-
-        @Override
-        public int compareTo(Bind<?> o) {
-            if (priority != o.priority) {
-                return priority - o.priority;
-            }
-            return clazz.getName().compareTo(o.clazz.getName());
-        }
-
-        @Override
-        public String toString() {
-            return "Bind{" + "clazz=" + clazz + "@" + clazz.getClassLoader() + ", impl=" + impl + ", priority=" + priority + '}';
-        }
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e context/src/main/java/org/apidesign/html/context/spi/Contexts.java
--- a/context/src/main/java/org/apidesign/html/context/spi/Contexts.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/context/src/main/java/org/apidesign/html/context/spi/Contexts.java	Mon Dec 16 16:59:43 2013 +0100
@@ -43,7 +43,7 @@
 package org.apidesign.html.context.spi;
 
 import net.java.html.BrwsrCtx;
-import org.apidesign.html.context.impl.CtxImpl;
+import org.netbeans.html.context.impl.CtxImpl;
 
 /**
  *
diff -r 700087d2a5d3 -r 92fb71afdc0e context/src/main/java/org/netbeans/html/context/impl/CtxAccssr.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/context/src/main/java/org/netbeans/html/context/impl/CtxAccssr.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,74 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.context.impl;
+
+import net.java.html.BrwsrCtx;
+
+/** Internal communication between API (e.g. {@link BrwsrCtx}), SPI
+ * (e.g. {@link ContextBuilder}) and the implementation package.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public abstract class CtxAccssr {
+    private static CtxAccssr DEFAULT;
+    static {
+        // run initializers
+        try {
+            BrwsrCtx.EMPTY.getClass();
+        } catch (NullPointerException ex) {
+            // ignore
+        }
+    }
+    
+    protected CtxAccssr() {
+        if (DEFAULT != null) throw new IllegalStateException();
+        DEFAULT = this;
+    }
+    
+    protected abstract BrwsrCtx newContext(CtxImpl impl);
+    protected abstract CtxImpl find(BrwsrCtx context);
+    
+    static CtxAccssr getDefault() {
+        return DEFAULT;
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e context/src/main/java/org/netbeans/html/context/impl/CtxImpl.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/context/src/main/java/org/netbeans/html/context/impl/CtxImpl.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,110 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.context.impl;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import net.java.html.BrwsrCtx;
+
+/** Implementation detail. Holds list of technologies for particular
+ * {@link BrwsrCtx}.
+ *
+ * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ */
+public final class CtxImpl {
+    private final List<Bind<?>> techs;
+    
+    public CtxImpl() {
+        techs = new ArrayList<Bind<?>>();
+    }
+    
+    private CtxImpl(List<Bind<?>> techs) {
+        this.techs = techs;
+    }
+    
+    public static <Tech> Tech find(BrwsrCtx context, Class<Tech> technology) {
+        CtxImpl impl = CtxAccssr.getDefault().find(context);
+        for (Bind<?> bind : impl.techs) {
+            if (technology == bind.clazz) {
+                return technology.cast(bind.impl);
+            }
+        }
+        return null;
+    }
+
+    public BrwsrCtx build() {
+        Collections.sort(techs);
+        CtxImpl impl = new CtxImpl(Collections.unmodifiableList(techs));
+        return CtxAccssr.getDefault().newContext(impl);
+    }
+
+    public <Tech> void register(Class<Tech> type, Tech impl, int priority) {
+        techs.add(new Bind<Tech>(type, impl, priority));
+    }
+    
+    private static final class Bind<Tech> implements Comparable<Bind<?>> {
+        private final Class<Tech> clazz;
+        private final Tech impl;
+        private final int priority;
+
+        public Bind(Class<Tech> clazz, Tech impl, int priority) {
+            this.clazz = clazz;
+            this.impl = impl;
+            this.priority = priority;
+        }
+
+        @Override
+        public int compareTo(Bind<?> o) {
+            if (priority != o.priority) {
+                return priority - o.priority;
+            }
+            return clazz.getName().compareTo(o.clazz.getName());
+        }
+
+        @Override
+        public String toString() {
+            return "Bind{" + "clazz=" + clazz + "@" + clazz.getClassLoader() + ", impl=" + impl + ", priority=" + priority + '}';
+        }
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e geo/src/main/java/net/java/html/geo/Position.java
--- a/geo/src/main/java/net/java/html/geo/Position.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/geo/src/main/java/net/java/html/geo/Position.java	Mon Dec 16 16:59:43 2013 +0100
@@ -44,7 +44,7 @@
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.apidesign.html.geo.impl.JsG;
+import org.netbeans.html.geo.impl.JsG;
 
 /** Class that represents a geolocation position provided as a callback
  * to {@link Handle#onLocation(net.java.html.geo.Position)} method. The
diff -r 700087d2a5d3 -r 92fb71afdc0e geo/src/main/java/org/apidesign/html/geo/impl/GeoProcessor.java
--- a/geo/src/main/java/org/apidesign/html/geo/impl/GeoProcessor.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,289 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.geo.impl;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.Processor;
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
-import javax.lang.model.type.TypeMirror;
-import javax.tools.Diagnostic;
-import javax.tools.JavaFileObject;
-import net.java.html.geo.OnLocation;
-import net.java.html.geo.Position;
-import org.openide.util.lookup.ServiceProvider;
-
-/** Annotation processor to generate callbacks from {@link GeoHandle} class.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@ServiceProvider(service=Processor.class)
-@SupportedSourceVersion(SourceVersion.RELEASE_6)
-@SupportedAnnotationTypes({
-    "net.java.html.geo.OnLocation"
-})
-public final class GeoProcessor extends AbstractProcessor {
-    private static final Logger LOG = Logger.getLogger(GeoProcessor.class.getName());
-    @Override
-    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        boolean ok = true;
-        for (Element e : roundEnv.getElementsAnnotatedWith(OnLocation.class)) {
-            if (!processLocation(e)) {
-                ok = false;
-            }
-        }
-        return ok;
-    }
-
-    private void error(String msg, Element e) {
-        processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, msg, e);
-    }
-    
-    private boolean processLocation(Element e) {
-        if (e.getKind() != ElementKind.METHOD) {
-            return false;
-        }
-        ExecutableElement me = (ExecutableElement) e;
-        OnLocation ol = e.getAnnotation(OnLocation.class);
-        if (ol == null) {
-            return true;
-        }
-        if (me.getModifiers().contains(Modifier.PRIVATE)) {
-            error("Method annotated by @OnLocation cannot be private", e);
-            return false;
-        }
-        TypeMirror positionClass = processingEnv.getElementUtils().getTypeElement(Position.class.getName()).asType();
-        final List<? extends VariableElement> params = me.getParameters();
-        if (params.size() < 1 || !params.get(0).asType().equals(positionClass)) {
-            error("Method annotated by @OnLocation first argument must be net.java.html.geo.Position!", e);
-            return false;
-        }
-        String className = ol.className();
-        if (className.isEmpty()) {
-            String n = e.getSimpleName().toString();
-            if (n.isEmpty()) {
-                error("Empty method name", e);
-                return false;
-            }
-            final String firstLetter = n.substring(0, 1).toUpperCase(Locale.ENGLISH);
-            className = firstLetter + n.substring(1) + "Handle";
-        }
-        TypeElement te = (TypeElement)e.getEnclosingElement();
-        PackageElement pe = (PackageElement) te.getEnclosingElement();
-        final String pkg = pe.getQualifiedName().toString();
-        final String fqn = pkg + "." + className;
-        final boolean isStatic = me.getModifiers().contains(Modifier.STATIC);
-        String sep;
-        try {
-            JavaFileObject fo = processingEnv.getFiler().createSourceFile(fqn, e);
-            Writer w = fo.openWriter();
-            w.append("package ").append(pkg).append(";\n");
-            w.append("class ").append(className).append(" extends net.java.html.geo.Position.Handle {\n");
-            if (!isStatic) {
-                w.append("  private final ").append(te.getSimpleName()).append(" $i;\n");
-            }
-            for (int i = 1; i < params.size(); i++) {
-                final VariableElement p = params.get(i);
-                w.append("  private final ").append(p.asType().toString()).append(" ").append(p.getSimpleName()).append(";\n");
-            }
-            w.append("  private ").append(className).append("(boolean oneTime");
-            w.append(", ").append(te.getSimpleName()).append(" i");
-            for (int i = 1; i < params.size(); i++) {
-                final VariableElement p = params.get(i);
-                w.append(", ").append(p.asType().toString()).append(" ").append(p.getSimpleName());
-            }
-            w.append(") {\n    super(oneTime);\n");
-            if (!isStatic) {
-                w.append("    this.$i = i;\n");
-            }
-            for (int i = 1; i < params.size(); i++) {
-                final VariableElement p = params.get(i);
-                w.append("  this.").append(p.getSimpleName()).append(" = ").append(p.getSimpleName()).append(";\n");
-            }
-            w.append("}\n");
-            w.append("  static net.java.html.geo.Position.Handle createQuery(");
-            String inst;
-            if (!isStatic) {
-                w.append(te.getSimpleName()).append(" instance");
-                inst = "instance";
-                sep = ", ";
-            } else {
-                inst = "null";
-                sep = "";
-            }
-            for (int i = 1; i < params.size(); i++) {
-                final VariableElement p = params.get(i);
-                w.append(sep).append(p.asType().toString()).append(" ").append(p.getSimpleName());
-                sep = ", ";
-            }
-            w.append(") { return new ").append(className).append("(true, ").append(inst);
-            for (int i = 1; i < params.size(); i++) {
-                final VariableElement p = params.get(i);
-                w.append(", ").append(p.getSimpleName());
-            }
-            w.append("); }\n");
-            w.append("  static net.java.html.geo.Position.Handle createWatch(");
-            if (!isStatic) {
-                w.append(te.getSimpleName()).append(" instance");
-                sep = ", ";
-            } else {
-                sep = "";
-            }
-            for (int i = 1; i < params.size(); i++) {
-                final VariableElement p = params.get(i);
-                w.append(sep).append(p.asType().toString()).append(" ").append(p.getSimpleName());
-            }
-            w.append(") { return new ").append(className).append("(false, ").append(inst);
-            for (int i = 1; i < params.size(); i++) {
-                final VariableElement p = params.get(i);
-                w.append(", ").append(p.getSimpleName());
-            }
-            w.append("); }\n");
-            w.append("  @Override protected void onError(Exception t) throws Throwable {\n");
-            if (ol.onError().isEmpty()) {
-                w.append("    t.printStackTrace();");
-            } else {
-                if (!findOnError(me, te, ol.onError(), isStatic)) {
-                    return false;
-                }
-                if (isStatic) {
-                    w.append("    ").append(te.getSimpleName()).append(".");
-                } else {
-                    w.append("    $i.");
-                }
-                w.append(ol.onError()).append("(t");
-                for (int i = 1; i < params.size(); i++) {
-                    final VariableElement p = params.get(i);
-                    w.append(", ").append(p.getSimpleName());
-                }
-                w.append(");\n");
-            }
-            w.append("  }\n");
-            w.append("  @Override protected void onLocation(net.java.html.geo.Position p) throws Throwable {\n");
-            if (isStatic) {
-                w.append("    ").append(te.getSimpleName()).append(".");
-            } else {
-                w.append("    $i.");
-            }
-            w.append(me.getSimpleName()).append("(p");
-            for (int i = 1; i < params.size(); i++) {
-                final VariableElement p = params.get(i);
-                w.append(", ").append(p.getSimpleName());
-            }
-            w.append(");\n");
-            w.append("  }\n");
-            w.append("}\n");
-            w.close();
-        } catch (IOException ex) {
-            Logger.getLogger(GeoProcessor.class.getName()).log(Level.SEVERE, null, ex);
-            error("Can't write handler class: " + ex.getMessage(), e);
-            return false;
-        }
-        
-        return true;
-    }
-
-    private boolean findOnError(ExecutableElement errElem, TypeElement te, String name, boolean onlyStatic) {
-        String err = null;
-        METHODS: for (Element e : te.getEnclosedElements()) {
-            if (e.getKind() != ElementKind.METHOD) {
-                continue;
-            }
-            if (!e.getSimpleName().contentEquals(name)) {
-                continue;
-            }
-            if (onlyStatic && !e.getModifiers().contains(Modifier.STATIC)) {
-                errElem = (ExecutableElement) e;
-                err = "Would have to be static";
-                continue;
-            }
-            ExecutableElement ee = (ExecutableElement) e;
-            TypeMirror excType = processingEnv.getElementUtils().getTypeElement(Exception.class.getName()).asType();
-            final List<? extends VariableElement> params = ee.getParameters(); 
-            if (params.size() < 1 || 
-                !processingEnv.getTypeUtils().isAssignable(excType, ee.getParameters().get(0).asType())
-            ) {
-                errElem = (ExecutableElement) e;
-                err = "Error method first argument needs to be Exception";
-                continue;
-            }
-            final List<? extends Element> origParams = errElem.getParameters();
-            if (params.size() != origParams.size()) {
-                errElem = (ExecutableElement) e;
-                err = "Error method must have the same parameters as @OnLocation one";
-                continue;
-            }
-            for (int i = 1; i < origParams.size(); i++) {
-                final TypeMirror t1 = params.get(i).asType();
-                final TypeMirror t2 = origParams.get(i).asType();
-                if (!processingEnv.getTypeUtils().isSameType(t1, t2)) {
-                    errElem = (ExecutableElement) e;
-                    err = "Error method must have the same parameters as @OnLocation one";
-                    continue METHODS;
-                }
-            }
-            return true;
-        }
-        if (err == null) {
-            err = "Cannot find " + name + "(Exception) method in this class";
-        }
-        error(err, errElem);
-        return false;
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e geo/src/main/java/org/apidesign/html/geo/impl/JsG.java
--- a/geo/src/main/java/org/apidesign/html/geo/impl/JsG.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.geo.impl;
-
-import net.java.html.js.JavaScriptBody;
-
-/** Implementation class to deal with browser's <code>navigator.geolocation</code> 
- * object.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public abstract class JsG {
-    protected JsG() {
-        if (!getClass().getName().equals("net.java.html.geo.Position$Handle$JsH")) {
-            throw new IllegalStateException();
-        }
-    }
-    
-    public abstract void onLocation(Object position);
-    public abstract void onError(Object error);
-    
-    @JavaScriptBody(args = {}, body = "return !!navigator.geolocation;")
-    public static boolean hasGeolocation() {
-        return false;
-    }
-
-    @JavaScriptBody(
-        args = { "onlyOnce", "enableHighAccuracy", "timeout", "maximumAge" }, 
-        javacall = true, 
-        body = 
-        "var self = this;\n" +
-        "var ok = function (position) {\n" +
-        "  self.@org.apidesign.html.geo.impl.JsG::onLocation(Ljava/lang/Object;)(position);\n" +
-        "};\n" +
-        "var fail = function (error) {\n" +
-        "  self.@org.apidesign.html.geo.impl.JsG::onError(Ljava/lang/Object;)(error);\n" +
-        "};\n" +
-        "var options = {};\n" +
-        "options.enableHighAccuracy = enableHighAccuracy;\n" +
-        "if (timeout >= 0) options.timeout = timeout;\n" +
-        "if (maximumAge >= 0) options.maximumAge = maximumAge;\n" +
-        "if (onlyOnce) {\n" +
-        "  navigator.geolocation.getCurrentPosition(ok, fail);\n" +
-        "  return 0;\n" +
-        "} else {\n" +
-        "  return navigator.geolocation.watchPosition(ok, fail);\n" +
-        "}\n"
-    )
-    protected long start(
-        boolean onlyOnce, 
-        boolean enableHighAccuracy,
-        long timeout,
-        long maximumAge
-    ) {
-        return -1;
-    }
-    
-    @JavaScriptBody(args = { "watch" }, body = "navigator.geolocation.clearWatch(watch);")
-    protected void stop(long watch) {
-    }
-
-    @JavaScriptBody(args = { "self", "property" }, body = "return self[property];")
-    public static Object get(Object self, String property) {
-        return null;
-    }
-
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e geo/src/main/java/org/netbeans/html/geo/impl/GeoProcessor.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/geo/src/main/java/org/netbeans/html/geo/impl/GeoProcessor.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,289 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.geo.impl;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.Processor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeMirror;
+import javax.tools.Diagnostic;
+import javax.tools.JavaFileObject;
+import net.java.html.geo.OnLocation;
+import net.java.html.geo.Position;
+import org.openide.util.lookup.ServiceProvider;
+
+/** Annotation processor to generate callbacks from {@link GeoHandle} class.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@ServiceProvider(service=Processor.class)
+@SupportedSourceVersion(SourceVersion.RELEASE_6)
+@SupportedAnnotationTypes({
+    "net.java.html.geo.OnLocation"
+})
+public final class GeoProcessor extends AbstractProcessor {
+    private static final Logger LOG = Logger.getLogger(GeoProcessor.class.getName());
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        boolean ok = true;
+        for (Element e : roundEnv.getElementsAnnotatedWith(OnLocation.class)) {
+            if (!processLocation(e)) {
+                ok = false;
+            }
+        }
+        return ok;
+    }
+
+    private void error(String msg, Element e) {
+        processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, msg, e);
+    }
+    
+    private boolean processLocation(Element e) {
+        if (e.getKind() != ElementKind.METHOD) {
+            return false;
+        }
+        ExecutableElement me = (ExecutableElement) e;
+        OnLocation ol = e.getAnnotation(OnLocation.class);
+        if (ol == null) {
+            return true;
+        }
+        if (me.getModifiers().contains(Modifier.PRIVATE)) {
+            error("Method annotated by @OnLocation cannot be private", e);
+            return false;
+        }
+        TypeMirror positionClass = processingEnv.getElementUtils().getTypeElement(Position.class.getName()).asType();
+        final List<? extends VariableElement> params = me.getParameters();
+        if (params.size() < 1 || !params.get(0).asType().equals(positionClass)) {
+            error("Method annotated by @OnLocation first argument must be net.java.html.geo.Position!", e);
+            return false;
+        }
+        String className = ol.className();
+        if (className.isEmpty()) {
+            String n = e.getSimpleName().toString();
+            if (n.isEmpty()) {
+                error("Empty method name", e);
+                return false;
+            }
+            final String firstLetter = n.substring(0, 1).toUpperCase(Locale.ENGLISH);
+            className = firstLetter + n.substring(1) + "Handle";
+        }
+        TypeElement te = (TypeElement)e.getEnclosingElement();
+        PackageElement pe = (PackageElement) te.getEnclosingElement();
+        final String pkg = pe.getQualifiedName().toString();
+        final String fqn = pkg + "." + className;
+        final boolean isStatic = me.getModifiers().contains(Modifier.STATIC);
+        String sep;
+        try {
+            JavaFileObject fo = processingEnv.getFiler().createSourceFile(fqn, e);
+            Writer w = fo.openWriter();
+            w.append("package ").append(pkg).append(";\n");
+            w.append("class ").append(className).append(" extends net.java.html.geo.Position.Handle {\n");
+            if (!isStatic) {
+                w.append("  private final ").append(te.getSimpleName()).append(" $i;\n");
+            }
+            for (int i = 1; i < params.size(); i++) {
+                final VariableElement p = params.get(i);
+                w.append("  private final ").append(p.asType().toString()).append(" ").append(p.getSimpleName()).append(";\n");
+            }
+            w.append("  private ").append(className).append("(boolean oneTime");
+            w.append(", ").append(te.getSimpleName()).append(" i");
+            for (int i = 1; i < params.size(); i++) {
+                final VariableElement p = params.get(i);
+                w.append(", ").append(p.asType().toString()).append(" ").append(p.getSimpleName());
+            }
+            w.append(") {\n    super(oneTime);\n");
+            if (!isStatic) {
+                w.append("    this.$i = i;\n");
+            }
+            for (int i = 1; i < params.size(); i++) {
+                final VariableElement p = params.get(i);
+                w.append("  this.").append(p.getSimpleName()).append(" = ").append(p.getSimpleName()).append(";\n");
+            }
+            w.append("}\n");
+            w.append("  static net.java.html.geo.Position.Handle createQuery(");
+            String inst;
+            if (!isStatic) {
+                w.append(te.getSimpleName()).append(" instance");
+                inst = "instance";
+                sep = ", ";
+            } else {
+                inst = "null";
+                sep = "";
+            }
+            for (int i = 1; i < params.size(); i++) {
+                final VariableElement p = params.get(i);
+                w.append(sep).append(p.asType().toString()).append(" ").append(p.getSimpleName());
+                sep = ", ";
+            }
+            w.append(") { return new ").append(className).append("(true, ").append(inst);
+            for (int i = 1; i < params.size(); i++) {
+                final VariableElement p = params.get(i);
+                w.append(", ").append(p.getSimpleName());
+            }
+            w.append("); }\n");
+            w.append("  static net.java.html.geo.Position.Handle createWatch(");
+            if (!isStatic) {
+                w.append(te.getSimpleName()).append(" instance");
+                sep = ", ";
+            } else {
+                sep = "";
+            }
+            for (int i = 1; i < params.size(); i++) {
+                final VariableElement p = params.get(i);
+                w.append(sep).append(p.asType().toString()).append(" ").append(p.getSimpleName());
+            }
+            w.append(") { return new ").append(className).append("(false, ").append(inst);
+            for (int i = 1; i < params.size(); i++) {
+                final VariableElement p = params.get(i);
+                w.append(", ").append(p.getSimpleName());
+            }
+            w.append("); }\n");
+            w.append("  @Override protected void onError(Exception t) throws Throwable {\n");
+            if (ol.onError().isEmpty()) {
+                w.append("    t.printStackTrace();");
+            } else {
+                if (!findOnError(me, te, ol.onError(), isStatic)) {
+                    return false;
+                }
+                if (isStatic) {
+                    w.append("    ").append(te.getSimpleName()).append(".");
+                } else {
+                    w.append("    $i.");
+                }
+                w.append(ol.onError()).append("(t");
+                for (int i = 1; i < params.size(); i++) {
+                    final VariableElement p = params.get(i);
+                    w.append(", ").append(p.getSimpleName());
+                }
+                w.append(");\n");
+            }
+            w.append("  }\n");
+            w.append("  @Override protected void onLocation(net.java.html.geo.Position p) throws Throwable {\n");
+            if (isStatic) {
+                w.append("    ").append(te.getSimpleName()).append(".");
+            } else {
+                w.append("    $i.");
+            }
+            w.append(me.getSimpleName()).append("(p");
+            for (int i = 1; i < params.size(); i++) {
+                final VariableElement p = params.get(i);
+                w.append(", ").append(p.getSimpleName());
+            }
+            w.append(");\n");
+            w.append("  }\n");
+            w.append("}\n");
+            w.close();
+        } catch (IOException ex) {
+            Logger.getLogger(GeoProcessor.class.getName()).log(Level.SEVERE, null, ex);
+            error("Can't write handler class: " + ex.getMessage(), e);
+            return false;
+        }
+        
+        return true;
+    }
+
+    private boolean findOnError(ExecutableElement errElem, TypeElement te, String name, boolean onlyStatic) {
+        String err = null;
+        METHODS: for (Element e : te.getEnclosedElements()) {
+            if (e.getKind() != ElementKind.METHOD) {
+                continue;
+            }
+            if (!e.getSimpleName().contentEquals(name)) {
+                continue;
+            }
+            if (onlyStatic && !e.getModifiers().contains(Modifier.STATIC)) {
+                errElem = (ExecutableElement) e;
+                err = "Would have to be static";
+                continue;
+            }
+            ExecutableElement ee = (ExecutableElement) e;
+            TypeMirror excType = processingEnv.getElementUtils().getTypeElement(Exception.class.getName()).asType();
+            final List<? extends VariableElement> params = ee.getParameters(); 
+            if (params.size() < 1 || 
+                !processingEnv.getTypeUtils().isAssignable(excType, ee.getParameters().get(0).asType())
+            ) {
+                errElem = (ExecutableElement) e;
+                err = "Error method first argument needs to be Exception";
+                continue;
+            }
+            final List<? extends Element> origParams = errElem.getParameters();
+            if (params.size() != origParams.size()) {
+                errElem = (ExecutableElement) e;
+                err = "Error method must have the same parameters as @OnLocation one";
+                continue;
+            }
+            for (int i = 1; i < origParams.size(); i++) {
+                final TypeMirror t1 = params.get(i).asType();
+                final TypeMirror t2 = origParams.get(i).asType();
+                if (!processingEnv.getTypeUtils().isSameType(t1, t2)) {
+                    errElem = (ExecutableElement) e;
+                    err = "Error method must have the same parameters as @OnLocation one";
+                    continue METHODS;
+                }
+            }
+            return true;
+        }
+        if (err == null) {
+            err = "Cannot find " + name + "(Exception) method in this class";
+        }
+        error(err, errElem);
+        return false;
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e geo/src/main/java/org/netbeans/html/geo/impl/JsG.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/geo/src/main/java/org/netbeans/html/geo/impl/JsG.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,107 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.geo.impl;
+
+import net.java.html.js.JavaScriptBody;
+
+/** Implementation class to deal with browser's <code>navigator.geolocation</code> 
+ * object.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public abstract class JsG {
+    protected JsG() {
+        if (!getClass().getName().equals("net.java.html.geo.Position$Handle$JsH")) {
+            throw new IllegalStateException();
+        }
+    }
+    
+    public abstract void onLocation(Object position);
+    public abstract void onError(Object error);
+    
+    @JavaScriptBody(args = {}, body = "return !!navigator.geolocation;")
+    public static boolean hasGeolocation() {
+        return false;
+    }
+
+    @JavaScriptBody(
+        args = { "onlyOnce", "enableHighAccuracy", "timeout", "maximumAge" }, 
+        javacall = true, 
+        body = 
+        "var self = this;\n" +
+        "var ok = function (position) {\n" +
+        "  self.@org.netbeans.html.geo.impl.JsG::onLocation(Ljava/lang/Object;)(position);\n" +
+        "};\n" +
+        "var fail = function (error) {\n" +
+        "  self.@org.netbeans.html.geo.impl.JsG::onError(Ljava/lang/Object;)(error);\n" +
+        "};\n" +
+        "var options = {};\n" +
+        "options.enableHighAccuracy = enableHighAccuracy;\n" +
+        "if (timeout >= 0) options.timeout = timeout;\n" +
+        "if (maximumAge >= 0) options.maximumAge = maximumAge;\n" +
+        "if (onlyOnce) {\n" +
+        "  navigator.geolocation.getCurrentPosition(ok, fail);\n" +
+        "  return 0;\n" +
+        "} else {\n" +
+        "  return navigator.geolocation.watchPosition(ok, fail);\n" +
+        "}\n"
+    )
+    protected long start(
+        boolean onlyOnce, 
+        boolean enableHighAccuracy,
+        long timeout,
+        long maximumAge
+    ) {
+        return -1;
+    }
+    
+    @JavaScriptBody(args = { "watch" }, body = "navigator.geolocation.clearWatch(watch);")
+    protected void stop(long watch) {
+    }
+
+    @JavaScriptBody(args = { "self", "property" }, body = "return self[property];")
+    public static Object get(Object self, String property) {
+        return null;
+    }
+
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e geo/src/test/java/org/apidesign/html/geo/impl/Compile.java
--- a/geo/src/test/java/org/apidesign/html/geo/impl/Compile.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,286 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.geo.impl;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.tools.Diagnostic;
-import javax.tools.DiagnosticListener;
-import javax.tools.FileObject;
-import javax.tools.ForwardingJavaFileManager;
-import javax.tools.JavaFileManager;
-import javax.tools.JavaFileObject;
-import javax.tools.JavaFileObject.Kind;
-import javax.tools.SimpleJavaFileObject;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.StandardLocation;
-import javax.tools.ToolProvider;
-import static org.testng.Assert.*;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-final class Compile implements DiagnosticListener<JavaFileObject> {
-    private final List<Diagnostic<? extends JavaFileObject>> errors = 
-            new ArrayList<Diagnostic<? extends JavaFileObject>>();
-    private final Map<String, byte[]> classes;
-    private final String pkg;
-    private final String cls;
-    private final String html;
-    private final String sourceLevel;
-
-    private Compile(String html, String code, String sl) throws IOException {
-        this.pkg = findPkg(code);
-        this.cls = findCls(code);
-        this.html = html;
-        this.sourceLevel = sl;
-        classes = compile(html, code);
-    }
-
-    /** Performs compilation of given HTML page and associated Java code
-     */
-    public static Compile create(String html, String code) throws IOException {
-        return create(html, code, "1.7");
-    }
-    static Compile create(String html, String code, String sourceLevel) throws IOException {
-        return new Compile(html, code, sourceLevel);
-    }
-    
-    /** Checks for given class among compiled resources */
-    public byte[] get(String res) {
-        return classes.get(res);
-    }
-    
-    /** Obtains errors created during compilation.
-     */
-    public List<Diagnostic<? extends JavaFileObject>> getErrors() {
-        List<Diagnostic<? extends JavaFileObject>> err;
-        err = new ArrayList<Diagnostic<? extends JavaFileObject>>();
-        for (Diagnostic<? extends JavaFileObject> diagnostic : errors) {
-            if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
-                err.add(diagnostic);
-            }
-        }
-        return err;
-    }
-    
-    private Map<String, byte[]> compile(final String html, final String code) throws IOException {
-        StandardJavaFileManager sjfm = ToolProvider.getSystemJavaCompiler().getStandardFileManager(this, null, null);
-
-        final Map<String, ByteArrayOutputStream> class2BAOS;
-        class2BAOS = new HashMap<String, ByteArrayOutputStream>();
-
-        JavaFileObject file = new SimpleJavaFileObject(URI.create("mem://mem"), Kind.SOURCE) {
-            @Override
-            public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
-                return code;
-            }
-        };
-        final JavaFileObject htmlFile = new SimpleJavaFileObject(URI.create("mem://mem2"), Kind.OTHER) {
-            @Override
-            public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
-                return html;
-            }
-
-            @Override
-            public InputStream openInputStream() throws IOException {
-                return new ByteArrayInputStream(html.getBytes());
-            }
-        };
-        
-        final URI scratch;
-        try {
-            scratch = new URI("mem://mem3");
-        } catch (URISyntaxException ex) {
-            throw new IOException(ex);
-        }
-        
-        JavaFileManager jfm = new ForwardingJavaFileManager<JavaFileManager>(sjfm) {
-            @Override
-            public JavaFileObject getJavaFileForOutput(Location location, String className, Kind kind, FileObject sibling) throws IOException {
-                if (kind  == Kind.CLASS) {
-                    final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-
-                    class2BAOS.put(className.replace('.', '/') + ".class", buffer);
-                    return new SimpleJavaFileObject(sibling.toUri(), kind) {
-                        @Override
-                        public OutputStream openOutputStream() throws IOException {
-                            return buffer;
-                        }
-                    };
-                }
-                
-                if (kind == Kind.SOURCE) {
-                    final String n = className.replace('.', '/') + ".java";
-                    final URI un;
-                    try {
-                        un = new URI("mem://" + n);
-                    } catch (URISyntaxException ex) {
-                        throw new IOException(ex);
-                    }
-                    return new VirtFO(un/*sibling.toUri()*/, kind, n);
-                }
-                
-                throw new IllegalStateException();
-            }
-
-            @Override
-            public FileObject getFileForInput(Location location, String packageName, String relativeName) throws IOException {
-                if (location == StandardLocation.SOURCE_PATH) {
-                    if (packageName.equals(pkg)) {
-                        return htmlFile;
-                    }
-                }
-                
-                return null;
-            }
-
-            @Override
-            public boolean isSameFile(FileObject a, FileObject b) {
-                if (a instanceof VirtFO && b instanceof VirtFO) {
-                    return ((VirtFO)a).getName().equals(((VirtFO)b).getName());
-                }
-                
-                return super.isSameFile(a, b);
-            }
-
-            class VirtFO extends SimpleJavaFileObject {
-
-                private final String n;
-
-                public VirtFO(URI uri, Kind kind, String n) {
-                    super(uri, kind);
-                    this.n = n;
-                }
-                private final ByteArrayOutputStream data = new ByteArrayOutputStream();
-
-                @Override
-                public OutputStream openOutputStream() throws IOException {
-                    return data;
-                }
-
-                @Override
-                public String getName() {
-                    return n;
-                }
-
-                @Override
-                public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
-                    data.close();
-                    return new String(data.toByteArray());
-                }
-            }
-        };
-
-        ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", "1.7"), null, Arrays.asList(file)).call();
-
-        Map<String, byte[]> result = new HashMap<String, byte[]>();
-
-        for (Map.Entry<String, ByteArrayOutputStream> e : class2BAOS.entrySet()) {
-            result.put(e.getKey(), e.getValue().toByteArray());
-        }
-
-        return result;
-    }
-
-
-    @Override
-    public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
-        errors.add(diagnostic);
-    }
-    private static String findPkg(String java) throws IOException {
-        Pattern p = Pattern.compile("package\\p{javaWhitespace}*([\\p{Alnum}\\.]+)\\p{javaWhitespace}*;", Pattern.MULTILINE);
-        Matcher m = p.matcher(java);
-        if (!m.find()) {
-            throw new IOException("Can't find package declaration in the java file");
-        }
-        String pkg = m.group(1);
-        return pkg;
-    }
-    private static String findCls(String java) throws IOException {
-        Pattern p = Pattern.compile("class\\p{javaWhitespace}*([\\p{Alnum}\\.]+)\\p{javaWhitespace}", Pattern.MULTILINE);
-        Matcher m = p.matcher(java);
-        if (!m.find()) {
-            throw new IOException("Can't find package declaration in the java file");
-        }
-        String cls = m.group(1);
-        return cls;
-    }
-
-    String getHtml() {
-        String fqn = "'" + pkg + '.' + cls + "'";
-        return html.replace("'${fqn}'", fqn);
-    }
-
-    void assertErrors() {
-        assertFalse(getErrors().isEmpty(), "There are supposed to be some errors");
-    }
-
-    void assertError(String expMsg) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Can't find ").append(expMsg).append(" among:");
-        for (Diagnostic<? extends JavaFileObject> e : errors) {
-            String msg = e.getMessage(Locale.US);
-            if (msg.contains(expMsg)) {
-                return;
-            }
-            sb.append("\n");
-            sb.append(msg);
-        }
-        fail(sb.toString());
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e geo/src/test/java/org/apidesign/html/geo/impl/GeoProcessorTest.java
--- a/geo/src/test/java/org/apidesign/html/geo/impl/GeoProcessorTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.geo.impl;
-
-import java.io.IOException;
-import org.testng.annotations.Test;
-
-/** Test whether the annotation processor detects errors correctly.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class GeoProcessorTest {
-    
-    public GeoProcessorTest() {
-    }
-
-    @Test public void onLocationMethodHasToTakePositionParameter() throws IOException {
-        Compile res = Compile.create("", "package x;\n"
-            + "class UseOnLocation {\n"
-            + "  @net.java.html.geo.OnLocation\n"
-            + "  public static void cantCallMe() {}\n"
-            + "}\n"
-        );
-        res.assertErrors();
-        res.assertError("first argument must be net.java.html.geo.Position");
-    }
-    
-    @Test public void onLocationMethodCannotBePrivate() throws IOException {
-        Compile res = Compile.create("", "package x;\n"
-            + "class UseOnLocation {\n"
-            + "  @net.java.html.geo.OnLocation\n"
-            + "  private static void cantCallMe(net.java.html.geo.Position p) {}\n"
-            + "}\n"
-        );
-        res.assertErrors();
-        res.assertError("cannot be private");
-    }
-    
-    @Test public void onErrorHasToExist() throws IOException {
-        Compile res = Compile.create("", "package x;\n"
-            + "class UseOnLocation {\n"
-            + "  @net.java.html.geo.OnLocation(onError=\"doesNotExist\")\n"
-            + "  static void cantCallMe(net.java.html.geo.Position p) {}\n"
-            + "}\n"
-        );
-        res.assertErrors();
-        res.assertError("not find doesNotExist");
-    }
-
-    @Test public void onErrorWouldHaveToBeStatic() throws IOException {
-        Compile res = Compile.create("", "package x;\n"
-            + "class UseOnLocation {\n"
-            + "  @net.java.html.geo.OnLocation(onError=\"notStatic\")\n"
-            + "  static void cantCallMe(net.java.html.geo.Position p) {}\n"
-            + "  void notStatic(Exception e) {}\n"
-            + "}\n"
-        );
-        res.assertErrors();
-        res.assertError("have to be static");
-    }
-
-    @Test public void onErrorMustAcceptExceptionArgument() throws IOException {
-        Compile res = Compile.create("", "package x;\n"
-            + "class UseOnLocation {\n"
-            + "  @net.java.html.geo.OnLocation(onError=\"notStatic\")\n"
-            + "  static void cantCallMe(net.java.html.geo.Position p) {}\n"
-            + "  static void notStatic(java.io.IOException e) {}\n"
-            + "}\n"
-        );
-        res.assertErrors();
-        res.assertError("Error method first argument needs to be Exception");
-    }
-    
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e geo/src/test/java/org/netbeans/html/geo/impl/Compile.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/geo/src/test/java/org/netbeans/html/geo/impl/Compile.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,286 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.geo.impl;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticListener;
+import javax.tools.FileObject;
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+import javax.tools.ToolProvider;
+import static org.testng.Assert.*;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class Compile implements DiagnosticListener<JavaFileObject> {
+    private final List<Diagnostic<? extends JavaFileObject>> errors = 
+            new ArrayList<Diagnostic<? extends JavaFileObject>>();
+    private final Map<String, byte[]> classes;
+    private final String pkg;
+    private final String cls;
+    private final String html;
+    private final String sourceLevel;
+
+    private Compile(String html, String code, String sl) throws IOException {
+        this.pkg = findPkg(code);
+        this.cls = findCls(code);
+        this.html = html;
+        this.sourceLevel = sl;
+        classes = compile(html, code);
+    }
+
+    /** Performs compilation of given HTML page and associated Java code
+     */
+    public static Compile create(String html, String code) throws IOException {
+        return create(html, code, "1.7");
+    }
+    static Compile create(String html, String code, String sourceLevel) throws IOException {
+        return new Compile(html, code, sourceLevel);
+    }
+    
+    /** Checks for given class among compiled resources */
+    public byte[] get(String res) {
+        return classes.get(res);
+    }
+    
+    /** Obtains errors created during compilation.
+     */
+    public List<Diagnostic<? extends JavaFileObject>> getErrors() {
+        List<Diagnostic<? extends JavaFileObject>> err;
+        err = new ArrayList<Diagnostic<? extends JavaFileObject>>();
+        for (Diagnostic<? extends JavaFileObject> diagnostic : errors) {
+            if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
+                err.add(diagnostic);
+            }
+        }
+        return err;
+    }
+    
+    private Map<String, byte[]> compile(final String html, final String code) throws IOException {
+        StandardJavaFileManager sjfm = ToolProvider.getSystemJavaCompiler().getStandardFileManager(this, null, null);
+
+        final Map<String, ByteArrayOutputStream> class2BAOS;
+        class2BAOS = new HashMap<String, ByteArrayOutputStream>();
+
+        JavaFileObject file = new SimpleJavaFileObject(URI.create("mem://mem"), Kind.SOURCE) {
+            @Override
+            public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                return code;
+            }
+        };
+        final JavaFileObject htmlFile = new SimpleJavaFileObject(URI.create("mem://mem2"), Kind.OTHER) {
+            @Override
+            public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                return html;
+            }
+
+            @Override
+            public InputStream openInputStream() throws IOException {
+                return new ByteArrayInputStream(html.getBytes());
+            }
+        };
+        
+        final URI scratch;
+        try {
+            scratch = new URI("mem://mem3");
+        } catch (URISyntaxException ex) {
+            throw new IOException(ex);
+        }
+        
+        JavaFileManager jfm = new ForwardingJavaFileManager<JavaFileManager>(sjfm) {
+            @Override
+            public JavaFileObject getJavaFileForOutput(Location location, String className, Kind kind, FileObject sibling) throws IOException {
+                if (kind  == Kind.CLASS) {
+                    final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+
+                    class2BAOS.put(className.replace('.', '/') + ".class", buffer);
+                    return new SimpleJavaFileObject(sibling.toUri(), kind) {
+                        @Override
+                        public OutputStream openOutputStream() throws IOException {
+                            return buffer;
+                        }
+                    };
+                }
+                
+                if (kind == Kind.SOURCE) {
+                    final String n = className.replace('.', '/') + ".java";
+                    final URI un;
+                    try {
+                        un = new URI("mem://" + n);
+                    } catch (URISyntaxException ex) {
+                        throw new IOException(ex);
+                    }
+                    return new VirtFO(un/*sibling.toUri()*/, kind, n);
+                }
+                
+                throw new IllegalStateException();
+            }
+
+            @Override
+            public FileObject getFileForInput(Location location, String packageName, String relativeName) throws IOException {
+                if (location == StandardLocation.SOURCE_PATH) {
+                    if (packageName.equals(pkg)) {
+                        return htmlFile;
+                    }
+                }
+                
+                return null;
+            }
+
+            @Override
+            public boolean isSameFile(FileObject a, FileObject b) {
+                if (a instanceof VirtFO && b instanceof VirtFO) {
+                    return ((VirtFO)a).getName().equals(((VirtFO)b).getName());
+                }
+                
+                return super.isSameFile(a, b);
+            }
+
+            class VirtFO extends SimpleJavaFileObject {
+
+                private final String n;
+
+                public VirtFO(URI uri, Kind kind, String n) {
+                    super(uri, kind);
+                    this.n = n;
+                }
+                private final ByteArrayOutputStream data = new ByteArrayOutputStream();
+
+                @Override
+                public OutputStream openOutputStream() throws IOException {
+                    return data;
+                }
+
+                @Override
+                public String getName() {
+                    return n;
+                }
+
+                @Override
+                public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                    data.close();
+                    return new String(data.toByteArray());
+                }
+            }
+        };
+
+        ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", "1.7"), null, Arrays.asList(file)).call();
+
+        Map<String, byte[]> result = new HashMap<String, byte[]>();
+
+        for (Map.Entry<String, ByteArrayOutputStream> e : class2BAOS.entrySet()) {
+            result.put(e.getKey(), e.getValue().toByteArray());
+        }
+
+        return result;
+    }
+
+
+    @Override
+    public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+        errors.add(diagnostic);
+    }
+    private static String findPkg(String java) throws IOException {
+        Pattern p = Pattern.compile("package\\p{javaWhitespace}*([\\p{Alnum}\\.]+)\\p{javaWhitespace}*;", Pattern.MULTILINE);
+        Matcher m = p.matcher(java);
+        if (!m.find()) {
+            throw new IOException("Can't find package declaration in the java file");
+        }
+        String pkg = m.group(1);
+        return pkg;
+    }
+    private static String findCls(String java) throws IOException {
+        Pattern p = Pattern.compile("class\\p{javaWhitespace}*([\\p{Alnum}\\.]+)\\p{javaWhitespace}", Pattern.MULTILINE);
+        Matcher m = p.matcher(java);
+        if (!m.find()) {
+            throw new IOException("Can't find package declaration in the java file");
+        }
+        String cls = m.group(1);
+        return cls;
+    }
+
+    String getHtml() {
+        String fqn = "'" + pkg + '.' + cls + "'";
+        return html.replace("'${fqn}'", fqn);
+    }
+
+    void assertErrors() {
+        assertFalse(getErrors().isEmpty(), "There are supposed to be some errors");
+    }
+
+    void assertError(String expMsg) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Can't find ").append(expMsg).append(" among:");
+        for (Diagnostic<? extends JavaFileObject> e : errors) {
+            String msg = e.getMessage(Locale.US);
+            if (msg.contains(expMsg)) {
+                return;
+            }
+            sb.append("\n");
+            sb.append(msg);
+        }
+        fail(sb.toString());
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e geo/src/test/java/org/netbeans/html/geo/impl/GeoProcessorTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/geo/src/test/java/org/netbeans/html/geo/impl/GeoProcessorTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,114 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.geo.impl;
+
+import java.io.IOException;
+import org.testng.annotations.Test;
+
+/** Test whether the annotation processor detects errors correctly.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class GeoProcessorTest {
+    
+    public GeoProcessorTest() {
+    }
+
+    @Test public void onLocationMethodHasToTakePositionParameter() throws IOException {
+        Compile res = Compile.create("", "package x;\n"
+            + "class UseOnLocation {\n"
+            + "  @net.java.html.geo.OnLocation\n"
+            + "  public static void cantCallMe() {}\n"
+            + "}\n"
+        );
+        res.assertErrors();
+        res.assertError("first argument must be net.java.html.geo.Position");
+    }
+    
+    @Test public void onLocationMethodCannotBePrivate() throws IOException {
+        Compile res = Compile.create("", "package x;\n"
+            + "class UseOnLocation {\n"
+            + "  @net.java.html.geo.OnLocation\n"
+            + "  private static void cantCallMe(net.java.html.geo.Position p) {}\n"
+            + "}\n"
+        );
+        res.assertErrors();
+        res.assertError("cannot be private");
+    }
+    
+    @Test public void onErrorHasToExist() throws IOException {
+        Compile res = Compile.create("", "package x;\n"
+            + "class UseOnLocation {\n"
+            + "  @net.java.html.geo.OnLocation(onError=\"doesNotExist\")\n"
+            + "  static void cantCallMe(net.java.html.geo.Position p) {}\n"
+            + "}\n"
+        );
+        res.assertErrors();
+        res.assertError("not find doesNotExist");
+    }
+
+    @Test public void onErrorWouldHaveToBeStatic() throws IOException {
+        Compile res = Compile.create("", "package x;\n"
+            + "class UseOnLocation {\n"
+            + "  @net.java.html.geo.OnLocation(onError=\"notStatic\")\n"
+            + "  static void cantCallMe(net.java.html.geo.Position p) {}\n"
+            + "  void notStatic(Exception e) {}\n"
+            + "}\n"
+        );
+        res.assertErrors();
+        res.assertError("have to be static");
+    }
+
+    @Test public void onErrorMustAcceptExceptionArgument() throws IOException {
+        Compile res = Compile.create("", "package x;\n"
+            + "class UseOnLocation {\n"
+            + "  @net.java.html.geo.OnLocation(onError=\"notStatic\")\n"
+            + "  static void cantCallMe(net.java.html.geo.Position p) {}\n"
+            + "  static void notStatic(java.io.IOException e) {}\n"
+            + "}\n"
+        );
+        res.assertErrors();
+        res.assertError("Error method first argument needs to be Exception");
+    }
+    
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json-tck/src/main/java/net/java/html/json/tests/ConvertTypesTest.java
--- a/json-tck/src/main/java/net/java/html/json/tests/ConvertTypesTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/json-tck/src/main/java/net/java/html/json/tests/ConvertTypesTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -49,7 +49,7 @@
 import java.util.Map;
 import net.java.html.BrwsrCtx;
 import net.java.html.json.Models;
-import org.apidesign.html.json.impl.JSON;
+import org.netbeans.html.json.impl.JSON;
 import org.apidesign.html.json.tck.KOTest;
 
 /**
diff -r 700087d2a5d3 -r 92fb71afdc0e json-tck/src/main/java/net/java/html/json/tests/JSONTest.java
--- a/json-tck/src/main/java/net/java/html/json/tests/JSONTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/json-tck/src/main/java/net/java/html/json/tests/JSONTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -49,7 +49,7 @@
 import net.java.html.json.Models;
 import net.java.html.json.OnReceive;
 import net.java.html.json.Property;
-import org.apidesign.html.json.impl.JSON;
+import org.netbeans.html.json.impl.JSON;
 import org.apidesign.html.json.tck.KOTest;
 
 /** Need to verify that models produce reasonable JSON objects.
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/net/java/html/json/Models.java
--- a/json/src/main/java/net/java/html/json/Models.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/json/src/main/java/net/java/html/json/Models.java	Mon Dec 16 16:59:43 2013 +0100
@@ -45,7 +45,7 @@
 import net.java.html.BrwsrCtx;
 import java.io.IOException;
 import java.io.InputStream;
-import org.apidesign.html.json.impl.JSON;
+import org.netbeans.html.json.impl.JSON;
 
 /** Information about and 
  * operations for classes generated by the {@link Model @Model}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/apidesign/html/json/impl/Bindings.java
--- a/json/src/main/java/org/apidesign/html/json/impl/Bindings.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-import org.apidesign.html.json.spi.PropertyBinding;
-import net.java.html.BrwsrCtx;
-import org.apidesign.html.json.impl.PropertyBindingAccessor.FBData;
-import org.apidesign.html.json.impl.PropertyBindingAccessor.PBData;
-import org.apidesign.html.json.spi.FunctionBinding;
-import org.apidesign.html.json.spi.Technology;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class Bindings<Data> {
-    private Data data;
-    private final Technology<Data> bp;
-
-    private Bindings(Technology<Data> bp) {
-        this.bp = bp;
-    }
-    
-    public <M> PropertyBinding registerProperty(String propName, M model, SetAndGet<M> access, boolean readOnly) {
-        return PropertyBindingAccessor.create(new PBData<M>(this, propName, model, access, readOnly));
-    }
-
-    public <M> FunctionBinding registerFunction(String name, M model, Callback<M> access) {
-        return PropertyBindingAccessor.createFunction(new FBData<M>(name, model, access));
-    }
-    
-    public static Bindings<?> apply(BrwsrCtx c, Object model) {
-        Technology<?> bp = JSON.findTechnology(c);
-        return apply(bp);
-    }
-    
-    private static <Data> Bindings<Data> apply(Technology<Data> bp) {
-        return new Bindings<Data>(bp);
-    }
-    
-    public final void finish(Object model, PropertyBinding[] propArr, FunctionBinding[] funcArr) {
-        assert data == null;
-        if (bp instanceof Technology.BatchInit) {
-            Technology.BatchInit<Data> bi = (Technology.BatchInit<Data>)bp;
-            data = bi.wrapModel(model, propArr, funcArr);
-        } else {
-            data = bp.wrapModel(model);
-            for (PropertyBinding b : propArr) {
-                bp.bind(b, model, data);
-            }
-            for (FunctionBinding b : funcArr) {
-                bp.expose(b, model, data);
-            }
-        }
-    }
-    
-    
-    public Data koData() {
-        return data;
-    }
-
-    public void valueHasMutated(String firstName) {
-        bp.valueHasMutated(data, firstName);
-    }
-    
-    public void applyBindings() {
-        bp.applyBindings(data);
-    }
-
-    Object wrapArray(Object[] arr) {
-        return bp.wrapArray(arr);
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/apidesign/html/json/impl/Callback.java
--- a/json/src/main/java/org/apidesign/html/json/impl/Callback.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public interface Callback<Data> {
-    public void call(Data model, Object data, Object ev);
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/apidesign/html/json/impl/FromJSON.java
--- a/json/src/main/java/org/apidesign/html/json/impl/FromJSON.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-import net.java.html.BrwsrCtx;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public interface FromJSON<Data> {
-    public Class<Data> factoryFor();
-    public Data read(BrwsrCtx c, Object d);
-    public Data cloneTo(Object d, BrwsrCtx c);
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/apidesign/html/json/impl/JSON.java
--- a/json/src/main/java/org/apidesign/html/json/impl/JSON.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,474 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import net.java.html.BrwsrCtx;
-import org.apidesign.html.context.spi.Contexts;
-import org.apidesign.html.json.spi.FunctionBinding;
-import org.apidesign.html.json.spi.JSONCall;
-import org.apidesign.html.json.spi.PropertyBinding;
-import org.apidesign.html.json.spi.Technology;
-import org.apidesign.html.json.spi.Transfer;
-import org.apidesign.html.json.spi.WSTransfer;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class JSON {
-    private JSON() {
-    }
-
-    static Technology<?> findTechnology(BrwsrCtx c) {
-        Technology<?> t = Contexts.find(c, Technology.class);
-        return t == null ? EmptyTech.EMPTY : t;
-    }
-
-    static Transfer findTransfer(BrwsrCtx c) {
-        Transfer t = Contexts.find(c, Transfer.class);
-        return t == null ? EmptyTech.EMPTY : t;
-    }
-
-    static WSTransfer<?> findWSTransfer(BrwsrCtx c) {
-        WSTransfer<?> t = Contexts.find(c, WSTransfer.class);
-        return t == null ? EmptyTech.EMPTY : t;
-    }
-    
-    public static void runInBrowser(BrwsrCtx c, Runnable runnable) {
-        findTechnology(c).runSafe(runnable);
-    }
-    
-    public static void extract(BrwsrCtx c, Object value, String[] props, Object[] values) {
-        Transfer t = findTransfer(c);
-        t.extract(value, props, values);
-    }
-    
-    private static Object getProperty(BrwsrCtx c, Object obj, String prop) {
-        if (prop == null) return obj;
-        
-        String[] arr = { prop };
-        Object[] val = { null };
-        extract(c, obj, arr, val);
-        return val[0];
-    }
-
-    public static Object toJSON(Object value) {
-        if (value == null) {
-            return "null";
-        }
-        if (value instanceof Enum) {
-            value = value.toString();
-        }
-        if (value instanceof String) {
-            String s = (String)value;
-            int len = s.length();
-            StringBuilder sb = new StringBuilder(len + 10);
-            sb.append('"');
-            for (int i = 0; i < len; i++) {
-                char ch = s.charAt(i);
-                switch (ch) {
-                    case '\"': sb.append("\\\""); break;
-                    case '\n': sb.append("\\n"); break;
-                    case '\r': sb.append("\\r"); break;
-                    case '\t': sb.append("\\t"); break;
-                    case '\\': sb.append("\\\\"); break;
-                    default: sb.append(ch);
-                }
-            }
-            sb.append('"');
-            return sb.toString();
-        }
-        return value.toString();
-    }
-
-    public static String toString(BrwsrCtx c, Object obj, String prop) {
-        obj = getProperty(c, obj, prop);
-        return obj instanceof String ? (String)obj : null;
-    }
-    public static Number toNumber(BrwsrCtx c, Object obj, String prop) {
-        obj = getProperty(c, obj, prop);
-        if (!(obj instanceof Number)) {
-            obj = Double.NaN;
-        }
-        return (Number)obj;
-    }
-    public static <M> M toModel(BrwsrCtx c, Class<M> aClass, Object data, Object object) {
-        Technology<?> t = findTechnology(c);
-        Object o = t.toModel(aClass, data);
-        return aClass.cast(o);
-    }
-    
-    public static boolean isSame(int a, int b) {
-        return a == b;
-    }
-    
-    public static boolean isSame(double a, double b) {
-        return a == b;
-    }
-    
-    public static boolean isSame(Object a, Object b) {
-        if (a == b) {
-            return true;
-        }
-        if (a == null || b == null) {
-            return false;
-        }
-        return a.equals(b);
-    }
-    
-    public static int hashPlus(Object o, int h) {
-        return o == null ? h : h ^ o.hashCode();
-    }
-
-    public static <T> T extractValue(Class<T> type, Object val) {
-        if (Number.class.isAssignableFrom(type)) {
-            val = numberValue(val);
-        }
-        if (Boolean.class == type) {
-            val = boolValue(val);
-        }
-        if (String.class == type) {
-            val = stringValue(val);
-        }
-        if (Character.class == type) {
-            val = charValue(val);
-        }
-        if (Integer.class == type) {
-            val = val instanceof Number ? ((Number)val).intValue() : 0;
-        }
-        if (Long.class == type) {
-            val = val instanceof Number  ? ((Number)val).longValue() : 0;
-        }
-        if (Short.class == type) {
-            val = val instanceof Number ? ((Number)val).shortValue() : 0;
-        }
-        if (Byte.class == type) {
-            val = val instanceof Number ? ((Number)val).byteValue() : 0;
-        }        
-        if (Double.class == type) {
-            val = val instanceof Number ? ((Number)val).doubleValue() : Double.NaN;
-        }
-        if (Float.class == type) {
-            val = val instanceof Number ? ((Number)val).floatValue() : Float.NaN;
-        }
-        return type.cast(val);
-    }
-    
-    protected static boolean isNumeric(Object val) {
-        return ((val instanceof Integer) || (val instanceof Long) || (val instanceof Short) || (val instanceof Byte));
-    }
-    
-    public static String stringValue(Object val) {
-        if (val instanceof Boolean) {
-            return ((Boolean)val ? "true" : "false");
-        }
-        if (isNumeric(val)) {
-            return Long.toString(((Number)val).longValue());
-        }
-        if (val instanceof Float) {
-            return Float.toString((Float)val);
-        }
-        if (val instanceof Double) {
-            return Double.toString((Double)val);
-        }
-        return (String)val;
-    }
-
-    public static Number numberValue(Object val) {
-        if (val instanceof String) {
-            try {
-                return Double.valueOf((String)val);
-            } catch (NumberFormatException ex) {
-                return Double.NaN;
-            }
-        }
-        if (val instanceof Boolean) {
-            return (Boolean)val ? 1 : 0;
-        }
-        return (Number)val;
-    }
-
-    public static Character charValue(Object val) {
-        if (val instanceof Number) {
-            return Character.toChars(numberValue(val).intValue())[0];
-        }
-        if (val instanceof Boolean) {
-            return (Boolean)val ? (char)1 : (char)0;
-        }
-        if (val instanceof String) {
-            String s = (String)val;
-            return s.isEmpty() ? (char)0 : s.charAt(0);
-        }
-        return (Character)val;
-    }
-    
-    public static Boolean boolValue(Object val) {
-        if (val instanceof String) {
-            return Boolean.parseBoolean((String)val);
-        }
-        if (val instanceof Number) {
-            return numberValue(val).doubleValue() != 0.0;
-        }
-    
-        return Boolean.TRUE.equals(val);
-    }
-    
-    public static void loadJSON(
-        BrwsrCtx c, RcvrJSON callback,
-        String urlBefore, String urlAfter, String method,
-        Object data
-    ) {
-        JSONCall call = PropertyBindingAccessor.createCall(c, callback, urlBefore, urlAfter, method, data);
-        Transfer t = findTransfer(c);
-        t.loadJSON(call);
-    }
-    public static WS openWS(
-        BrwsrCtx c, RcvrJSON r, String url, Object data
-    ) {
-        WS ws = WSImpl.create(findWSTransfer(c), r);
-        ws.send(c, url, data);
-        return ws;
-    }
-    
-    public static abstract class WS {
-        private WS() {
-        }
-        
-        public abstract void send(BrwsrCtx ctx, String url, Object model);
-    }
-    
-    private static final class WSImpl<Socket> extends WS {
-
-        private final WSTransfer<Socket> trans;
-        private final RcvrJSON rcvr;
-        private Socket socket;
-        private String prevURL;
-
-        private WSImpl(WSTransfer<Socket> trans, RcvrJSON rcvr) {
-            this.trans = trans;
-            this.rcvr = rcvr;
-        }
-        
-        static <Socket> WS create(WSTransfer<Socket> t, RcvrJSON r) {
-            return new WSImpl<Socket>(t, r);
-        }
-
-        @Override
-        public void send(BrwsrCtx ctx, String url, Object data) {
-            Socket s = socket;
-            if (s == null) {
-                if (data != null) {
-                    throw new IllegalStateException("WebSocket is not opened yet. Call with null data, was: " + data);
-                }
-                JSONCall call = PropertyBindingAccessor.createCall(ctx, rcvr, url, null, "WebSocket", null);
-                socket = trans.open(url, call);
-                prevURL = url;
-                return;
-            }
-            if (data == null) {
-                trans.close(s);
-                socket = null;
-                return;
-            }
-            if (!prevURL.equals(url)) {
-                throw new IllegalStateException(
-                    "Can't call to different URL " + url + " was: " + prevURL + "!"
-                    + " Close the socket by calling it will null data first!"
-                );
-            }
-            JSONCall call = PropertyBindingAccessor.createCall(ctx, rcvr, prevURL, null, "WebSocket", data);
-            trans.send(s, call);
-        }
-        
-    }
-    
-    private static final Map<Class,FromJSON<?>> froms;
-    static {
-        Map<Class,FromJSON<?>> m = new HashMap<Class,FromJSON<?>>();
-        froms = m;
-    }
-    public static void register(FromJSON<?> from) {
-        froms.put(from.factoryFor(), from);
-    }
-    
-    public static boolean isModel(Class<?> clazz) {
-        return findFrom(clazz) != null; 
-    }
-    
-    private static FromJSON<?> findFrom(Class<?> clazz) {
-        for (int i = 0; i < 2; i++) {
-            FromJSON<?> from = froms.get(clazz);
-            if (from == null) {
-                initClass(clazz);
-            } else {
-                return from;
-            }
-        }
-        return null;
-    }
-    
-    public static <Model> Model bindTo(Model model, BrwsrCtx c) {
-        FromJSON<?> from = findFrom(model.getClass());
-        if (from == null) {
-            throw new IllegalArgumentException();
-        }
-        return (Model) from.cloneTo(model, c);
-    }
-    
-    public static <T> T readStream(BrwsrCtx c, Class<T> modelClazz, InputStream data) 
-    throws IOException {
-        Transfer tr = findTransfer(c);
-        return read(c, modelClazz, tr.toJSON((InputStream)data));
-    }
-    public static <T> T read(BrwsrCtx c, Class<T> modelClazz, Object data) {
-        if (data == null) {
-            return null;
-        }
-        if (modelClazz == String.class) {
-            return modelClazz.cast(data.toString());
-        }
-        for (int i = 0; i < 2; i++) {
-            FromJSON<?> from = froms.get(modelClazz);
-            if (from == null) {
-                initClass(modelClazz);
-            } else {
-                return modelClazz.cast(from.read(c, data));
-            }
-        }
-        throw new NullPointerException();
-    }
-    static void initClass(Class<?> modelClazz) {
-        try {
-            // try to resolve the class
-            ClassLoader l;
-            try {
-                l = modelClazz.getClassLoader();
-            } catch (SecurityException ex) {
-                l = null;
-            }
-            if (l != null) {
-                Class.forName(modelClazz.getName(), true, l);
-            }
-            modelClazz.newInstance();
-        } catch (Exception ex) {
-            // ignore and try again
-        }
-    }
-    
-    private static final class EmptyTech
-    implements Technology<Object>, Transfer, WSTransfer<Void> {
-        private static final EmptyTech EMPTY = new EmptyTech();
-
-        @Override
-        public Object wrapModel(Object model) {
-            return model;
-        }
-
-        @Override
-        public void valueHasMutated(Object data, String propertyName) {
-        }
-
-        @Override
-        public void bind(PropertyBinding b, Object model, Object data) {
-        }
-
-        @Override
-        public void expose(FunctionBinding fb, Object model, Object d) {
-        }
-
-        @Override
-        public void applyBindings(Object data) {
-        }
-
-        @Override
-        public Object wrapArray(Object[] arr) {
-            return arr;
-        }
-
-        @Override
-        public void extract(Object obj, String[] props, Object[] values) {
-            for (int i = 0; i < values.length; i++) {
-                values[i] = null;
-            }
-        }
-
-        @Override
-        public void loadJSON(JSONCall call) {
-            call.notifyError(new UnsupportedOperationException());
-        }
-
-        @Override
-        public <M> M toModel(Class<M> modelClass, Object data) {
-            return modelClass.cast(data);
-        }
-
-        @Override
-        public Object toJSON(InputStream is) throws IOException {
-            throw new IOException("Not supported");
-        }
-
-        @Override
-        public synchronized void runSafe(Runnable r) {
-            r.run();
-        }
-
-        @Override
-        public Void open(String url, JSONCall onReply) {
-            onReply.notifyError(new UnsupportedOperationException("WebSockets not supported!"));
-            return null;
-        }
-
-        @Override
-        public void send(Void socket, JSONCall data) {
-        }
-
-        @Override
-        public void close(Void socket) {
-        }
-    }
-    
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/apidesign/html/json/impl/JSONList.java
--- a/json/src/main/java/org/apidesign/html/json/impl/JSONList.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,236 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import net.java.html.BrwsrCtx;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class JSONList<T> extends ArrayList<T> {
-    private final String name;
-    private final String[] deps;
-    private Bindings[] model;
-    private Runnable onchange;
-
-    public JSONList(Bindings[] model, String name, String... deps) {
-        assert model.length == 1;
-        this.model = model;
-        this.name = name;
-        this.deps = deps;
-    }
-    
-    public void init(T... values) {
-        if (values == null || values.length == 0) {
-            return;
-        }
-        if (this.model[0] != null || !isEmpty()) {
-            throw new IllegalStateException();
-        }
-        super.addAll(Arrays.asList(values));
-    }
-    
-    public void init(Object values) {
-        int len;
-        if (values == null || (len = Array.getLength(values)) == 0) {
-            return;
-        }
-        if (this.model[0] != null || !isEmpty()) {
-            throw new IllegalStateException();
-        }
-        for (int i = 0; i < len; i++) {
-            Object data = Array.get(values, i);
-            super.add((T)data);
-        }
-    }
-    
-    public JSONList<T> onChange(Runnable r) {
-        if (this.onchange != null) {
-            throw new IllegalStateException();
-        }
-        this.onchange = r;
-        return this;
-    }
-
-    @Override
-    public boolean add(T e) {
-        boolean ret = super.add(e);
-        notifyChange();
-        return ret;
-    }
-
-    @Override
-    public boolean addAll(Collection<? extends T> c) {
-        boolean ret = super.addAll(c);
-        notifyChange();
-        return ret;
-    }
-
-    @Override
-    public boolean addAll(int index, Collection<? extends T> c) {
-        boolean ret = super.addAll(index, c);
-        notifyChange();
-        return ret;
-    }
-
-    @Override
-    public boolean remove(Object o) {
-        boolean ret = super.remove(o);
-        notifyChange();
-        return ret;
-    }
-
-    @Override
-    public void clear() {
-        super.clear();
-        notifyChange();
-    }
-
-    @Override
-    public boolean removeAll(Collection<?> c) {
-        boolean ret = super.removeAll(c);
-        notifyChange();
-        return ret;
-    }
-
-    @Override
-    public boolean retainAll(Collection<?> c) {
-        boolean ret = super.retainAll(c);
-        notifyChange();
-        return ret;
-    }
-
-    @Override
-    public T set(int index, T element) {
-        T ret = super.set(index, element);
-        notifyChange();
-        return ret;
-    }
-
-    @Override
-    public void add(int index, T element) {
-        super.add(index, element);
-        notifyChange();
-    }
-
-    @Override
-    public T remove(int index) {
-        T ret = super.remove(index);
-        notifyChange();
-        return ret;
-    }
-
-    @Override
-    public String toString() {
-        Iterator<T> it = iterator();
-        if (!it.hasNext()) {
-            return "[]";
-        }
-        String sep = "";
-        StringBuilder sb = new StringBuilder();
-        sb.append('[');
-        while (it.hasNext()) {
-            T t = it.next();
-            sb.append(sep);
-            sb.append(JSON.toJSON(t));
-            sep = ",";
-        }
-        sb.append(']');
-        return sb.toString();
-    }
-
-    private void notifyChange() {
-        Bindings m = model[0];
-        if (m != null) {
-            m.valueHasMutated(name);
-            for (String dependant : deps) {
-                m.valueHasMutated(dependant);
-            }
-            Runnable r = onchange;
-            if (r != null) {
-                r.run();
-            }
-        }
-    }
-    
-    public void cloneAll(BrwsrCtx c, Collection<T> other) {
-        Boolean isModel = null;
-        for (T t : other) {
-            if (isModel == null) {
-                isModel = JSON.isModel(t.getClass());
-            }
-            if (isModel) {
-                add(JSON.bindTo(t, c));
-            } else {
-                add(t);
-            }
-        }
-    }
-
-    @Override
-    public JSONList clone() {
-        throw new UnsupportedOperationException();
-    }
-
-    static final Object koData(Collection<?> c, Bindings m) {
-        Object[] arr = c.toArray(new Object[c.size()]);
-        for (int i = 0; i < arr.length; i++) {
-            Object r = WrapperObject.find(arr[i], m);
-            if (r != null) {
-                arr[i] = r;
-            }
-        }
-        return m.wrapArray(arr);
-    }
-
-    final Object koData() {
-        return koData(this, model[0]);
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/apidesign/html/json/impl/ModelProcessor.java
--- a/json/src/main/java/org/apidesign/html/json/impl/ModelProcessor.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1767 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.lang.annotation.AnnotationTypeMismatchException;
-import java.lang.annotation.IncompleteAnnotationException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.WeakHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.Completion;
-import javax.annotation.processing.Completions;
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.annotation.processing.Processor;
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.AnnotationValue;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
-import javax.lang.model.type.ArrayType;
-import javax.lang.model.type.DeclaredType;
-import javax.lang.model.type.MirroredTypeException;
-import javax.lang.model.type.TypeKind;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.Elements;
-import javax.lang.model.util.Types;
-import javax.tools.Diagnostic;
-import javax.tools.FileObject;
-import net.java.html.json.ComputedProperty;
-import net.java.html.json.Model;
-import net.java.html.json.Function;
-import net.java.html.json.ModelOperation;
-import net.java.html.json.OnPropertyChange;
-import net.java.html.json.OnReceive;
-import net.java.html.json.Property;
-import org.openide.util.lookup.ServiceProvider;
-
-/** Annotation processor to process {@link Model @Model} annotations and
- * generate appropriate model classes.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@ServiceProvider(service=Processor.class)
-@SupportedSourceVersion(SourceVersion.RELEASE_6)
-@SupportedAnnotationTypes({
-    "net.java.html.json.Model",
-    "net.java.html.json.ModelOperation",
-    "net.java.html.json.Function",
-    "net.java.html.json.OnReceive",
-    "net.java.html.json.OnPropertyChange",
-    "net.java.html.json.ComputedProperty",
-    "net.java.html.json.Property"
-})
-public final class ModelProcessor extends AbstractProcessor {
-    private static final Logger LOG = Logger.getLogger(ModelProcessor.class.getName());
-    private final Map<Element,String> models = new WeakHashMap<Element,String>();
-    private final Map<Element,Prprt[]> verify = new WeakHashMap<Element,Prprt[]>();
-    @Override
-    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        boolean ok = true;
-        for (Element e : roundEnv.getElementsAnnotatedWith(Model.class)) {
-            if (!processModel(e)) {
-                ok = false;
-            }
-        }
-        if (roundEnv.processingOver()) {
-            models.clear();
-            for (Map.Entry<Element, Prprt[]> entry : verify.entrySet()) {
-                TypeElement te = (TypeElement)entry.getKey();
-                String fqn = processingEnv.getElementUtils().getBinaryName(te).toString();
-                Element finalElem = processingEnv.getElementUtils().getTypeElement(fqn);
-                if (finalElem == null) {
-                    continue;
-                }
-                Prprt[] props;
-                Model m = finalElem.getAnnotation(Model.class);
-                if (m == null) {
-                    continue;
-                }
-                props = Prprt.wrap(processingEnv, finalElem, m.properties());
-                for (Prprt p : props) {
-                    boolean[] isModel = { false };
-                    boolean[] isEnum = { false };
-                    boolean[] isPrimitive = { false };
-                    String t = checkType(p, isModel, isEnum, isPrimitive);
-                    if (isEnum[0]) {
-                        continue;
-                    }
-                    if (isPrimitive[0]) {
-                        continue;
-                    }
-                    if (isModel[0]) {
-                        continue;
-                    }
-                    if ("java.lang.String".equals(t)) {
-                        continue;
-                    }
-                    error("The type " + t + " should be defined by @Model annotation", entry.getKey());
-                }
-            }
-            verify.clear();
-        }
-        return ok;
-    }
-
-    private void error(String msg, Element e) {
-        processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, msg, e);
-    }
-    
-    private boolean processModel(Element e) {
-        boolean ok = true;
-        Model m = e.getAnnotation(Model.class);
-        if (m == null) {
-            return true;
-        }
-        String pkg = findPkgName(e);
-        Writer w;
-        String className = m.className();
-        models.put(e, className);
-        try {
-            StringWriter body = new StringWriter();
-            List<String> propsGetSet = new ArrayList<String>();
-            List<String> functions = new ArrayList<String>();
-            Map<String, Collection<String>> propsDeps = new HashMap<String, Collection<String>>();
-            Map<String, Collection<String>> functionDeps = new HashMap<String, Collection<String>>();
-            Prprt[] props = createProps(e, m.properties());
-            
-            if (!generateComputedProperties(body, props, e.getEnclosedElements(), propsGetSet, propsDeps)) {
-                ok = false;
-            }
-            if (!generateOnChange(e, propsDeps, props, className, functionDeps)) {
-                ok = false;
-            }
-            if (!generateProperties(e, body, props, propsGetSet, propsDeps, functionDeps)) {
-                ok = false;
-            }
-            if (!generateFunctions(e, body, className, e.getEnclosedElements(), functions)) {
-                ok = false;
-            }
-            if (!generateReceive(e, body, className, e.getEnclosedElements(), functions)) {
-                ok = false;
-            }
-            if (!generateOperation(e, body, className, e.getEnclosedElements())) {
-                ok = false;
-            }
-            FileObject java = processingEnv.getFiler().createSourceFile(pkg + '.' + className, e);
-            w = new OutputStreamWriter(java.openOutputStream());
-            try {
-                w.append("package " + pkg + ";\n");
-                w.append("import net.java.html.json.*;\n");
-                w.append("public final class ").append(className).append(" implements Cloneable {\n");
-                w.append("  private boolean locked;\n");
-                w.append("  private net.java.html.BrwsrCtx context;\n");
-                w.append("  private org.apidesign.html.json.impl.Bindings[] ko = { null };\n");
-                w.append(body.toString());
-                w.append("  private static Class<" + inPckName(e) + "> modelFor() { return null; }\n");
-                w.append("  private ").append(className).append("(net.java.html.BrwsrCtx context) {\n");
-                w.append("    this.context = context;\n");
-                w.append("  };\n");
-                w.append("  public ").append(className).append("() {\n");
-                w.append("    this(net.java.html.BrwsrCtx.findDefault(").append(className).append(".class));\n");
-                for (Prprt p : props) {
-                    if (p.array()) {
-                        continue;
-                    }
-                    boolean[] isModel = {false};
-                    boolean[] isEnum = {false};
-                    boolean isPrimitive[] = {false};
-                    String tn = checkType(p, isModel, isEnum, isPrimitive);
-                    if (isModel[0]) {
-                        w.write("    prop_" + p.name() + " = new " + tn + "();\n");
-                    }
-                }
-                w.append("  };\n");
-                if (props.length > 0) {
-                    w.append("  public ").append(className).append("(");
-                    Prprt firstArray = null;
-                    String sep = "";
-                    for (Prprt p : props) {
-                        if (p.array()) {
-                            if (firstArray == null) {
-                                firstArray = p;
-                            }
-                            continue;
-                        }
-                        String tn = typeName(e, p);
-                        w.write(sep);
-                        w.write(tn);
-                        w.write(" " + p.name());
-                        sep = ", ";
-                    }
-                    if (firstArray != null) {
-                        String tn;
-                        boolean[] isModel = {false};
-                        boolean[] isEnum = {false};
-                        boolean isPrimitive[] = {false};
-                        tn = checkType(firstArray, isModel, isEnum, isPrimitive);
-                        w.write(sep);
-                        w.write(tn);
-                        w.write("... " + firstArray.name());
-                    }
-                    w.append(") {\n");
-                    w.append("    this(net.java.html.BrwsrCtx.findDefault(").append(className).append(".class));\n");
-                    for (Prprt p : props) {
-                        if (p.array()) {
-                            continue;
-                        }
-                        w.write("    this.prop_" + p.name() + " = " + p.name() + ";\n");
-                    }
-                    if (firstArray != null) {
-                        w.write("    this.prop_" + firstArray.name() + ".init(" + firstArray.name() + ");\n");
-                    }
-                    w.append("  };\n");
-                }
-                w.append("  private org.apidesign.html.json.impl.Bindings intKnckt() {\n");
-                w.append("    if (ko[0] != null) return ko[0];\n");
-                w.append("    ko[0] = org.apidesign.html.json.impl.Bindings.apply(context, this);\n");
-                {
-                    w.append("    org.apidesign.html.json.spi.PropertyBinding[] propArr = {\n");
-                    for (int i = 0; i < propsGetSet.size(); i += 5) {
-                        w.append("      ko[0].registerProperty(\"").append(propsGetSet.get(i)).append("\", this, new P(");
-                        w.append((i / 5) + "), " + (propsGetSet.get(i + 2) == null) + "),\n");
-                    }
-                    w.append("    };\n");
-                }
-                {
-                    w.append("    org.apidesign.html.json.spi.FunctionBinding[] funcArr = {\n");
-                    for (int i = 0; i < functions.size(); i += 2) {
-                        w.append("      ko[0].registerFunction(\"").append(functions.get(i)).append("\", this, new P(");
-                        w.append((i / 2) + ")),\n");
-                    }
-                    w.append("    };\n");
-                }
-                w.append("    ko[0].finish(this, propArr, funcArr);\n");
-                w.append("    return ko[0];\n");
-                w.append("  };\n");
-                w.append("  private static final class P implements org.apidesign.html.json.impl.SetAndGet<" + className + ">,\n");
-                w.append("  org.apidesign.html.json.impl.Callback<" + className + ">,\n");
-                w.append("  org.apidesign.html.json.impl.FromJSON<" + className + "> {\n");
-                w.append("    private final int type;\n");
-                w.append("    P(int t) { type = t; };\n");
-                w.append("    public void setValue(" + className + " data, Object value) {\n");
-                w.append("      switch (type) {\n");
-                for (int i = 0; i < propsGetSet.size(); i += 5) {
-                    final String set = propsGetSet.get(i + 2);
-                    String tn = propsGetSet.get(i + 4);
-                    String btn = findBoxedType(tn);
-                    if (btn != null) {
-                        tn = btn;
-                    }
-                    if (set != null) {
-                        w.append("        case " + (i / 5) + ": data." + strip(set) + "(org.apidesign.html.json.impl.JSON.extractValue(" + tn + ".class, value)); return;\n");
-                    }
-                }
-                w.append("      }\n");
-                w.append("    }\n");
-                w.append("    public Object getValue(" + className + " data) {\n");
-                w.append("      switch (type) {\n");
-                for (int i = 0; i < propsGetSet.size(); i += 5) {
-                    final String get = propsGetSet.get(i + 1);
-                    if (get != null) {
-                        w.append("        case " + (i / 5) + ": return data." + strip(get) + "();\n");
-                    }
-                }
-                w.append("      }\n");
-                w.append("      throw new UnsupportedOperationException();\n");
-                w.append("    }\n");
-                w.append("    public void call(" + className + " model, Object data, Object ev) {\n");
-                w.append("      switch (type) {\n");
-                for (int i = 0; i < functions.size(); i += 2) {
-                    final String name = functions.get(i);
-                    w.append("        case " + (i / 2) + ": model." + name + "(data, ev); return;\n");
-                }
-                w.append("      }\n");
-                w.append("      throw new UnsupportedOperationException();\n");
-                w.append("    }\n");
-                w.append("    public Class<" + className + "> factoryFor() { return " + className + ".class; }\n");
-                w.append("    public " + className + " read(net.java.html.BrwsrCtx c, Object json) { return new " + className + "(c, json); }\n");
-                w.append("    public " + className + " cloneTo(Object o, net.java.html.BrwsrCtx c) { return ((" + className + ")o).clone(c); }\n");
-                w.append("  }\n");
-                w.append("  static { org.apidesign.html.json.impl.JSON.register(new P(0)); }\n");
-                w.append("  private ").append(className).append("(net.java.html.BrwsrCtx c, Object json) {\n");
-                w.append("    this.context = c;\n");
-                int values = 0;
-                for (int i = 0; i < propsGetSet.size(); i += 5) {
-                    Prprt p = findPrprt(props, propsGetSet.get(i));
-                    if (p == null) {
-                        continue;
-                    }
-                    values++;
-                }
-                w.append("    Object[] ret = new Object[" + values + "];\n");
-                w.append("    org.apidesign.html.json.impl.JSON.extract(context, json, new String[] {\n");
-                for (int i = 0; i < propsGetSet.size(); i += 5) {
-                    Prprt p = findPrprt(props, propsGetSet.get(i));
-                    if (p == null) {
-                        continue;
-                    }
-                    w.append("      \"").append(propsGetSet.get(i)).append("\",\n");
-                }
-                w.append("    }, ret);\n");
-                for (int i = 0, cnt = 0, prop = 0; i < propsGetSet.size(); i += 5) {
-                    final String pn = propsGetSet.get(i);
-                    Prprt p = findPrprt(props, pn);
-                    if (p == null) {
-                        continue;
-                    }
-                    boolean[] isModel = { false };
-                    boolean[] isEnum = { false };
-                    boolean isPrimitive[] = { false };
-                    String type = checkType(props[prop++], isModel, isEnum, isPrimitive);
-                    if (p.array()) {
-                        w.append("    if (ret[" + cnt + "] instanceof Object[]) {\n");
-                        w.append("      for (Object e : ((Object[])ret[" + cnt + "])) {\n");
-                        if (isModel[0]) {
-                            w.append("        this.prop_").append(pn).append(".add(org.apidesign.html.json.impl.JSON.read");
-                            w.append("(c, " + type + ".class, e));\n");
-                        } else if (isEnum[0]) {
-                            w.append("        this.prop_").append(pn);
-                            w.append(".add(e == null ? null : ");
-                            w.append(type).append(".valueOf(org.apidesign.html.json.impl.JSON.stringValue(e)));\n");
-                        } else {
-                            if (isPrimitive(type)) {
-                                w.append("        this.prop_").append(pn).append(".add(org.apidesign.html.json.impl.JSON.numberValue(e).");
-                                w.append(type).append("Value());\n");
-                            } else {
-                                w.append("        this.prop_").append(pn).append(".add((");
-                                w.append(type).append(")e);\n");
-                            }
-                        }
-                        w.append("      }\n");
-                        w.append("    }\n");
-                    } else {
-                        if (isEnum[0]) {
-                            w.append("    try {\n");
-                            w.append("    this.prop_").append(pn);
-                            w.append(" = ret[" + cnt + "] == null ? null : ");
-                            w.append(type).append(".valueOf(org.apidesign.html.json.impl.JSON.stringValue(ret[" + cnt + "]));\n");
-                            w.append("    } catch (IllegalArgumentException ex) {\n");
-                            w.append("      ex.printStackTrace();\n");
-                            w.append("    }\n");
-                        } else if (isPrimitive(type)) {
-                            w.append("    this.prop_").append(pn);
-                            w.append(" = ret[" + cnt + "] == null ? ");
-                            if ("char".equals(type)) {
-                                w.append("0 : (org.apidesign.html.json.impl.JSON.charValue(");
-                            } else if ("boolean".equals(type)) {
-                                w.append("false : (org.apidesign.html.json.impl.JSON.boolValue(");
-                            } else {
-                                w.append("0 : (org.apidesign.html.json.impl.JSON.numberValue(");
-                            }
-                            w.append("ret[" + cnt + "])).");
-                            w.append(type).append("Value();\n");
-                        } else if (isModel[0]) {
-                            w.append("    this.prop_").append(pn).append(" = org.apidesign.html.json.impl.JSON.read");
-                            w.append("(c, " + type + ".class, ");
-                            w.append("ret[" + cnt + "]);\n");
-                        }else {
-                            w.append("    this.prop_").append(pn);
-                            w.append(" = (").append(type).append(')');
-                            w.append("ret[" + cnt + "];\n");
-                        }
-                    }
-                    cnt++;
-                }
-                w.append("  };\n");
-                writeToString(props, w);
-                writeClone(className, props, w);
-                w.write("  /** Activates this model instance in the current {@link \n"
-                    + "net.java.html.json.Models#bind(java.lang.Object, net.java.html.BrwsrCtx) browser context}. \n"
-                    + "In case of using Knockout technology, this means to \n"
-                    + "bind JSON like data in this model instance with Knockout tags in \n"
-                    + "the surrounding HTML page.\n"
-                    + "*/\n"
-                );
-                w.write("  public " + className + " applyBindings() {\n");
-                w.write("    intKnckt().applyBindings();\n");
-                w.write("    return this;\n");
-                w.write("  }\n");
-                w.write("  public boolean equals(Object o) {\n");
-                w.write("    if (o == this) return true;\n");
-                w.write("    if (o instanceof org.apidesign.html.json.impl.WrapperObject) {\n");
-                w.write("      ((org.apidesign.html.json.impl.WrapperObject)o).setRealObject(intKnckt().koData());\n");
-                w.write("      return false;\n");
-                w.write("    }\n");
-                w.write("    if (!(o instanceof " + className + ")) return false;\n");
-                w.write("    " + className + " p = (" + className + ")o;\n");
-                for (Prprt p : props) {
-                    w.write("    if (!org.apidesign.html.json.impl.JSON.isSame(prop_" + p.name() + ", p.prop_" + p.name() + ")) return false;\n");
-                }
-                w.write("    return true;\n");
-                w.write("  }\n");
-                w.write("  public int hashCode() {\n");
-                w.write("    int h = " + className + ".class.getName().hashCode();\n");
-                for (Prprt p : props) {
-                    w.write("    h = org.apidesign.html.json.impl.JSON.hashPlus(prop_" + p.name() + ", h);\n");
-                }
-                w.write("    return h;\n");
-                w.write("  }\n");
-                w.write("}\n");
-            } finally {
-                w.close();
-            }
-        } catch (IOException ex) {
-            error("Can't create " + className + ".java", e);
-            return false;
-        }
-        return ok;
-    }
-    
-    private boolean generateProperties(
-        Element where,
-        Writer w, Prprt[] properties,
-        Collection<String> props, 
-        Map<String,Collection<String>> deps,
-        Map<String,Collection<String>> functionDeps
-    ) throws IOException {
-        boolean ok = true;
-        for (Prprt p : properties) {
-            final String tn;
-            tn = typeName(where, p);
-            String[] gs = toGetSet(p.name(), tn, p.array());
-            String castTo;
-            
-            if (p.array()) {
-                w.write("  private org.apidesign.html.json.impl.JSONList<" + tn + "> prop_" + p.name() + " = new org.apidesign.html.json.impl.JSONList<" + tn + ">(ko, \""
-                    + p.name() + "\"");
-                Collection<String> dependants = deps.get(p.name());
-                if (dependants != null) {
-                    for (String depProp : dependants) {
-                        w.write(", ");
-                        w.write('\"');
-                        w.write(depProp);
-                        w.write('\"');
-                    }
-                }
-                w.write(")");
-                
-                dependants = functionDeps.get(p.name());
-                if (dependants != null) {
-                    w.write(".onChange(new Runnable() { public void run() {\n");
-                    for (String call : dependants) {
-                        w.append("  ").append(call);
-                    }
-                    w.write("  }})");
-                }
-                w.write(";\n");
-            
-                castTo = "java.util.List";
-                w.write("  public java.util.List<" + tn + "> " + gs[0] + "() {\n");
-                w.write("    if (locked) throw new IllegalStateException();\n");
-                w.write("    return prop_" + p.name() + ";\n");
-                w.write("  }\n");
-            } else {
-                castTo = tn;
-                w.write("  private " + tn + " prop_" + p.name() + ";\n");
-                w.write("  public " + tn + " " + gs[0] + "() {\n");
-                w.write("    if (locked) throw new IllegalStateException();\n");
-                w.write("    return prop_" + p.name() + ";\n");
-                w.write("  }\n");
-                w.write("  public void " + gs[1] + "(" + tn + " v) {\n");
-                w.write("    if (locked) throw new IllegalStateException();\n");
-                w.write("    if (org.apidesign.html.json.impl.JSON.isSame(prop_" + p.name() + ", v)) return;\n");
-                w.write("    prop_" + p.name() + " = v;\n");
-                w.write("    org.apidesign.html.json.impl.Bindings b = ko[0];\n");
-                w.write("    if (b != null) {\n");
-                w.write("      b.valueHasMutated(\"" + p.name() + "\");\n");
-                Collection<String> dependants = deps.get(p.name());
-                if (dependants != null) {
-                    for (String depProp : dependants) {
-                        w.write("      b.valueHasMutated(\"" + depProp + "\");\n");
-                    }
-                }
-                w.write("    }\n");
-                dependants = functionDeps.get(p.name());
-                if (dependants != null) {
-                    for (String call : dependants) {
-                        w.append("  ").append(call);
-                    }
-                }
-                w.write("  }\n");
-            }
-            
-            props.add(p.name());
-            props.add(gs[2]);
-            props.add(gs[3]);
-            props.add(gs[0]);
-            props.add(castTo);
-        }
-        return ok;
-    }
-
-    private boolean generateComputedProperties(
-        Writer w, Prprt[] fixedProps,
-        Collection<? extends Element> arr, Collection<String> props,
-        Map<String,Collection<String>> deps
-    ) throws IOException {
-        boolean ok = true;
-        for (Element e : arr) {
-            if (e.getKind() != ElementKind.METHOD) {
-                continue;
-            }
-            if (e.getAnnotation(ComputedProperty.class) == null) {
-                continue;
-            }
-            if (!e.getModifiers().contains(Modifier.STATIC)) {
-                error("Method " + e.getSimpleName() + " has to be static when annotated by @ComputedProperty", e);
-                ok = false;
-                continue;
-            }
-            ExecutableElement ee = (ExecutableElement)e;
-            final TypeMirror rt = ee.getReturnType();
-            final Types tu = processingEnv.getTypeUtils();
-            TypeMirror ert = tu.erasure(rt);
-            String tn = fqn(ert, ee);
-            boolean array = false;
-            final TypeMirror toCheck;
-            if (tn.equals("java.util.List")) {
-                array = true;
-                toCheck = ((DeclaredType)rt).getTypeArguments().get(0);
-            } else {
-                toCheck = rt;
-            }
-            
-            final String sn = ee.getSimpleName().toString();
-            
-            if (toCheck.getKind().isPrimitive()) {
-                // OK
-            } else {
-                TypeMirror stringType = processingEnv.getElementUtils().getTypeElement("java.lang.String").asType();
-                TypeMirror enumType = processingEnv.getElementUtils().getTypeElement("java.lang.Enum").asType();
-
-                if (tu.isSubtype(toCheck, stringType)) {
-                    // OK
-                } else if (tu.isSubtype(tu.erasure(toCheck), tu.erasure(enumType))) {
-                    // OK
-                } else if (isModel(toCheck)) {
-                    // OK
-                } else {
-                    ok = false;
-                    error(sn + " cannot return " + toCheck, e);
-                }
-            }
-            
-            String[] gs = toGetSet(sn, tn, array);
-            
-            w.write("  public " + tn + " " + gs[0] + "() {\n");
-            w.write("    if (locked) throw new IllegalStateException();\n");
-            int arg = 0;
-            for (VariableElement pe : ee.getParameters()) {
-                final String dn = pe.getSimpleName().toString();
-                
-                if (!verifyPropName(pe, dn, fixedProps)) {
-                    ok = false;
-                }
-                
-                final String dt = fqn(pe.asType(), ee);
-                String[] call = toGetSet(dn, dt, false);
-                w.write("    " + dt + " arg" + (++arg) + " = ");
-                w.write(call[0] + "();\n");
-                
-                Collection<String> depends = deps.get(dn);
-                if (depends == null) {
-                    depends = new LinkedHashSet<String>();
-                    deps.put(dn, depends);
-                }
-                depends.add(sn);
-            }
-            w.write("    try {\n");
-            w.write("      locked = true;\n");
-            w.write("      return " + fqn(ee.getEnclosingElement().asType(), ee) + '.' + e.getSimpleName() + "(");
-            String sep = "";
-            for (int i = 1; i <= arg; i++) {
-                w.write(sep);
-                w.write("arg" + i);
-                sep = ", ";
-            }
-            w.write(");\n");
-            w.write("    } finally {\n");
-            w.write("      locked = false;\n");
-            w.write("    }\n");
-            w.write("  }\n");
-
-            props.add(e.getSimpleName().toString());
-            props.add(gs[2]);
-            props.add(null);
-            props.add(gs[0]);
-            props.add(tn);
-        }
-        
-        return ok;
-    }
-
-    private static String[] toGetSet(String name, String type, boolean array) {
-        String n = Character.toUpperCase(name.charAt(0)) + name.substring(1);
-        String bck2brwsrType = "L" + type.replace('.', '_') + "_2";
-        if ("int".equals(type)) {
-            bck2brwsrType = "I";
-        }
-        if ("double".equals(type)) {
-            bck2brwsrType = "D";
-        }
-        String pref = "get";
-        if ("boolean".equals(type)) {
-            pref = "is";
-            bck2brwsrType = "Z";
-        }
-        final String nu = n.replace('.', '_');
-        if (array) {
-            return new String[] { 
-                "get" + n,
-                null,
-                "get" + nu + "__Ljava_util_List_2",
-                null
-            };
-        }
-        return new String[]{
-            pref + n, 
-            "set" + n, 
-            pref + nu + "__" + bck2brwsrType,
-            "set" + nu + "__V" + bck2brwsrType
-        };
-    }
-
-    private String typeName(Element where, Prprt p) {
-        String ret;
-        boolean[] isModel = { false };
-        boolean[] isEnum = { false };
-        boolean isPrimitive[] = { false };
-        ret = checkType(p, isModel, isEnum, isPrimitive);
-        if (p.array()) {
-            String bt = findBoxedType(ret);
-            if (bt != null) {
-                return bt;
-            }
-        }
-        return ret;
-    }
-    
-    private static String findBoxedType(String ret) {
-        if (ret.equals("boolean")) {
-            return Boolean.class.getName();
-        }
-        if (ret.equals("byte")) {
-            return Byte.class.getName();
-        }
-        if (ret.equals("short")) {
-            return Short.class.getName();
-        }
-        if (ret.equals("char")) {
-            return Character.class.getName();
-        }
-        if (ret.equals("int")) {
-            return Integer.class.getName();
-        }
-        if (ret.equals("long")) {
-            return Long.class.getName();
-        }
-        if (ret.equals("float")) {
-            return Float.class.getName();
-        }
-        if (ret.equals("double")) {
-            return Double.class.getName();
-        }
-        return null;
-    }
-
-    private boolean verifyPropName(Element e, String propName, Prprt[] existingProps) {
-        StringBuilder sb = new StringBuilder();
-        String sep = "";
-        for (Prprt Prprt : existingProps) {
-            if (Prprt.name().equals(propName)) {
-                return true;
-            }
-            sb.append(sep);
-            sb.append('"');
-            sb.append(Prprt.name());
-            sb.append('"');
-            sep = ", ";
-        }
-        error(
-            propName + " is not one of known properties: " + sb
-            , e
-        );
-        return false;
-    }
-
-    private static String findPkgName(Element e) {
-        for (;;) {
-            if (e.getKind() == ElementKind.PACKAGE) {
-                return ((PackageElement)e).getQualifiedName().toString();
-            }
-            e = e.getEnclosingElement();
-        }
-    }
-
-    private boolean generateFunctions(
-        Element clazz, StringWriter body, String className, 
-        List<? extends Element> enclosedElements, List<String> functions
-    ) {
-        for (Element m : enclosedElements) {
-            if (m.getKind() != ElementKind.METHOD) {
-                continue;
-            }
-            ExecutableElement e = (ExecutableElement)m;
-            Function onF = e.getAnnotation(Function.class);
-            if (onF == null) {
-                continue;
-            }
-            if (!e.getModifiers().contains(Modifier.STATIC)) {
-                error("@OnFunction method needs to be static", e);
-                return false;
-            }
-            if (e.getModifiers().contains(Modifier.PRIVATE)) {
-                error("@OnFunction method cannot be private", e);
-                return false;
-            }
-            if (e.getReturnType().getKind() != TypeKind.VOID) {
-                error("@OnFunction method should return void", e);
-                return false;
-            }
-            String n = e.getSimpleName().toString();
-            body.append("  private void ").append(n).append("(Object data, Object ev) {\n");
-            body.append("    ").append(((TypeElement)clazz).getQualifiedName()).append(".").append(n).append("(");
-            body.append(wrapParams(e, null, className, "ev", "data"));
-            body.append(");\n");
-            body.append("  }\n");
-            
-            functions.add(n);
-            functions.add(n + "__VLjava_lang_Object_2Ljava_lang_Object_2");
-        }
-        return true;
-    }
-
-    private boolean generateOnChange(Element clazz, Map<String,Collection<String>> propDeps,
-        Prprt[] properties, String className, 
-        Map<String, Collection<String>> functionDeps
-    ) {
-        for (Element m : clazz.getEnclosedElements()) {
-            if (m.getKind() != ElementKind.METHOD) {
-                continue;
-            }
-            ExecutableElement e = (ExecutableElement) m;
-            OnPropertyChange onPC = e.getAnnotation(OnPropertyChange.class);
-            if (onPC == null) {
-                continue;
-            }
-            for (String pn : onPC.value()) {
-                if (findPrprt(properties, pn) == null && findDerivedFrom(propDeps, pn).isEmpty()) {
-                    error("No Prprt named '" + pn + "' in the model", clazz);
-                    return false;
-                }
-            }
-            if (!e.getModifiers().contains(Modifier.STATIC)) {
-                error("@OnPrprtChange method needs to be static", e);
-                return false;
-            }
-            if (e.getModifiers().contains(Modifier.PRIVATE)) {
-                error("@OnPrprtChange method cannot be private", e);
-                return false;
-            }
-            if (e.getReturnType().getKind() != TypeKind.VOID) {
-                error("@OnPrprtChange method should return void", e);
-                return false;
-            }
-            String n = e.getSimpleName().toString();
-            
-            
-            for (String pn : onPC.value()) {
-                StringBuilder call = new StringBuilder();
-                call.append("  ").append(clazz.getSimpleName()).append(".").append(n).append("(");
-                call.append(wrapPropName(e, className, "name", pn));
-                call.append(");\n");
-                
-                Collection<String> change = functionDeps.get(pn);
-                if (change == null) {
-                    change = new ArrayList<String>();
-                    functionDeps.put(pn, change);
-                }
-                change.add(call.toString());
-                for (String dpn : findDerivedFrom(propDeps, pn)) {
-                    change = functionDeps.get(dpn);
-                    if (change == null) {
-                        change = new ArrayList<String>();
-                        functionDeps.put(dpn, change);
-                    }
-                    change.add(call.toString());
-                }
-            }
-        }
-        return true;
-    }
-
-    private boolean generateOperation(Element clazz, 
-        StringWriter body, String className, 
-        List<? extends Element> enclosedElements
-    ) {
-        for (Element m : enclosedElements) {
-            if (m.getKind() != ElementKind.METHOD) {
-                continue;
-            }
-            ExecutableElement e = (ExecutableElement)m;
-            ModelOperation mO = e.getAnnotation(ModelOperation.class);
-            if (mO == null) {
-                continue;
-            }
-            if (!e.getModifiers().contains(Modifier.STATIC)) {
-                error("@ModelOperation method needs to be static", e);
-                return false;
-            }
-            if (e.getModifiers().contains(Modifier.PRIVATE)) {
-                error("@ModelOperation method cannot be private", e);
-                return false;
-            }
-            if (e.getReturnType().getKind() != TypeKind.VOID) {
-                error("@ModelOperation method should return void", e);
-                return false;
-            }
-            List<String> args = new ArrayList<String>();
-            {
-                body.append("  public void ").append(m.getSimpleName()).append("(");
-                String sep = "";
-                boolean checkFirst = true;
-                for (VariableElement ve : e.getParameters()) {
-                    final TypeMirror type = ve.asType();
-                    CharSequence simpleName;
-                    if (type.getKind() == TypeKind.DECLARED) {
-                        simpleName = ((DeclaredType)type).asElement().getSimpleName();
-                    } else {
-                        simpleName = type.toString();
-                    }
-                    if (simpleName.toString().equals(className)) {
-                        checkFirst = false;
-                    } else {
-                        if (checkFirst) {
-                            error("First parameter of @ModelOperation method must be " + className, m);
-                            return false;
-                        }
-                        args.add(ve.getSimpleName().toString());
-                        body.append(sep).append("final ");
-                        body.append(ve.asType().toString()).append(" ");
-                        body.append(ve.toString());
-                        sep = ", ";
-                    }
-                }
-                body.append(") {\n");
-                body.append("    org.apidesign.html.json.impl.JSON.runInBrowser(this.context, new Runnable() { public void run() {\n");
-                body.append("      ").append(clazz.getSimpleName()).append(".").append(m.getSimpleName()).append("(");
-                body.append(className).append(".this");
-                for (String s : args) {
-                    body.append(", ").append(s);
-                }
-                body.append(");\n");
-                body.append("    }});\n");
-                body.append("  }\n");
-            }
-            
-        }
-        return true;
-    }
-    
-    
-    private boolean generateReceive(
-        Element clazz, StringWriter body, String className, 
-        List<? extends Element> enclosedElements, List<String> functions
-    ) {
-        for (Element m : enclosedElements) {
-            if (m.getKind() != ElementKind.METHOD) {
-                continue;
-            }
-            ExecutableElement e = (ExecutableElement)m;
-            OnReceive onR = e.getAnnotation(OnReceive.class);
-            if (onR == null) {
-                continue;
-            }
-            if (!e.getModifiers().contains(Modifier.STATIC)) {
-                error("@OnReceive method needs to be static", e);
-                return false;
-            }
-            if (e.getModifiers().contains(Modifier.PRIVATE)) {
-                error("@OnReceive method cannot be private", e);
-                return false;
-            }
-            if (e.getReturnType().getKind() != TypeKind.VOID) {
-                error("@OnReceive method should return void", e);
-                return false;
-            }
-            if (!onR.jsonp().isEmpty() && !"GET".equals(onR.method())) {
-                error("JSONP works only with GET transport method", e);
-            }
-            String dataMirror = findDataSpecified(e, onR);
-            if ("PUT".equals(onR.method()) && dataMirror == null) {
-                error("PUT method needs to specify a data() class", e);
-                return false;
-            }
-            if ("POST".equals(onR.method()) && dataMirror == null) {
-                error("POST method needs to specify a data() class", e);
-                return false;
-            }
-            String modelClass = null;
-            boolean expectsList = false;
-            List<String> args = new ArrayList<String>();
-            {
-                for (VariableElement ve : e.getParameters()) {
-                    TypeMirror modelType = null;
-                    final TypeMirror type = ve.asType();
-                    CharSequence simpleName;
-                    if (type.getKind() == TypeKind.DECLARED) {
-                        simpleName = ((DeclaredType)type).asElement().getSimpleName();
-                    } else {
-                        simpleName = type.toString();
-                    }
-                    if (simpleName.toString().equals(className)) {
-                        args.add(className + ".this");
-                    } else if (isModel(ve.asType())) {
-                        modelType = ve.asType();
-                    } else if (ve.asType().getKind() == TypeKind.ARRAY) {
-                        modelType = ((ArrayType)ve.asType()).getComponentType();
-                        expectsList = true;
-                    } else if (ve.asType().toString().equals("java.lang.String")) {
-                        modelType = ve.asType();
-                    }
-                    if (modelType != null) {
-                        if (modelClass != null) {
-                            error("There can be only one model class among arguments", e);
-                        } else {
-                            modelClass = modelType.toString();
-                            if (expectsList) {
-                                args.add("arr");
-                            } else {
-                                args.add("arr[0]");
-                            }
-                        }
-                    }
-                }
-            }
-            if (modelClass == null) {
-                error("The method needs to have one @Model class as parameter", e);
-            }
-            String n = e.getSimpleName().toString();
-            if ("WebSocket".equals(onR.method())) {
-                body.append("  /** Performs WebSocket communication. Call with <code>null</code> data parameter\n");
-                body.append("  * to open the connection (even if not required). Call with non-null data to\n");
-                body.append("  * send messages to server. Call again with <code>null</code> data to close the socket.\n");
-                body.append("  */\n");
-            }
-            body.append("  public void ").append(n).append("(");
-            StringBuilder urlBefore = new StringBuilder();
-            StringBuilder urlAfter = new StringBuilder();
-            String jsonpVarName = null;
-            {
-                String sep = "";
-                boolean skipJSONP = onR.jsonp().isEmpty();
-                for (String p : findParamNames(e, onR.url(), onR.jsonp(), urlBefore, urlAfter)) {
-                    if (!skipJSONP && p.equals(onR.jsonp())) {
-                        skipJSONP = true;
-                        jsonpVarName = p;
-                        continue;
-                    }
-                    body.append(sep);
-                    body.append("String ").append(p);
-                    sep = ", ";
-                }
-                if (!skipJSONP) {
-                    error(
-                        "Name of jsonp attribute ('" + onR.jsonp() + 
-                        "') is not used in url attribute '" + onR.url() + "'", e
-                    );
-                }
-                if (dataMirror != null) {
-                    body.append(sep).append(dataMirror.toString()).append(" data");
-                }
-            }
-            body.append(") {\n");
-            boolean webSocket = onR.method().equals("WebSocket");
-            if (webSocket) {
-                if (generateWSReceiveBody(body, onR, e, clazz, className, expectsList, modelClass, n, args, urlBefore, jsonpVarName, urlAfter, dataMirror)) {
-                    return false;
-                }
-                body.append("  }\n");
-                body.append("  private org.apidesign.html.json.impl.JSON.WS ws_" + e.getSimpleName() + ";\n");
-            } else {
-                if (generateJSONReceiveBody(body, onR, e, clazz, className, expectsList, modelClass, n, args, urlBefore, jsonpVarName, urlAfter, dataMirror)) {
-                    return false;
-                }
-                body.append("  }\n");
-            }
-        }
-        return true;
-    }
-
-    private boolean generateJSONReceiveBody(StringWriter body, OnReceive onR, ExecutableElement e, Element clazz, String className, boolean expectsList, String modelClass, String n, List<String> args, StringBuilder urlBefore, String jsonpVarName, StringBuilder urlAfter, String dataMirror) {
-        body.append(
-            "    class ProcessResult extends org.apidesign.html.json.impl.RcvrJSON {\n" +
-            "      @Override\n" +
-            "      public void onError(org.apidesign.html.json.impl.RcvrJSON.MsgEvnt ev) {\n" +
-            "        Exception value = ev.getException();\n"
-            );
-        if (onR.onError().isEmpty()) {
-            body.append(
-                "        value.printStackTrace();\n"
-                );
-        } else {
-            if (!findOnError(e, ((TypeElement)clazz), onR.onError(), className)) {
-                return true;
-            }
-            body.append("        ").append(clazz.getSimpleName()).append(".").append(onR.onError()).append("(");
-            body.append(className).append(".this, value);\n");
-        }
-        body.append(
-            "      }\n" +
-            "      @Override\n" +
-            "      public void onMessage(org.apidesign.html.json.impl.RcvrJSON.MsgEvnt ev) {\n"
-            );
-        if (expectsList) {
-            body.append(
-                "        " + modelClass + "[] arr = new " + modelClass + "[ev.dataSize()];\n"
-                );
-        } else {
-            body.append(
-                "        " + modelClass + "[] arr = { null };\n"
-                );
-        }
-        body.append(
-            "        ev.dataRead(context, " + modelClass + ".class, arr);\n"
-            );
-        {
-            body.append("        ").append(clazz.getSimpleName()).append(".").append(n).append("(");
-            String sep = "";
-            for (String arg : args) {
-                body.append(sep);
-                body.append(arg);
-                sep = ", ";
-            }
-            body.append(");\n");
-        }
-        body.append(
-            "      }\n" +
-            "    }\n"
-            );
-        body.append("    ProcessResult pr = new ProcessResult();\n");
-        body.append("    org.apidesign.html.json.impl.JSON.loadJSON(context, pr,\n        ");
-        body.append(urlBefore).append(", ");
-        if (jsonpVarName != null) {
-            body.append(urlAfter);
-        } else {
-            body.append("null");
-        }
-        if (!"GET".equals(onR.method()) || dataMirror != null) {
-            body.append(", \"").append(onR.method()).append('"');
-            if (dataMirror != null) {
-                body.append(", data");
-            } else {
-                body.append(", null");
-            }
-        } else {
-            body.append(", null, null");
-        }
-        body.append(");\n");
-        return false;
-    }
-    
-    private boolean generateWSReceiveBody(StringWriter body, OnReceive onR, ExecutableElement e, Element clazz, String className, boolean expectsList, String modelClass, String n, List<String> args, StringBuilder urlBefore, String jsonpVarName, StringBuilder urlAfter, String dataMirror) {
-        body.append(
-            "    class ProcessResult extends org.apidesign.html.json.impl.RcvrJSON {\n" +
-            "      @Override\n" +
-            "      public void onOpen(org.apidesign.html.json.impl.RcvrJSON.MsgEvnt ev) {\n"
-        );
-        body.append("        ").append(clazz.getSimpleName()).append(".").append(n).append("(");
-        {
-            String sep = "";
-            for (String arg : args) {
-                body.append(sep);
-                if (arg.startsWith("arr")) {
-                    body.append("null");
-                } else {
-                    body.append(arg);
-                }
-                sep = ", ";
-            }
-        }
-        body.append(");\n");
-        body.append(
-            "      }\n" +
-            "      @Override\n" +
-            "      public void onError(org.apidesign.html.json.impl.RcvrJSON.MsgEvnt ev) {\n" +
-            "        Exception value = ev.getException();\n"
-            );
-        if (onR.onError().isEmpty()) {
-            body.append(
-                "        value.printStackTrace();\n"
-                );
-        } else {
-            if (!findOnError(e, ((TypeElement)clazz), onR.onError(), className)) {
-                return true;
-            }
-            body.append("        ").append(clazz.getSimpleName()).append(".").append(onR.onError()).append("(");
-            body.append(className).append(".this, value);\n");
-        }
-        body.append(
-            "      }\n" +
-            "      @Override\n" +
-            "      public void onMessage(org.apidesign.html.json.impl.RcvrJSON.MsgEvnt ev) {\n"
-        );
-        if (expectsList) {
-            body.append(
-                "        " + modelClass + "[] arr = new " + modelClass + "[ev.dataSize()];\n"
-                );
-        } else {
-            body.append(
-                "        " + modelClass + "[] arr = { null };\n"
-                );
-        }
-        body.append(
-            "        ev.dataRead(context, " + modelClass + ".class, arr);\n"
-            );
-        {
-            body.append("        ").append(clazz.getSimpleName()).append(".").append(n).append("(");
-            String sep = "";
-            for (String arg : args) {
-                body.append(sep);
-                body.append(arg);
-                sep = ", ";
-            }
-            body.append(");\n");
-        }
-        body.append(
-            "      }\n"
-        );
-        if (!onR.onError().isEmpty()) {
-            body.append(
-                "      @Override\n"
-              + "      public void onClose(org.apidesign.html.json.impl.RcvrJSON.MsgEvnt ev) {\n"
-            );
-            body.append("        ").append(clazz.getSimpleName()).append(".").append(onR.onError()).append("(");
-            body.append(className).append(".this, null);\n");
-            body.append(
-                "      }\n"
-            );
-        }
-        body.append("    }\n");
-        body.append("    if (this.ws_").append(e.getSimpleName()).append(" == null) {\n");
-        body.append("      ProcessResult pr = new ProcessResult();\n");
-        body.append("      this.ws_").append(e.getSimpleName());
-        body.append("= org.apidesign.html.json.impl.JSON.openWS(context, pr,\n        ");
-        body.append(urlBefore).append(", data);\n");
-        body.append("    } else {\n");
-        body.append("      this.ws_").append(e.getSimpleName()).append(".send(context, ").append(urlBefore).append(", data);\n");
-        body.append("    }\n");
-        return false;
-    }
-
-    private CharSequence wrapParams(
-        ExecutableElement ee, String id, String className, String evName, String dataName
-    ) {
-        TypeMirror stringType = processingEnv.getElementUtils().getTypeElement("java.lang.String").asType();
-        StringBuilder params = new StringBuilder();
-        boolean first = true;
-        for (VariableElement ve : ee.getParameters()) {
-            if (!first) {
-                params.append(", ");
-            }
-            first = false;
-            String toCall = null;
-            String toFinish = null;
-            if (ve.asType() == stringType) {
-                if (ve.getSimpleName().contentEquals("id")) {
-                    params.append('"').append(id).append('"');
-                    continue;
-                }
-                toCall = "org.apidesign.html.json.impl.JSON.toString(context, ";
-            }
-            if (ve.asType().getKind() == TypeKind.DOUBLE) {
-                toCall = "org.apidesign.html.json.impl.JSON.toNumber(context, ";
-                toFinish = ".doubleValue()";
-            }
-            if (ve.asType().getKind() == TypeKind.INT) {
-                toCall = "org.apidesign.html.json.impl.JSON.toNumber(context, ";
-                toFinish = ".intValue()";
-            }
-            if (dataName != null && ve.getSimpleName().contentEquals(dataName) && isModel(ve.asType())) {
-                toCall = "org.apidesign.html.json.impl.JSON.toModel(context, " + ve.asType() + ".class, ";
-            }
-
-            if (toCall != null) {
-                params.append(toCall);
-                if (dataName != null && ve.getSimpleName().contentEquals(dataName)) {
-                    params.append(dataName);
-                    params.append(", null");
-                } else {
-                    if (evName == null) {
-                        final StringBuilder sb = new StringBuilder();
-                        sb.append("Unexpected string parameter name.");
-                        if (dataName != null) {
-                            sb.append(" Try \"").append(dataName).append("\"");
-                        }
-                        error(sb.toString(), ee);
-                    }
-                    params.append(evName);
-                    params.append(", \"");
-                    params.append(ve.getSimpleName().toString());
-                    params.append("\"");
-                }
-                params.append(")");
-                if (toFinish != null) {
-                    params.append(toFinish);
-                }
-                continue;
-            }
-            String rn = fqn(ve.asType(), ee);
-            int last = rn.lastIndexOf('.');
-            if (last >= 0) {
-                rn = rn.substring(last + 1);
-            }
-            if (rn.equals(className)) {
-                params.append(className).append(".this");
-                continue;
-            }
-            error(
-                "The annotated method can only accept " + className + " argument or argument named 'data'",
-                ee
-            );
-        }
-        return params;
-    }
-    
-    
-    private CharSequence wrapPropName(
-        ExecutableElement ee, String className, String propName, String propValue
-    ) {
-        TypeMirror stringType = processingEnv.getElementUtils().getTypeElement("java.lang.String").asType();
-        StringBuilder params = new StringBuilder();
-        boolean first = true;
-        for (VariableElement ve : ee.getParameters()) {
-            if (!first) {
-                params.append(", ");
-            }
-            first = false;
-            if (ve.asType() == stringType) {
-                if (propName != null && ve.getSimpleName().contentEquals(propName)) {
-                    params.append('"').append(propValue).append('"');
-                } else {
-                    error("Unexpected string parameter name. Try \"" + propName + "\".", ee);
-                }
-                continue;
-            }
-            String rn = fqn(ve.asType(), ee);
-            int last = rn.lastIndexOf('.');
-            if (last >= 0) {
-                rn = rn.substring(last + 1);
-            }
-            if (rn.equals(className)) {
-                params.append(className).append(".this");
-                continue;
-            }
-            error(
-                "@OnPrprtChange method can only accept String or " + className + " arguments",
-                ee);
-        }
-        return params;
-    }
-    
-    private boolean isModel(TypeMirror tm) {
-        if (tm.getKind() == TypeKind.ERROR) {
-            return true;
-        }
-        final Element e = processingEnv.getTypeUtils().asElement(tm);
-        if (e == null) {
-            return false;
-        }
-        for (Element ch : e.getEnclosedElements()) {
-            if (ch.getKind() == ElementKind.METHOD) {
-                ExecutableElement ee = (ExecutableElement)ch;
-                if (ee.getParameters().isEmpty() && ee.getSimpleName().contentEquals("modelFor")) {
-                    return true;
-                }
-            }
-        }
-        return models.values().contains(e.getSimpleName().toString());
-    }
-    
-    private void writeToString(Prprt[] props, Writer w) throws IOException {
-        w.write("  public String toString() {\n");
-        w.write("    StringBuilder sb = new StringBuilder();\n");
-        w.write("    sb.append('{');\n");
-        String sep = "";
-        for (Prprt p : props) {
-            w.write(sep);
-            w.append("    sb.append('\"').append(\"" + p.name() + "\")");
-                w.append(".append('\"').append(\":\");\n");
-            w.append("    sb.append(org.apidesign.html.json.impl.JSON.toJSON(prop_");
-            w.append(p.name()).append("));\n");
-            sep =    "    sb.append(',');\n";
-        }
-        w.write("    sb.append('}');\n");
-        w.write("    return sb.toString();\n");
-        w.write("  }\n");
-    }
-    private void writeClone(String className, Prprt[] props, Writer w) throws IOException {
-        w.write("  public " + className + " clone() {\n");
-        w.write("    return clone(context);\n");
-        w.write("  }\n");
-        w.write("  private " + className + " clone(net.java.html.BrwsrCtx ctx) {\n");
-        w.write("    " + className + " ret = new " + className + "(ctx);\n");
-        for (Prprt p : props) {
-            if (!p.array()) {
-                boolean isModel[] = { false };
-                boolean isEnum[] = { false };
-                boolean isPrimitive[] = { false };
-                checkType(p, isModel, isEnum, isPrimitive);
-                if (!isModel[0]) {
-                    w.write("    ret.prop_" + p.name() + " = prop_" + p.name() + ";\n");
-                    continue;
-                }
-                w.write("    ret.prop_" + p.name() + " =  prop_" + p.name() + "  == null ? null : prop_" + p.name() + ".clone();\n");
-            } else {
-                w.write("    ret.prop_" + p.name() + ".cloneAll(ctx, prop_" + p.name() + ");\n");
-            }
-        }
-        
-        w.write("    return ret;\n");
-        w.write("  }\n");
-    }
-
-    private String inPckName(Element e) {
-        StringBuilder sb = new StringBuilder();
-        while (e.getKind() != ElementKind.PACKAGE) {
-            if (sb.length() == 0) {
-                sb.append(e.getSimpleName());
-            } else {
-                sb.insert(0, '.');
-                sb.insert(0, e.getSimpleName());
-            }
-            e = e.getEnclosingElement();
-        }
-        return sb.toString();
-    }
-
-    private String fqn(TypeMirror pt, Element relative) {
-        if (pt.getKind() == TypeKind.ERROR) {
-            final Elements eu = processingEnv.getElementUtils();
-            PackageElement pckg = eu.getPackageOf(relative);
-            return pckg.getQualifiedName() + "." + pt.toString();
-        }
-        return pt.toString();
-    }
-
-    private String checkType(Prprt p, boolean[] isModel, boolean[] isEnum, boolean[] isPrimitive) {
-        TypeMirror tm;
-        try {
-            String ret = p.typeName(processingEnv);
-            TypeElement e = processingEnv.getElementUtils().getTypeElement(ret);
-            if (e == null) {
-                isModel[0] = true;
-                isEnum[0] = false;
-                isPrimitive[0] = false;
-                return ret;
-            }
-            tm = e.asType();
-        } catch (MirroredTypeException ex) {
-            tm = ex.getTypeMirror();
-        }
-        tm = processingEnv.getTypeUtils().erasure(tm);
-        if (isPrimitive[0] = tm.getKind().isPrimitive()) {
-            isEnum[0] = false;
-            isModel[0] = false;
-            return tm.toString();
-        }
-        final Element e = processingEnv.getTypeUtils().asElement(tm);
-        if (e.getKind() == ElementKind.CLASS && tm.getKind() == TypeKind.ERROR) {
-            isModel[0] = true;
-            isEnum[0] = false;
-            return e.getSimpleName().toString();
-        }
-        
-        final Model m = e == null ? null : e.getAnnotation(Model.class);
-        String ret;
-        if (m != null) {
-            ret = findPkgName(e) + '.' + m.className();
-            isModel[0] = true;
-            models.put(e, m.className());
-        } else if (findModelForMthd(e)) {
-            ret = ((TypeElement)e).getQualifiedName().toString();
-            isModel[0] = true;
-        } else {
-            ret = tm.toString();
-        }
-        TypeMirror enm = processingEnv.getElementUtils().getTypeElement("java.lang.Enum").asType();
-        enm = processingEnv.getTypeUtils().erasure(enm);
-        isEnum[0] = processingEnv.getTypeUtils().isSubtype(tm, enm);
-        return ret;
-    }
-    
-    private static boolean findModelForMthd(Element clazz) {
-        if (clazz == null) {
-            return false;
-        }
-        for (Element e : clazz.getEnclosedElements()) {
-            if (e.getKind() == ElementKind.METHOD) {
-                ExecutableElement ee = (ExecutableElement)e;
-                if (
-                    ee.getSimpleName().contentEquals("modelFor") &&
-                    ee.getParameters().isEmpty()
-                ) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private Iterable<String> findParamNames(
-        Element e, String url, String jsonParam, StringBuilder... both
-    ) {
-        List<String> params = new ArrayList<String>();
-        int wasJSON = 0;
-
-        for (int pos = 0; ;) {
-            int next = url.indexOf('{', pos);
-            if (next == -1) {
-                both[wasJSON].append('"')
-                    .append(url.substring(pos))
-                    .append('"');
-                return params;
-            }
-            int close = url.indexOf('}', next);
-            if (close == -1) {
-                error("Unbalanced '{' and '}' in " + url, e);
-                return params;
-            }
-            final String paramName = url.substring(next + 1, close);
-            params.add(paramName);
-            if (paramName.equals(jsonParam) && !jsonParam.isEmpty()) {
-                both[wasJSON].append('"')
-                    .append(url.substring(pos, next))
-                    .append('"');
-                wasJSON = 1;
-            } else {
-                both[wasJSON].append('"')
-                    .append(url.substring(pos, next))
-                    .append("\" + ").append(paramName).append(" + ");
-            }
-            pos = close + 1;
-        }
-    }
-
-    private static Prprt findPrprt(Prprt[] properties, String propName) {
-        for (Prprt p : properties) {
-            if (propName.equals(p.name())) {
-                return p;
-            }
-        }
-        return null;
-    }
-
-    private boolean isPrimitive(String type) {
-        return 
-            "int".equals(type) ||
-            "double".equals(type) ||
-            "long".equals(type) ||
-            "short".equals(type) ||
-            "byte".equals(type) ||
-            "char".equals(type) ||
-            "boolean".equals(type) ||
-            "float".equals(type);
-    }
-
-    private static Collection<String> findDerivedFrom(Map<String, Collection<String>> propsDeps, String derivedProp) {
-        Set<String> names = new HashSet<String>();
-        for (Map.Entry<String, Collection<String>> e : propsDeps.entrySet()) {
-            if (e.getValue().contains(derivedProp)) {
-                names.add(e.getKey());
-            }
-        }
-        return names;
-    }
-    
-    private Prprt[] createProps(Element e, Property[] arr) {
-        Prprt[] ret = Prprt.wrap(processingEnv, e, arr);
-        Prprt[] prev = verify.put(e, ret);
-        if (prev != null) {
-            error("Two sets of properties for ", e);
-        }
-        return ret;
-    }
-    
-    private static String strip(String s) {
-        int indx = s.indexOf("__");
-        if (indx >= 0) {
-            return s.substring(0, indx);
-        } else {
-            return s;
-        }
-    }
-
-    private String findDataSpecified(ExecutableElement e, OnReceive onR) {
-        try {
-            return onR.data().getName();
-        } catch (MirroredTypeException ex) {
-            final TypeMirror tm = ex.getTypeMirror();
-            String name;
-            final Element te = processingEnv.getTypeUtils().asElement(tm);
-            if (te.getKind() == ElementKind.CLASS && tm.getKind() == TypeKind.ERROR) {
-                name = te.getSimpleName().toString();
-            } else {
-                name = tm.toString();
-            }
-            return "java.lang.Object".equals(name) ? null : name;
-        } catch (Exception ex) {
-            // fallback
-        }
-        
-        AnnotationMirror found = null;
-        for (AnnotationMirror am : e.getAnnotationMirrors()) {
-            if (am.getAnnotationType().toString().equals(OnReceive.class.getName())) {
-                found = am;
-            }
-        }
-        if (found == null) {
-            return null;
-        }
-        
-        for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : found.getElementValues().entrySet()) {
-            ExecutableElement ee = entry.getKey();
-            AnnotationValue av = entry.getValue();
-            if (ee.getSimpleName().contentEquals("data")) {
-                List<? extends Object> values = getAnnoValues(processingEnv, e, found);
-                for (Object v : values) {
-                    String sv = v.toString();
-                    if (sv.startsWith("data = ") && sv.endsWith(".class")) {
-                        return sv.substring(7, sv.length() - 6);
-                    }
-                }
-                return "error";
-            }
-        }
-        return null;
-    }
-
-    static List<? extends Object> getAnnoValues(ProcessingEnvironment pe, Element e, AnnotationMirror am) {
-        try {
-            Class<?> trees = Class.forName("com.sun.tools.javac.api.JavacTrees");
-            Method m = trees.getMethod("instance", ProcessingEnvironment.class);
-            Object instance = m.invoke(null, pe);
-            m = instance.getClass().getMethod("getPath", Element.class, AnnotationMirror.class);
-            Object path = m.invoke(instance, e, am);
-            m = path.getClass().getMethod("getLeaf");
-            Object leaf = m.invoke(path);
-            m = leaf.getClass().getMethod("getArguments");
-            return (List) m.invoke(leaf);
-        } catch (Exception ex) {
-            return Collections.emptyList();
-        }
-    }
-
-    private static class Prprt {
-        private final Element e;
-        private final AnnotationMirror tm;
-        private final Property p;
-
-        public Prprt(Element e, AnnotationMirror tm, Property p) {
-            this.e = e;
-            this.tm = tm;
-            this.p = p;
-        }
-        
-        String name() {
-            return p.name();
-        }
-        
-        boolean array() {
-            return p.array();
-        }
-
-        String typeName(ProcessingEnvironment env) {
-            RuntimeException ex;
-            try {
-                return p.type().getName();
-            } catch (IncompleteAnnotationException e) {
-                ex = e;
-            } catch (AnnotationTypeMismatchException e) {
-                ex = e;
-            }
-            for (Object v : getAnnoValues(env, e, tm)) {
-                String s = v.toString().replace(" ", "");
-                if (s.startsWith("type=") && s.endsWith(".class")) {
-                    return s.substring(5, s.length() - 6);
-                }
-            }
-            throw ex;
-        }
-        
-        
-        static Prprt[] wrap(ProcessingEnvironment pe, Element e, Property[] arr) {
-            if (arr.length == 0) {
-                return new Prprt[0];
-            }
-            
-            if (e.getKind() != ElementKind.CLASS) {
-                throw new IllegalStateException("" + e.getKind());
-            }
-            TypeElement te = (TypeElement)e;
-            List<? extends AnnotationValue> val = null;
-            for (AnnotationMirror an : te.getAnnotationMirrors()) {
-                for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : an.getElementValues().entrySet()) {
-                    if (entry.getKey().getSimpleName().contentEquals("properties")) {
-                        val = (List)entry.getValue().getValue();
-                        break;
-                    }
-                }
-            }
-            if (val == null || val.size() != arr.length) {
-                pe.getMessager().printMessage(Diagnostic.Kind.ERROR, "" + val, e);
-                return new Prprt[0];
-            }
-            Prprt[] ret = new Prprt[arr.length];
-            BIG: for (int i = 0; i < ret.length; i++) {
-                AnnotationMirror am = (AnnotationMirror)val.get(i).getValue();
-                ret[i] = new Prprt(e, am, arr[i]);
-                
-            }
-            return ret;
-        }
-    }
-
-    @Override
-    public Iterable<? extends Completion> getCompletions(Element element, AnnotationMirror annotation, ExecutableElement member, String userText) {
-        final Level l = Level.FINE;
-        LOG.log(l, " element: {0}", element);
-        LOG.log(l, " annotation: {0}", annotation);
-        LOG.log(l, " member: {0}", member);
-        LOG.log(l, " userText: {0}", userText);
-        LOG.log(l, "str: {0}", annotation.getAnnotationType().toString());
-        if (annotation.getAnnotationType().toString().equals(OnReceive.class.getName())) {
-            if (member.getSimpleName().contentEquals("method")) {
-                return Arrays.asList(
-                    methodOf("GET"),
-                    methodOf("POST"),
-                    methodOf("PUT"),
-                    methodOf("DELETE"),
-                    methodOf("HEAD"),
-                    methodOf("WebSocket")
-                );
-            }
-        }
-        
-        return super.getCompletions(element, annotation, member, userText);
-    }
-    
-    private static final Completion methodOf(String method) {
-        ResourceBundle rb = ResourceBundle.getBundle("org.apidesign.html.json.impl.Bundle");
-        return Completions.of('"' + method + '"', rb.getString("MSG_Completion_" + method));
-    }
-    
-    private boolean findOnError(ExecutableElement errElem, TypeElement te, String name, String className) {
-        String err = null;
-        METHODS:
-        for (Element e : te.getEnclosedElements()) {
-            if (e.getKind() != ElementKind.METHOD) {
-                continue;
-            }
-            if (!e.getSimpleName().contentEquals(name)) {
-                continue;
-            }
-            if (!e.getModifiers().contains(Modifier.STATIC)) {
-                errElem = (ExecutableElement) e;
-                err = "Would have to be static";
-                continue;
-            }
-            ExecutableElement ee = (ExecutableElement) e;
-            TypeMirror excType = processingEnv.getElementUtils().getTypeElement(Exception.class.getName()).asType();
-            final List<? extends VariableElement> params = ee.getParameters();
-            boolean error = false;
-            if (params.size() != 2) {
-                error = true;
-            } else {
-                String firstType = params.get(0).asType().toString();
-                int lastDot = firstType.lastIndexOf('.');
-                if (lastDot != -1) {
-                    firstType = firstType.substring(lastDot + 1);
-                }
-                if (!firstType.equals(className)) {
-                    error = true;
-                }
-                if (!processingEnv.getTypeUtils().isAssignable(excType, params.get(1).asType())) {
-                    error = true;
-                }
-            }
-            if (error) {
-                errElem = (ExecutableElement) e;
-                err = "Error method first argument needs to be " + className + " and second Exception";
-                continue;
-            }
-            return true;
-        }
-        if (err == null) {
-            err = "Cannot find " + name + "(" + className + ", Exception) method in this class";
-        }
-        error(err, errElem);
-        return false;
-    }
-    
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/apidesign/html/json/impl/PropertyBindingAccessor.java
--- a/json/src/main/java/org/apidesign/html/json/impl/PropertyBindingAccessor.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-import net.java.html.BrwsrCtx;
-import org.apidesign.html.json.spi.FunctionBinding;
-import org.apidesign.html.json.spi.JSONCall;
-import org.apidesign.html.json.spi.PropertyBinding;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public abstract class PropertyBindingAccessor {
-    private static PropertyBindingAccessor DEFAULT;
-
-    protected PropertyBindingAccessor() {
-        if (DEFAULT != null) throw new IllegalStateException();
-        DEFAULT = this;
-    }
-    
-    static {
-        JSON.initClass(PropertyBinding.class);
-    }
-
-    protected abstract <M> PropertyBinding newBinding(PBData<M> d);
-    protected abstract <M> FunctionBinding newFunction(FBData<M> d);
-    protected abstract JSONCall newCall(
-        BrwsrCtx ctx, RcvrJSON callback, String urlBefore, String urlAfter,
-        String method, Object data
-    );
-
-    
-    static <M> PropertyBinding create(PBData<M> d) {
-        return DEFAULT.newBinding(d);
-    }
-    static <M> FunctionBinding createFunction(FBData<M> d) {
-        return DEFAULT.newFunction(d);
-    }
-    static JSONCall createCall(
-        BrwsrCtx ctx, RcvrJSON callback, String urlBefore, String urlAfter, 
-        String method, Object data
-    ) {
-        return DEFAULT.newCall(ctx, callback, urlBefore, urlAfter, method, data);
-    }
-
-    public static final class PBData<M> {
-        public final String name;
-        public final boolean readOnly;
-        private final M model;
-        private final SetAndGet<M> access;
-        private final Bindings<?> bindings;
-
-        public PBData(Bindings<?> bindings, String name, M model, SetAndGet<M> access, boolean readOnly) {
-            this.bindings = bindings;
-            this.name = name;
-            this.model = model;
-            this.access = access;
-            this.readOnly = readOnly;
-        }
-
-        public void setValue(Object v) {
-            access.setValue(model, v);
-        }
-
-        public Object getValue() {
-            return access.getValue(model);
-        }
-
-        public boolean isReadOnly() {
-            return readOnly;
-        }
-
-        public Bindings getBindings() {
-            return bindings;
-        }
-    } // end of PBData
-    
-    public static final class FBData<M> {
-        public final String name;
-        private final M model;
-        private final Callback<M> access;
-
-        public FBData(String name, M model, Callback<M> access) {
-            this.name = name;
-            this.model = model;
-            this.access = access;
-        }
-
-
-        public void call(Object data, Object ev) {
-            access.call(model, data, ev);
-        }
-    } // end of FBData
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/apidesign/html/json/impl/RcvrJSON.java
--- a/json/src/main/java/org/apidesign/html/json/impl/RcvrJSON.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-import net.java.html.BrwsrCtx;
-
-/** Super type for those who wish to receive JSON messages.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public abstract class RcvrJSON {
-    protected void onOpen(MsgEvnt msg) {}
-    protected abstract void onMessage(MsgEvnt msg);
-    protected void onClose(MsgEvnt msg) {}
-    protected abstract void onError(MsgEvnt msg);
-    
-    public abstract static class MsgEvnt {
-        MsgEvnt() {
-        }
-        
-        public Throwable getError() {
-            return null;
-        }
-        
-        public final Exception getException() {
-            Throwable t = getError();
-            if (t instanceof Exception) {
-                return (Exception)t;
-            }
-            if (t == null) {
-                return null;
-            }
-            return new Exception(t);
-        }
-        
-        public int dataSize() {
-            return -1;
-        }
-        
-        public <Data> void dataRead(BrwsrCtx ctx, Class<? extends Data> type, Data[] fillTheArray) {
-        }
-
-        public abstract void dispatch(RcvrJSON r);
-        
-        public static MsgEvnt createError(final Throwable t) {
-            return new MsgEvnt() {
-                @Override
-                public Throwable getError() {
-                    return t;
-                }
-
-                @Override
-                public void dispatch(RcvrJSON r) {
-                    r.onError(this);
-                }
-            };
-        }
-        
-        public static MsgEvnt createMessage(final Object value) {
-            return new MsgEvnt() {
-                @Override
-                public int dataSize() {
-                    if (value instanceof Object[]) {
-                        return ((Object[])value).length;
-                    } else {
-                        return 1;
-                    }
-                }
-                
-                @Override
-                public <Data> void dataRead(BrwsrCtx context, Class<? extends Data> type, Data[] arr) {
-                    if (value instanceof Object[]) {
-                        Object[] data = ((Object[]) value);
-                        for (int i = 0; i < data.length && i < arr.length; i++) {
-                            arr[i] = org.apidesign.html.json.impl.JSON.read(context, type, data[i]);
-                        }
-                    } else {
-                        if (arr.length > 0) {
-                            arr[0] = org.apidesign.html.json.impl.JSON.read(context, type, value);
-                        }
-                    }
-                }
-                
-                @Override
-                public void dispatch(RcvrJSON r) {
-                    r.onMessage(this);
-                }
-            };
-        }
-        
-        public static MsgEvnt createOpen() {
-            return new MsgEvnt() {
-                @Override
-                public void dispatch(RcvrJSON r) {
-                    r.onOpen(this);
-                }
-            };
-        }
-
-        public static MsgEvnt createClose() {
-            return new MsgEvnt() {
-                @Override
-                public void dispatch(RcvrJSON r) {
-                    r.onClose(this);
-                }
-            };
-        }
-    } // end MsgEvnt
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/apidesign/html/json/impl/SetAndGet.java
--- a/json/src/main/java/org/apidesign/html/json/impl/SetAndGet.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-import org.apidesign.html.json.spi.PropertyBinding;
-
-/** A way to implement a {@link PropertyBinding}.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public interface SetAndGet<Data> {
-    public void setValue(Data data, Object value);
-    public Object getValue(Data data);
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/apidesign/html/json/impl/WrapperObject.java
--- a/json/src/main/java/org/apidesign/html/json/impl/WrapperObject.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-import java.util.Collection;
-import org.apidesign.html.json.impl.PropertyBindingAccessor.PBData;
-
-/** A way to extract real object from a model classes.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class WrapperObject {
-    private Object ko;
-    
-    private WrapperObject() {
-    }
-    
-    public void setRealObject(Object ko) {
-        this.ko = ko;
-    }
-    
-    public static Object find(Object object) {
-        return find(object, null);
-    }
-    
-    public static Object find(Object object, Bindings model) {
-        if (object == null) {
-            return null;
-        }
-        
-        if (object instanceof JSONList) {
-            return ((JSONList<?>)object).koData();
-        }
-        if (object instanceof Collection) {
-            return JSONList.koData((Collection<?>)object, model);
-        }
-        
-        WrapperObject ro = new WrapperObject();
-        object.equals(ro);
-        return ro.ko;
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/apidesign/html/json/spi/FunctionBinding.java
--- a/json/src/main/java/org/apidesign/html/json/spi/FunctionBinding.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/json/src/main/java/org/apidesign/html/json/spi/FunctionBinding.java	Mon Dec 16 16:59:43 2013 +0100
@@ -44,7 +44,7 @@
 
 import net.java.html.json.Function;
 import net.java.html.json.Model;
-import org.apidesign.html.json.impl.PropertyBindingAccessor.FBData;
+import org.netbeans.html.json.impl.PropertyBindingAccessor.FBData;
 
 /** Describes a function provided by the {@link Model} and 
  * annotated by {@link Function} annotation.
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/apidesign/html/json/spi/JSONCall.java
--- a/json/src/main/java/org/apidesign/html/json/spi/JSONCall.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/json/src/main/java/org/apidesign/html/json/spi/JSONCall.java	Mon Dec 16 16:59:43 2013 +0100
@@ -45,8 +45,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import net.java.html.BrwsrCtx;
-import org.apidesign.html.json.impl.JSON;
-import org.apidesign.html.json.impl.RcvrJSON;
+import org.netbeans.html.json.impl.JSON;
+import org.netbeans.html.json.impl.RcvrJSON;
 
 /** Description of a JSON call request that is supposed to be processed
  * by {@link Transfer#loadJSON(org.apidesign.html.json.spi.JSONCall)} implementors.
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/apidesign/html/json/spi/PropertyBinding.java
--- a/json/src/main/java/org/apidesign/html/json/spi/PropertyBinding.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/json/src/main/java/org/apidesign/html/json/spi/PropertyBinding.java	Mon Dec 16 16:59:43 2013 +0100
@@ -43,10 +43,10 @@
 package org.apidesign.html.json.spi;
 
 import net.java.html.BrwsrCtx;
-import org.apidesign.html.json.impl.PropertyBindingAccessor;
-import org.apidesign.html.json.impl.PropertyBindingAccessor.PBData;
-import org.apidesign.html.json.impl.RcvrJSON;
-import org.apidesign.html.json.impl.WrapperObject;
+import org.netbeans.html.json.impl.PropertyBindingAccessor;
+import org.netbeans.html.json.impl.PropertyBindingAccessor.PBData;
+import org.netbeans.html.json.impl.RcvrJSON;
+import org.netbeans.html.json.impl.WrapperObject;
 
 /** Describes a property when one is asked to 
  * bind it 
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/netbeans/html/json/impl/Bindings.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/main/java/org/netbeans/html/json/impl/Bindings.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,113 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+import org.apidesign.html.json.spi.PropertyBinding;
+import net.java.html.BrwsrCtx;
+import org.netbeans.html.json.impl.PropertyBindingAccessor.FBData;
+import org.netbeans.html.json.impl.PropertyBindingAccessor.PBData;
+import org.apidesign.html.json.spi.FunctionBinding;
+import org.apidesign.html.json.spi.Technology;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class Bindings<Data> {
+    private Data data;
+    private final Technology<Data> bp;
+
+    private Bindings(Technology<Data> bp) {
+        this.bp = bp;
+    }
+    
+    public <M> PropertyBinding registerProperty(String propName, M model, SetAndGet<M> access, boolean readOnly) {
+        return PropertyBindingAccessor.create(new PBData<M>(this, propName, model, access, readOnly));
+    }
+
+    public <M> FunctionBinding registerFunction(String name, M model, Callback<M> access) {
+        return PropertyBindingAccessor.createFunction(new FBData<M>(name, model, access));
+    }
+    
+    public static Bindings<?> apply(BrwsrCtx c, Object model) {
+        Technology<?> bp = JSON.findTechnology(c);
+        return apply(bp);
+    }
+    
+    private static <Data> Bindings<Data> apply(Technology<Data> bp) {
+        return new Bindings<Data>(bp);
+    }
+    
+    public final void finish(Object model, PropertyBinding[] propArr, FunctionBinding[] funcArr) {
+        assert data == null;
+        if (bp instanceof Technology.BatchInit) {
+            Technology.BatchInit<Data> bi = (Technology.BatchInit<Data>)bp;
+            data = bi.wrapModel(model, propArr, funcArr);
+        } else {
+            data = bp.wrapModel(model);
+            for (PropertyBinding b : propArr) {
+                bp.bind(b, model, data);
+            }
+            for (FunctionBinding b : funcArr) {
+                bp.expose(b, model, data);
+            }
+        }
+    }
+    
+    
+    public Data koData() {
+        return data;
+    }
+
+    public void valueHasMutated(String firstName) {
+        bp.valueHasMutated(data, firstName);
+    }
+    
+    public void applyBindings() {
+        bp.applyBindings(data);
+    }
+
+    Object wrapArray(Object[] arr) {
+        return bp.wrapArray(arr);
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/netbeans/html/json/impl/Callback.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/main/java/org/netbeans/html/json/impl/Callback.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,51 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public interface Callback<Data> {
+    public void call(Data model, Object data, Object ev);
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/netbeans/html/json/impl/FromJSON.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/main/java/org/netbeans/html/json/impl/FromJSON.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,55 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+import net.java.html.BrwsrCtx;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public interface FromJSON<Data> {
+    public Class<Data> factoryFor();
+    public Data read(BrwsrCtx c, Object d);
+    public Data cloneTo(Object d, BrwsrCtx c);
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/netbeans/html/json/impl/JSON.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/main/java/org/netbeans/html/json/impl/JSON.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,474 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import net.java.html.BrwsrCtx;
+import org.apidesign.html.context.spi.Contexts;
+import org.apidesign.html.json.spi.FunctionBinding;
+import org.apidesign.html.json.spi.JSONCall;
+import org.apidesign.html.json.spi.PropertyBinding;
+import org.apidesign.html.json.spi.Technology;
+import org.apidesign.html.json.spi.Transfer;
+import org.apidesign.html.json.spi.WSTransfer;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class JSON {
+    private JSON() {
+    }
+
+    static Technology<?> findTechnology(BrwsrCtx c) {
+        Technology<?> t = Contexts.find(c, Technology.class);
+        return t == null ? EmptyTech.EMPTY : t;
+    }
+
+    static Transfer findTransfer(BrwsrCtx c) {
+        Transfer t = Contexts.find(c, Transfer.class);
+        return t == null ? EmptyTech.EMPTY : t;
+    }
+
+    static WSTransfer<?> findWSTransfer(BrwsrCtx c) {
+        WSTransfer<?> t = Contexts.find(c, WSTransfer.class);
+        return t == null ? EmptyTech.EMPTY : t;
+    }
+    
+    public static void runInBrowser(BrwsrCtx c, Runnable runnable) {
+        findTechnology(c).runSafe(runnable);
+    }
+    
+    public static void extract(BrwsrCtx c, Object value, String[] props, Object[] values) {
+        Transfer t = findTransfer(c);
+        t.extract(value, props, values);
+    }
+    
+    private static Object getProperty(BrwsrCtx c, Object obj, String prop) {
+        if (prop == null) return obj;
+        
+        String[] arr = { prop };
+        Object[] val = { null };
+        extract(c, obj, arr, val);
+        return val[0];
+    }
+
+    public static Object toJSON(Object value) {
+        if (value == null) {
+            return "null";
+        }
+        if (value instanceof Enum) {
+            value = value.toString();
+        }
+        if (value instanceof String) {
+            String s = (String)value;
+            int len = s.length();
+            StringBuilder sb = new StringBuilder(len + 10);
+            sb.append('"');
+            for (int i = 0; i < len; i++) {
+                char ch = s.charAt(i);
+                switch (ch) {
+                    case '\"': sb.append("\\\""); break;
+                    case '\n': sb.append("\\n"); break;
+                    case '\r': sb.append("\\r"); break;
+                    case '\t': sb.append("\\t"); break;
+                    case '\\': sb.append("\\\\"); break;
+                    default: sb.append(ch);
+                }
+            }
+            sb.append('"');
+            return sb.toString();
+        }
+        return value.toString();
+    }
+
+    public static String toString(BrwsrCtx c, Object obj, String prop) {
+        obj = getProperty(c, obj, prop);
+        return obj instanceof String ? (String)obj : null;
+    }
+    public static Number toNumber(BrwsrCtx c, Object obj, String prop) {
+        obj = getProperty(c, obj, prop);
+        if (!(obj instanceof Number)) {
+            obj = Double.NaN;
+        }
+        return (Number)obj;
+    }
+    public static <M> M toModel(BrwsrCtx c, Class<M> aClass, Object data, Object object) {
+        Technology<?> t = findTechnology(c);
+        Object o = t.toModel(aClass, data);
+        return aClass.cast(o);
+    }
+    
+    public static boolean isSame(int a, int b) {
+        return a == b;
+    }
+    
+    public static boolean isSame(double a, double b) {
+        return a == b;
+    }
+    
+    public static boolean isSame(Object a, Object b) {
+        if (a == b) {
+            return true;
+        }
+        if (a == null || b == null) {
+            return false;
+        }
+        return a.equals(b);
+    }
+    
+    public static int hashPlus(Object o, int h) {
+        return o == null ? h : h ^ o.hashCode();
+    }
+
+    public static <T> T extractValue(Class<T> type, Object val) {
+        if (Number.class.isAssignableFrom(type)) {
+            val = numberValue(val);
+        }
+        if (Boolean.class == type) {
+            val = boolValue(val);
+        }
+        if (String.class == type) {
+            val = stringValue(val);
+        }
+        if (Character.class == type) {
+            val = charValue(val);
+        }
+        if (Integer.class == type) {
+            val = val instanceof Number ? ((Number)val).intValue() : 0;
+        }
+        if (Long.class == type) {
+            val = val instanceof Number  ? ((Number)val).longValue() : 0;
+        }
+        if (Short.class == type) {
+            val = val instanceof Number ? ((Number)val).shortValue() : 0;
+        }
+        if (Byte.class == type) {
+            val = val instanceof Number ? ((Number)val).byteValue() : 0;
+        }        
+        if (Double.class == type) {
+            val = val instanceof Number ? ((Number)val).doubleValue() : Double.NaN;
+        }
+        if (Float.class == type) {
+            val = val instanceof Number ? ((Number)val).floatValue() : Float.NaN;
+        }
+        return type.cast(val);
+    }
+    
+    protected static boolean isNumeric(Object val) {
+        return ((val instanceof Integer) || (val instanceof Long) || (val instanceof Short) || (val instanceof Byte));
+    }
+    
+    public static String stringValue(Object val) {
+        if (val instanceof Boolean) {
+            return ((Boolean)val ? "true" : "false");
+        }
+        if (isNumeric(val)) {
+            return Long.toString(((Number)val).longValue());
+        }
+        if (val instanceof Float) {
+            return Float.toString((Float)val);
+        }
+        if (val instanceof Double) {
+            return Double.toString((Double)val);
+        }
+        return (String)val;
+    }
+
+    public static Number numberValue(Object val) {
+        if (val instanceof String) {
+            try {
+                return Double.valueOf((String)val);
+            } catch (NumberFormatException ex) {
+                return Double.NaN;
+            }
+        }
+        if (val instanceof Boolean) {
+            return (Boolean)val ? 1 : 0;
+        }
+        return (Number)val;
+    }
+
+    public static Character charValue(Object val) {
+        if (val instanceof Number) {
+            return Character.toChars(numberValue(val).intValue())[0];
+        }
+        if (val instanceof Boolean) {
+            return (Boolean)val ? (char)1 : (char)0;
+        }
+        if (val instanceof String) {
+            String s = (String)val;
+            return s.isEmpty() ? (char)0 : s.charAt(0);
+        }
+        return (Character)val;
+    }
+    
+    public static Boolean boolValue(Object val) {
+        if (val instanceof String) {
+            return Boolean.parseBoolean((String)val);
+        }
+        if (val instanceof Number) {
+            return numberValue(val).doubleValue() != 0.0;
+        }
+    
+        return Boolean.TRUE.equals(val);
+    }
+    
+    public static void loadJSON(
+        BrwsrCtx c, RcvrJSON callback,
+        String urlBefore, String urlAfter, String method,
+        Object data
+    ) {
+        JSONCall call = PropertyBindingAccessor.createCall(c, callback, urlBefore, urlAfter, method, data);
+        Transfer t = findTransfer(c);
+        t.loadJSON(call);
+    }
+    public static WS openWS(
+        BrwsrCtx c, RcvrJSON r, String url, Object data
+    ) {
+        WS ws = WSImpl.create(findWSTransfer(c), r);
+        ws.send(c, url, data);
+        return ws;
+    }
+    
+    public static abstract class WS {
+        private WS() {
+        }
+        
+        public abstract void send(BrwsrCtx ctx, String url, Object model);
+    }
+    
+    private static final class WSImpl<Socket> extends WS {
+
+        private final WSTransfer<Socket> trans;
+        private final RcvrJSON rcvr;
+        private Socket socket;
+        private String prevURL;
+
+        private WSImpl(WSTransfer<Socket> trans, RcvrJSON rcvr) {
+            this.trans = trans;
+            this.rcvr = rcvr;
+        }
+        
+        static <Socket> WS create(WSTransfer<Socket> t, RcvrJSON r) {
+            return new WSImpl<Socket>(t, r);
+        }
+
+        @Override
+        public void send(BrwsrCtx ctx, String url, Object data) {
+            Socket s = socket;
+            if (s == null) {
+                if (data != null) {
+                    throw new IllegalStateException("WebSocket is not opened yet. Call with null data, was: " + data);
+                }
+                JSONCall call = PropertyBindingAccessor.createCall(ctx, rcvr, url, null, "WebSocket", null);
+                socket = trans.open(url, call);
+                prevURL = url;
+                return;
+            }
+            if (data == null) {
+                trans.close(s);
+                socket = null;
+                return;
+            }
+            if (!prevURL.equals(url)) {
+                throw new IllegalStateException(
+                    "Can't call to different URL " + url + " was: " + prevURL + "!"
+                    + " Close the socket by calling it will null data first!"
+                );
+            }
+            JSONCall call = PropertyBindingAccessor.createCall(ctx, rcvr, prevURL, null, "WebSocket", data);
+            trans.send(s, call);
+        }
+        
+    }
+    
+    private static final Map<Class,FromJSON<?>> froms;
+    static {
+        Map<Class,FromJSON<?>> m = new HashMap<Class,FromJSON<?>>();
+        froms = m;
+    }
+    public static void register(FromJSON<?> from) {
+        froms.put(from.factoryFor(), from);
+    }
+    
+    public static boolean isModel(Class<?> clazz) {
+        return findFrom(clazz) != null; 
+    }
+    
+    private static FromJSON<?> findFrom(Class<?> clazz) {
+        for (int i = 0; i < 2; i++) {
+            FromJSON<?> from = froms.get(clazz);
+            if (from == null) {
+                initClass(clazz);
+            } else {
+                return from;
+            }
+        }
+        return null;
+    }
+    
+    public static <Model> Model bindTo(Model model, BrwsrCtx c) {
+        FromJSON<?> from = findFrom(model.getClass());
+        if (from == null) {
+            throw new IllegalArgumentException();
+        }
+        return (Model) from.cloneTo(model, c);
+    }
+    
+    public static <T> T readStream(BrwsrCtx c, Class<T> modelClazz, InputStream data) 
+    throws IOException {
+        Transfer tr = findTransfer(c);
+        return read(c, modelClazz, tr.toJSON((InputStream)data));
+    }
+    public static <T> T read(BrwsrCtx c, Class<T> modelClazz, Object data) {
+        if (data == null) {
+            return null;
+        }
+        if (modelClazz == String.class) {
+            return modelClazz.cast(data.toString());
+        }
+        for (int i = 0; i < 2; i++) {
+            FromJSON<?> from = froms.get(modelClazz);
+            if (from == null) {
+                initClass(modelClazz);
+            } else {
+                return modelClazz.cast(from.read(c, data));
+            }
+        }
+        throw new NullPointerException();
+    }
+    static void initClass(Class<?> modelClazz) {
+        try {
+            // try to resolve the class
+            ClassLoader l;
+            try {
+                l = modelClazz.getClassLoader();
+            } catch (SecurityException ex) {
+                l = null;
+            }
+            if (l != null) {
+                Class.forName(modelClazz.getName(), true, l);
+            }
+            modelClazz.newInstance();
+        } catch (Exception ex) {
+            // ignore and try again
+        }
+    }
+    
+    private static final class EmptyTech
+    implements Technology<Object>, Transfer, WSTransfer<Void> {
+        private static final EmptyTech EMPTY = new EmptyTech();
+
+        @Override
+        public Object wrapModel(Object model) {
+            return model;
+        }
+
+        @Override
+        public void valueHasMutated(Object data, String propertyName) {
+        }
+
+        @Override
+        public void bind(PropertyBinding b, Object model, Object data) {
+        }
+
+        @Override
+        public void expose(FunctionBinding fb, Object model, Object d) {
+        }
+
+        @Override
+        public void applyBindings(Object data) {
+        }
+
+        @Override
+        public Object wrapArray(Object[] arr) {
+            return arr;
+        }
+
+        @Override
+        public void extract(Object obj, String[] props, Object[] values) {
+            for (int i = 0; i < values.length; i++) {
+                values[i] = null;
+            }
+        }
+
+        @Override
+        public void loadJSON(JSONCall call) {
+            call.notifyError(new UnsupportedOperationException());
+        }
+
+        @Override
+        public <M> M toModel(Class<M> modelClass, Object data) {
+            return modelClass.cast(data);
+        }
+
+        @Override
+        public Object toJSON(InputStream is) throws IOException {
+            throw new IOException("Not supported");
+        }
+
+        @Override
+        public synchronized void runSafe(Runnable r) {
+            r.run();
+        }
+
+        @Override
+        public Void open(String url, JSONCall onReply) {
+            onReply.notifyError(new UnsupportedOperationException("WebSockets not supported!"));
+            return null;
+        }
+
+        @Override
+        public void send(Void socket, JSONCall data) {
+        }
+
+        @Override
+        public void close(Void socket) {
+        }
+    }
+    
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/netbeans/html/json/impl/JSONList.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/main/java/org/netbeans/html/json/impl/JSONList.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,236 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import net.java.html.BrwsrCtx;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class JSONList<T> extends ArrayList<T> {
+    private final String name;
+    private final String[] deps;
+    private Bindings[] model;
+    private Runnable onchange;
+
+    public JSONList(Bindings[] model, String name, String... deps) {
+        assert model.length == 1;
+        this.model = model;
+        this.name = name;
+        this.deps = deps;
+    }
+    
+    public void init(T... values) {
+        if (values == null || values.length == 0) {
+            return;
+        }
+        if (this.model[0] != null || !isEmpty()) {
+            throw new IllegalStateException();
+        }
+        super.addAll(Arrays.asList(values));
+    }
+    
+    public void init(Object values) {
+        int len;
+        if (values == null || (len = Array.getLength(values)) == 0) {
+            return;
+        }
+        if (this.model[0] != null || !isEmpty()) {
+            throw new IllegalStateException();
+        }
+        for (int i = 0; i < len; i++) {
+            Object data = Array.get(values, i);
+            super.add((T)data);
+        }
+    }
+    
+    public JSONList<T> onChange(Runnable r) {
+        if (this.onchange != null) {
+            throw new IllegalStateException();
+        }
+        this.onchange = r;
+        return this;
+    }
+
+    @Override
+    public boolean add(T e) {
+        boolean ret = super.add(e);
+        notifyChange();
+        return ret;
+    }
+
+    @Override
+    public boolean addAll(Collection<? extends T> c) {
+        boolean ret = super.addAll(c);
+        notifyChange();
+        return ret;
+    }
+
+    @Override
+    public boolean addAll(int index, Collection<? extends T> c) {
+        boolean ret = super.addAll(index, c);
+        notifyChange();
+        return ret;
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        boolean ret = super.remove(o);
+        notifyChange();
+        return ret;
+    }
+
+    @Override
+    public void clear() {
+        super.clear();
+        notifyChange();
+    }
+
+    @Override
+    public boolean removeAll(Collection<?> c) {
+        boolean ret = super.removeAll(c);
+        notifyChange();
+        return ret;
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> c) {
+        boolean ret = super.retainAll(c);
+        notifyChange();
+        return ret;
+    }
+
+    @Override
+    public T set(int index, T element) {
+        T ret = super.set(index, element);
+        notifyChange();
+        return ret;
+    }
+
+    @Override
+    public void add(int index, T element) {
+        super.add(index, element);
+        notifyChange();
+    }
+
+    @Override
+    public T remove(int index) {
+        T ret = super.remove(index);
+        notifyChange();
+        return ret;
+    }
+
+    @Override
+    public String toString() {
+        Iterator<T> it = iterator();
+        if (!it.hasNext()) {
+            return "[]";
+        }
+        String sep = "";
+        StringBuilder sb = new StringBuilder();
+        sb.append('[');
+        while (it.hasNext()) {
+            T t = it.next();
+            sb.append(sep);
+            sb.append(JSON.toJSON(t));
+            sep = ",";
+        }
+        sb.append(']');
+        return sb.toString();
+    }
+
+    private void notifyChange() {
+        Bindings m = model[0];
+        if (m != null) {
+            m.valueHasMutated(name);
+            for (String dependant : deps) {
+                m.valueHasMutated(dependant);
+            }
+            Runnable r = onchange;
+            if (r != null) {
+                r.run();
+            }
+        }
+    }
+    
+    public void cloneAll(BrwsrCtx c, Collection<T> other) {
+        Boolean isModel = null;
+        for (T t : other) {
+            if (isModel == null) {
+                isModel = JSON.isModel(t.getClass());
+            }
+            if (isModel) {
+                add(JSON.bindTo(t, c));
+            } else {
+                add(t);
+            }
+        }
+    }
+
+    @Override
+    public JSONList clone() {
+        throw new UnsupportedOperationException();
+    }
+
+    static final Object koData(Collection<?> c, Bindings m) {
+        Object[] arr = c.toArray(new Object[c.size()]);
+        for (int i = 0; i < arr.length; i++) {
+            Object r = WrapperObject.find(arr[i], m);
+            if (r != null) {
+                arr[i] = r;
+            }
+        }
+        return m.wrapArray(arr);
+    }
+
+    final Object koData() {
+        return koData(this, model[0]);
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,1767 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.lang.annotation.AnnotationTypeMismatchException;
+import java.lang.annotation.IncompleteAnnotationException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.Completion;
+import javax.annotation.processing.Completions;
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.annotation.processing.Processor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.ArrayType;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.MirroredTypeException;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Elements;
+import javax.lang.model.util.Types;
+import javax.tools.Diagnostic;
+import javax.tools.FileObject;
+import net.java.html.json.ComputedProperty;
+import net.java.html.json.Model;
+import net.java.html.json.Function;
+import net.java.html.json.ModelOperation;
+import net.java.html.json.OnPropertyChange;
+import net.java.html.json.OnReceive;
+import net.java.html.json.Property;
+import org.openide.util.lookup.ServiceProvider;
+
+/** Annotation processor to process {@link Model @Model} annotations and
+ * generate appropriate model classes.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@ServiceProvider(service=Processor.class)
+@SupportedSourceVersion(SourceVersion.RELEASE_6)
+@SupportedAnnotationTypes({
+    "net.java.html.json.Model",
+    "net.java.html.json.ModelOperation",
+    "net.java.html.json.Function",
+    "net.java.html.json.OnReceive",
+    "net.java.html.json.OnPropertyChange",
+    "net.java.html.json.ComputedProperty",
+    "net.java.html.json.Property"
+})
+public final class ModelProcessor extends AbstractProcessor {
+    private static final Logger LOG = Logger.getLogger(ModelProcessor.class.getName());
+    private final Map<Element,String> models = new WeakHashMap<Element,String>();
+    private final Map<Element,Prprt[]> verify = new WeakHashMap<Element,Prprt[]>();
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        boolean ok = true;
+        for (Element e : roundEnv.getElementsAnnotatedWith(Model.class)) {
+            if (!processModel(e)) {
+                ok = false;
+            }
+        }
+        if (roundEnv.processingOver()) {
+            models.clear();
+            for (Map.Entry<Element, Prprt[]> entry : verify.entrySet()) {
+                TypeElement te = (TypeElement)entry.getKey();
+                String fqn = processingEnv.getElementUtils().getBinaryName(te).toString();
+                Element finalElem = processingEnv.getElementUtils().getTypeElement(fqn);
+                if (finalElem == null) {
+                    continue;
+                }
+                Prprt[] props;
+                Model m = finalElem.getAnnotation(Model.class);
+                if (m == null) {
+                    continue;
+                }
+                props = Prprt.wrap(processingEnv, finalElem, m.properties());
+                for (Prprt p : props) {
+                    boolean[] isModel = { false };
+                    boolean[] isEnum = { false };
+                    boolean[] isPrimitive = { false };
+                    String t = checkType(p, isModel, isEnum, isPrimitive);
+                    if (isEnum[0]) {
+                        continue;
+                    }
+                    if (isPrimitive[0]) {
+                        continue;
+                    }
+                    if (isModel[0]) {
+                        continue;
+                    }
+                    if ("java.lang.String".equals(t)) {
+                        continue;
+                    }
+                    error("The type " + t + " should be defined by @Model annotation", entry.getKey());
+                }
+            }
+            verify.clear();
+        }
+        return ok;
+    }
+
+    private void error(String msg, Element e) {
+        processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, msg, e);
+    }
+    
+    private boolean processModel(Element e) {
+        boolean ok = true;
+        Model m = e.getAnnotation(Model.class);
+        if (m == null) {
+            return true;
+        }
+        String pkg = findPkgName(e);
+        Writer w;
+        String className = m.className();
+        models.put(e, className);
+        try {
+            StringWriter body = new StringWriter();
+            List<String> propsGetSet = new ArrayList<String>();
+            List<String> functions = new ArrayList<String>();
+            Map<String, Collection<String>> propsDeps = new HashMap<String, Collection<String>>();
+            Map<String, Collection<String>> functionDeps = new HashMap<String, Collection<String>>();
+            Prprt[] props = createProps(e, m.properties());
+            
+            if (!generateComputedProperties(body, props, e.getEnclosedElements(), propsGetSet, propsDeps)) {
+                ok = false;
+            }
+            if (!generateOnChange(e, propsDeps, props, className, functionDeps)) {
+                ok = false;
+            }
+            if (!generateProperties(e, body, props, propsGetSet, propsDeps, functionDeps)) {
+                ok = false;
+            }
+            if (!generateFunctions(e, body, className, e.getEnclosedElements(), functions)) {
+                ok = false;
+            }
+            if (!generateReceive(e, body, className, e.getEnclosedElements(), functions)) {
+                ok = false;
+            }
+            if (!generateOperation(e, body, className, e.getEnclosedElements())) {
+                ok = false;
+            }
+            FileObject java = processingEnv.getFiler().createSourceFile(pkg + '.' + className, e);
+            w = new OutputStreamWriter(java.openOutputStream());
+            try {
+                w.append("package " + pkg + ";\n");
+                w.append("import net.java.html.json.*;\n");
+                w.append("public final class ").append(className).append(" implements Cloneable {\n");
+                w.append("  private boolean locked;\n");
+                w.append("  private net.java.html.BrwsrCtx context;\n");
+                w.append("  private org.netbeans.html.json.impl.Bindings[] ko = { null };\n");
+                w.append(body.toString());
+                w.append("  private static Class<" + inPckName(e) + "> modelFor() { return null; }\n");
+                w.append("  private ").append(className).append("(net.java.html.BrwsrCtx context) {\n");
+                w.append("    this.context = context;\n");
+                w.append("  };\n");
+                w.append("  public ").append(className).append("() {\n");
+                w.append("    this(net.java.html.BrwsrCtx.findDefault(").append(className).append(".class));\n");
+                for (Prprt p : props) {
+                    if (p.array()) {
+                        continue;
+                    }
+                    boolean[] isModel = {false};
+                    boolean[] isEnum = {false};
+                    boolean isPrimitive[] = {false};
+                    String tn = checkType(p, isModel, isEnum, isPrimitive);
+                    if (isModel[0]) {
+                        w.write("    prop_" + p.name() + " = new " + tn + "();\n");
+                    }
+                }
+                w.append("  };\n");
+                if (props.length > 0) {
+                    w.append("  public ").append(className).append("(");
+                    Prprt firstArray = null;
+                    String sep = "";
+                    for (Prprt p : props) {
+                        if (p.array()) {
+                            if (firstArray == null) {
+                                firstArray = p;
+                            }
+                            continue;
+                        }
+                        String tn = typeName(e, p);
+                        w.write(sep);
+                        w.write(tn);
+                        w.write(" " + p.name());
+                        sep = ", ";
+                    }
+                    if (firstArray != null) {
+                        String tn;
+                        boolean[] isModel = {false};
+                        boolean[] isEnum = {false};
+                        boolean isPrimitive[] = {false};
+                        tn = checkType(firstArray, isModel, isEnum, isPrimitive);
+                        w.write(sep);
+                        w.write(tn);
+                        w.write("... " + firstArray.name());
+                    }
+                    w.append(") {\n");
+                    w.append("    this(net.java.html.BrwsrCtx.findDefault(").append(className).append(".class));\n");
+                    for (Prprt p : props) {
+                        if (p.array()) {
+                            continue;
+                        }
+                        w.write("    this.prop_" + p.name() + " = " + p.name() + ";\n");
+                    }
+                    if (firstArray != null) {
+                        w.write("    this.prop_" + firstArray.name() + ".init(" + firstArray.name() + ");\n");
+                    }
+                    w.append("  };\n");
+                }
+                w.append("  private org.netbeans.html.json.impl.Bindings intKnckt() {\n");
+                w.append("    if (ko[0] != null) return ko[0];\n");
+                w.append("    ko[0] = org.netbeans.html.json.impl.Bindings.apply(context, this);\n");
+                {
+                    w.append("    org.apidesign.html.json.spi.PropertyBinding[] propArr = {\n");
+                    for (int i = 0; i < propsGetSet.size(); i += 5) {
+                        w.append("      ko[0].registerProperty(\"").append(propsGetSet.get(i)).append("\", this, new P(");
+                        w.append((i / 5) + "), " + (propsGetSet.get(i + 2) == null) + "),\n");
+                    }
+                    w.append("    };\n");
+                }
+                {
+                    w.append("    org.apidesign.html.json.spi.FunctionBinding[] funcArr = {\n");
+                    for (int i = 0; i < functions.size(); i += 2) {
+                        w.append("      ko[0].registerFunction(\"").append(functions.get(i)).append("\", this, new P(");
+                        w.append((i / 2) + ")),\n");
+                    }
+                    w.append("    };\n");
+                }
+                w.append("    ko[0].finish(this, propArr, funcArr);\n");
+                w.append("    return ko[0];\n");
+                w.append("  };\n");
+                w.append("  private static final class P implements org.netbeans.html.json.impl.SetAndGet<" + className + ">,\n");
+                w.append("  org.netbeans.html.json.impl.Callback<" + className + ">,\n");
+                w.append("  org.netbeans.html.json.impl.FromJSON<" + className + "> {\n");
+                w.append("    private final int type;\n");
+                w.append("    P(int t) { type = t; };\n");
+                w.append("    public void setValue(" + className + " data, Object value) {\n");
+                w.append("      switch (type) {\n");
+                for (int i = 0; i < propsGetSet.size(); i += 5) {
+                    final String set = propsGetSet.get(i + 2);
+                    String tn = propsGetSet.get(i + 4);
+                    String btn = findBoxedType(tn);
+                    if (btn != null) {
+                        tn = btn;
+                    }
+                    if (set != null) {
+                        w.append("        case " + (i / 5) + ": data." + strip(set) + "(org.netbeans.html.json.impl.JSON.extractValue(" + tn + ".class, value)); return;\n");
+                    }
+                }
+                w.append("      }\n");
+                w.append("    }\n");
+                w.append("    public Object getValue(" + className + " data) {\n");
+                w.append("      switch (type) {\n");
+                for (int i = 0; i < propsGetSet.size(); i += 5) {
+                    final String get = propsGetSet.get(i + 1);
+                    if (get != null) {
+                        w.append("        case " + (i / 5) + ": return data." + strip(get) + "();\n");
+                    }
+                }
+                w.append("      }\n");
+                w.append("      throw new UnsupportedOperationException();\n");
+                w.append("    }\n");
+                w.append("    public void call(" + className + " model, Object data, Object ev) {\n");
+                w.append("      switch (type) {\n");
+                for (int i = 0; i < functions.size(); i += 2) {
+                    final String name = functions.get(i);
+                    w.append("        case " + (i / 2) + ": model." + name + "(data, ev); return;\n");
+                }
+                w.append("      }\n");
+                w.append("      throw new UnsupportedOperationException();\n");
+                w.append("    }\n");
+                w.append("    public Class<" + className + "> factoryFor() { return " + className + ".class; }\n");
+                w.append("    public " + className + " read(net.java.html.BrwsrCtx c, Object json) { return new " + className + "(c, json); }\n");
+                w.append("    public " + className + " cloneTo(Object o, net.java.html.BrwsrCtx c) { return ((" + className + ")o).clone(c); }\n");
+                w.append("  }\n");
+                w.append("  static { org.netbeans.html.json.impl.JSON.register(new P(0)); }\n");
+                w.append("  private ").append(className).append("(net.java.html.BrwsrCtx c, Object json) {\n");
+                w.append("    this.context = c;\n");
+                int values = 0;
+                for (int i = 0; i < propsGetSet.size(); i += 5) {
+                    Prprt p = findPrprt(props, propsGetSet.get(i));
+                    if (p == null) {
+                        continue;
+                    }
+                    values++;
+                }
+                w.append("    Object[] ret = new Object[" + values + "];\n");
+                w.append("    org.netbeans.html.json.impl.JSON.extract(context, json, new String[] {\n");
+                for (int i = 0; i < propsGetSet.size(); i += 5) {
+                    Prprt p = findPrprt(props, propsGetSet.get(i));
+                    if (p == null) {
+                        continue;
+                    }
+                    w.append("      \"").append(propsGetSet.get(i)).append("\",\n");
+                }
+                w.append("    }, ret);\n");
+                for (int i = 0, cnt = 0, prop = 0; i < propsGetSet.size(); i += 5) {
+                    final String pn = propsGetSet.get(i);
+                    Prprt p = findPrprt(props, pn);
+                    if (p == null) {
+                        continue;
+                    }
+                    boolean[] isModel = { false };
+                    boolean[] isEnum = { false };
+                    boolean isPrimitive[] = { false };
+                    String type = checkType(props[prop++], isModel, isEnum, isPrimitive);
+                    if (p.array()) {
+                        w.append("    if (ret[" + cnt + "] instanceof Object[]) {\n");
+                        w.append("      for (Object e : ((Object[])ret[" + cnt + "])) {\n");
+                        if (isModel[0]) {
+                            w.append("        this.prop_").append(pn).append(".add(org.netbeans.html.json.impl.JSON.read");
+                            w.append("(c, " + type + ".class, e));\n");
+                        } else if (isEnum[0]) {
+                            w.append("        this.prop_").append(pn);
+                            w.append(".add(e == null ? null : ");
+                            w.append(type).append(".valueOf(org.netbeans.html.json.impl.JSON.stringValue(e)));\n");
+                        } else {
+                            if (isPrimitive(type)) {
+                                w.append("        this.prop_").append(pn).append(".add(org.netbeans.html.json.impl.JSON.numberValue(e).");
+                                w.append(type).append("Value());\n");
+                            } else {
+                                w.append("        this.prop_").append(pn).append(".add((");
+                                w.append(type).append(")e);\n");
+                            }
+                        }
+                        w.append("      }\n");
+                        w.append("    }\n");
+                    } else {
+                        if (isEnum[0]) {
+                            w.append("    try {\n");
+                            w.append("    this.prop_").append(pn);
+                            w.append(" = ret[" + cnt + "] == null ? null : ");
+                            w.append(type).append(".valueOf(org.netbeans.html.json.impl.JSON.stringValue(ret[" + cnt + "]));\n");
+                            w.append("    } catch (IllegalArgumentException ex) {\n");
+                            w.append("      ex.printStackTrace();\n");
+                            w.append("    }\n");
+                        } else if (isPrimitive(type)) {
+                            w.append("    this.prop_").append(pn);
+                            w.append(" = ret[" + cnt + "] == null ? ");
+                            if ("char".equals(type)) {
+                                w.append("0 : (org.netbeans.html.json.impl.JSON.charValue(");
+                            } else if ("boolean".equals(type)) {
+                                w.append("false : (org.netbeans.html.json.impl.JSON.boolValue(");
+                            } else {
+                                w.append("0 : (org.netbeans.html.json.impl.JSON.numberValue(");
+                            }
+                            w.append("ret[" + cnt + "])).");
+                            w.append(type).append("Value();\n");
+                        } else if (isModel[0]) {
+                            w.append("    this.prop_").append(pn).append(" = org.netbeans.html.json.impl.JSON.read");
+                            w.append("(c, " + type + ".class, ");
+                            w.append("ret[" + cnt + "]);\n");
+                        }else {
+                            w.append("    this.prop_").append(pn);
+                            w.append(" = (").append(type).append(')');
+                            w.append("ret[" + cnt + "];\n");
+                        }
+                    }
+                    cnt++;
+                }
+                w.append("  };\n");
+                writeToString(props, w);
+                writeClone(className, props, w);
+                w.write("  /** Activates this model instance in the current {@link \n"
+                    + "net.java.html.json.Models#bind(java.lang.Object, net.java.html.BrwsrCtx) browser context}. \n"
+                    + "In case of using Knockout technology, this means to \n"
+                    + "bind JSON like data in this model instance with Knockout tags in \n"
+                    + "the surrounding HTML page.\n"
+                    + "*/\n"
+                );
+                w.write("  public " + className + " applyBindings() {\n");
+                w.write("    intKnckt().applyBindings();\n");
+                w.write("    return this;\n");
+                w.write("  }\n");
+                w.write("  public boolean equals(Object o) {\n");
+                w.write("    if (o == this) return true;\n");
+                w.write("    if (o instanceof org.netbeans.html.json.impl.WrapperObject) {\n");
+                w.write("      ((org.netbeans.html.json.impl.WrapperObject)o).setRealObject(intKnckt().koData());\n");
+                w.write("      return false;\n");
+                w.write("    }\n");
+                w.write("    if (!(o instanceof " + className + ")) return false;\n");
+                w.write("    " + className + " p = (" + className + ")o;\n");
+                for (Prprt p : props) {
+                    w.write("    if (!org.netbeans.html.json.impl.JSON.isSame(prop_" + p.name() + ", p.prop_" + p.name() + ")) return false;\n");
+                }
+                w.write("    return true;\n");
+                w.write("  }\n");
+                w.write("  public int hashCode() {\n");
+                w.write("    int h = " + className + ".class.getName().hashCode();\n");
+                for (Prprt p : props) {
+                    w.write("    h = org.netbeans.html.json.impl.JSON.hashPlus(prop_" + p.name() + ", h);\n");
+                }
+                w.write("    return h;\n");
+                w.write("  }\n");
+                w.write("}\n");
+            } finally {
+                w.close();
+            }
+        } catch (IOException ex) {
+            error("Can't create " + className + ".java", e);
+            return false;
+        }
+        return ok;
+    }
+    
+    private boolean generateProperties(
+        Element where,
+        Writer w, Prprt[] properties,
+        Collection<String> props, 
+        Map<String,Collection<String>> deps,
+        Map<String,Collection<String>> functionDeps
+    ) throws IOException {
+        boolean ok = true;
+        for (Prprt p : properties) {
+            final String tn;
+            tn = typeName(where, p);
+            String[] gs = toGetSet(p.name(), tn, p.array());
+            String castTo;
+            
+            if (p.array()) {
+                w.write("  private org.netbeans.html.json.impl.JSONList<" + tn + "> prop_" + p.name() + " = new org.netbeans.html.json.impl.JSONList<" + tn + ">(ko, \""
+                    + p.name() + "\"");
+                Collection<String> dependants = deps.get(p.name());
+                if (dependants != null) {
+                    for (String depProp : dependants) {
+                        w.write(", ");
+                        w.write('\"');
+                        w.write(depProp);
+                        w.write('\"');
+                    }
+                }
+                w.write(")");
+                
+                dependants = functionDeps.get(p.name());
+                if (dependants != null) {
+                    w.write(".onChange(new Runnable() { public void run() {\n");
+                    for (String call : dependants) {
+                        w.append("  ").append(call);
+                    }
+                    w.write("  }})");
+                }
+                w.write(";\n");
+            
+                castTo = "java.util.List";
+                w.write("  public java.util.List<" + tn + "> " + gs[0] + "() {\n");
+                w.write("    if (locked) throw new IllegalStateException();\n");
+                w.write("    return prop_" + p.name() + ";\n");
+                w.write("  }\n");
+            } else {
+                castTo = tn;
+                w.write("  private " + tn + " prop_" + p.name() + ";\n");
+                w.write("  public " + tn + " " + gs[0] + "() {\n");
+                w.write("    if (locked) throw new IllegalStateException();\n");
+                w.write("    return prop_" + p.name() + ";\n");
+                w.write("  }\n");
+                w.write("  public void " + gs[1] + "(" + tn + " v) {\n");
+                w.write("    if (locked) throw new IllegalStateException();\n");
+                w.write("    if (org.netbeans.html.json.impl.JSON.isSame(prop_" + p.name() + ", v)) return;\n");
+                w.write("    prop_" + p.name() + " = v;\n");
+                w.write("    org.netbeans.html.json.impl.Bindings b = ko[0];\n");
+                w.write("    if (b != null) {\n");
+                w.write("      b.valueHasMutated(\"" + p.name() + "\");\n");
+                Collection<String> dependants = deps.get(p.name());
+                if (dependants != null) {
+                    for (String depProp : dependants) {
+                        w.write("      b.valueHasMutated(\"" + depProp + "\");\n");
+                    }
+                }
+                w.write("    }\n");
+                dependants = functionDeps.get(p.name());
+                if (dependants != null) {
+                    for (String call : dependants) {
+                        w.append("  ").append(call);
+                    }
+                }
+                w.write("  }\n");
+            }
+            
+            props.add(p.name());
+            props.add(gs[2]);
+            props.add(gs[3]);
+            props.add(gs[0]);
+            props.add(castTo);
+        }
+        return ok;
+    }
+
+    private boolean generateComputedProperties(
+        Writer w, Prprt[] fixedProps,
+        Collection<? extends Element> arr, Collection<String> props,
+        Map<String,Collection<String>> deps
+    ) throws IOException {
+        boolean ok = true;
+        for (Element e : arr) {
+            if (e.getKind() != ElementKind.METHOD) {
+                continue;
+            }
+            if (e.getAnnotation(ComputedProperty.class) == null) {
+                continue;
+            }
+            if (!e.getModifiers().contains(Modifier.STATIC)) {
+                error("Method " + e.getSimpleName() + " has to be static when annotated by @ComputedProperty", e);
+                ok = false;
+                continue;
+            }
+            ExecutableElement ee = (ExecutableElement)e;
+            final TypeMirror rt = ee.getReturnType();
+            final Types tu = processingEnv.getTypeUtils();
+            TypeMirror ert = tu.erasure(rt);
+            String tn = fqn(ert, ee);
+            boolean array = false;
+            final TypeMirror toCheck;
+            if (tn.equals("java.util.List")) {
+                array = true;
+                toCheck = ((DeclaredType)rt).getTypeArguments().get(0);
+            } else {
+                toCheck = rt;
+            }
+            
+            final String sn = ee.getSimpleName().toString();
+            
+            if (toCheck.getKind().isPrimitive()) {
+                // OK
+            } else {
+                TypeMirror stringType = processingEnv.getElementUtils().getTypeElement("java.lang.String").asType();
+                TypeMirror enumType = processingEnv.getElementUtils().getTypeElement("java.lang.Enum").asType();
+
+                if (tu.isSubtype(toCheck, stringType)) {
+                    // OK
+                } else if (tu.isSubtype(tu.erasure(toCheck), tu.erasure(enumType))) {
+                    // OK
+                } else if (isModel(toCheck)) {
+                    // OK
+                } else {
+                    ok = false;
+                    error(sn + " cannot return " + toCheck, e);
+                }
+            }
+            
+            String[] gs = toGetSet(sn, tn, array);
+            
+            w.write("  public " + tn + " " + gs[0] + "() {\n");
+            w.write("    if (locked) throw new IllegalStateException();\n");
+            int arg = 0;
+            for (VariableElement pe : ee.getParameters()) {
+                final String dn = pe.getSimpleName().toString();
+                
+                if (!verifyPropName(pe, dn, fixedProps)) {
+                    ok = false;
+                }
+                
+                final String dt = fqn(pe.asType(), ee);
+                String[] call = toGetSet(dn, dt, false);
+                w.write("    " + dt + " arg" + (++arg) + " = ");
+                w.write(call[0] + "();\n");
+                
+                Collection<String> depends = deps.get(dn);
+                if (depends == null) {
+                    depends = new LinkedHashSet<String>();
+                    deps.put(dn, depends);
+                }
+                depends.add(sn);
+            }
+            w.write("    try {\n");
+            w.write("      locked = true;\n");
+            w.write("      return " + fqn(ee.getEnclosingElement().asType(), ee) + '.' + e.getSimpleName() + "(");
+            String sep = "";
+            for (int i = 1; i <= arg; i++) {
+                w.write(sep);
+                w.write("arg" + i);
+                sep = ", ";
+            }
+            w.write(");\n");
+            w.write("    } finally {\n");
+            w.write("      locked = false;\n");
+            w.write("    }\n");
+            w.write("  }\n");
+
+            props.add(e.getSimpleName().toString());
+            props.add(gs[2]);
+            props.add(null);
+            props.add(gs[0]);
+            props.add(tn);
+        }
+        
+        return ok;
+    }
+
+    private static String[] toGetSet(String name, String type, boolean array) {
+        String n = Character.toUpperCase(name.charAt(0)) + name.substring(1);
+        String bck2brwsrType = "L" + type.replace('.', '_') + "_2";
+        if ("int".equals(type)) {
+            bck2brwsrType = "I";
+        }
+        if ("double".equals(type)) {
+            bck2brwsrType = "D";
+        }
+        String pref = "get";
+        if ("boolean".equals(type)) {
+            pref = "is";
+            bck2brwsrType = "Z";
+        }
+        final String nu = n.replace('.', '_');
+        if (array) {
+            return new String[] { 
+                "get" + n,
+                null,
+                "get" + nu + "__Ljava_util_List_2",
+                null
+            };
+        }
+        return new String[]{
+            pref + n, 
+            "set" + n, 
+            pref + nu + "__" + bck2brwsrType,
+            "set" + nu + "__V" + bck2brwsrType
+        };
+    }
+
+    private String typeName(Element where, Prprt p) {
+        String ret;
+        boolean[] isModel = { false };
+        boolean[] isEnum = { false };
+        boolean isPrimitive[] = { false };
+        ret = checkType(p, isModel, isEnum, isPrimitive);
+        if (p.array()) {
+            String bt = findBoxedType(ret);
+            if (bt != null) {
+                return bt;
+            }
+        }
+        return ret;
+    }
+    
+    private static String findBoxedType(String ret) {
+        if (ret.equals("boolean")) {
+            return Boolean.class.getName();
+        }
+        if (ret.equals("byte")) {
+            return Byte.class.getName();
+        }
+        if (ret.equals("short")) {
+            return Short.class.getName();
+        }
+        if (ret.equals("char")) {
+            return Character.class.getName();
+        }
+        if (ret.equals("int")) {
+            return Integer.class.getName();
+        }
+        if (ret.equals("long")) {
+            return Long.class.getName();
+        }
+        if (ret.equals("float")) {
+            return Float.class.getName();
+        }
+        if (ret.equals("double")) {
+            return Double.class.getName();
+        }
+        return null;
+    }
+
+    private boolean verifyPropName(Element e, String propName, Prprt[] existingProps) {
+        StringBuilder sb = new StringBuilder();
+        String sep = "";
+        for (Prprt Prprt : existingProps) {
+            if (Prprt.name().equals(propName)) {
+                return true;
+            }
+            sb.append(sep);
+            sb.append('"');
+            sb.append(Prprt.name());
+            sb.append('"');
+            sep = ", ";
+        }
+        error(
+            propName + " is not one of known properties: " + sb
+            , e
+        );
+        return false;
+    }
+
+    private static String findPkgName(Element e) {
+        for (;;) {
+            if (e.getKind() == ElementKind.PACKAGE) {
+                return ((PackageElement)e).getQualifiedName().toString();
+            }
+            e = e.getEnclosingElement();
+        }
+    }
+
+    private boolean generateFunctions(
+        Element clazz, StringWriter body, String className, 
+        List<? extends Element> enclosedElements, List<String> functions
+    ) {
+        for (Element m : enclosedElements) {
+            if (m.getKind() != ElementKind.METHOD) {
+                continue;
+            }
+            ExecutableElement e = (ExecutableElement)m;
+            Function onF = e.getAnnotation(Function.class);
+            if (onF == null) {
+                continue;
+            }
+            if (!e.getModifiers().contains(Modifier.STATIC)) {
+                error("@OnFunction method needs to be static", e);
+                return false;
+            }
+            if (e.getModifiers().contains(Modifier.PRIVATE)) {
+                error("@OnFunction method cannot be private", e);
+                return false;
+            }
+            if (e.getReturnType().getKind() != TypeKind.VOID) {
+                error("@OnFunction method should return void", e);
+                return false;
+            }
+            String n = e.getSimpleName().toString();
+            body.append("  private void ").append(n).append("(Object data, Object ev) {\n");
+            body.append("    ").append(((TypeElement)clazz).getQualifiedName()).append(".").append(n).append("(");
+            body.append(wrapParams(e, null, className, "ev", "data"));
+            body.append(");\n");
+            body.append("  }\n");
+            
+            functions.add(n);
+            functions.add(n + "__VLjava_lang_Object_2Ljava_lang_Object_2");
+        }
+        return true;
+    }
+
+    private boolean generateOnChange(Element clazz, Map<String,Collection<String>> propDeps,
+        Prprt[] properties, String className, 
+        Map<String, Collection<String>> functionDeps
+    ) {
+        for (Element m : clazz.getEnclosedElements()) {
+            if (m.getKind() != ElementKind.METHOD) {
+                continue;
+            }
+            ExecutableElement e = (ExecutableElement) m;
+            OnPropertyChange onPC = e.getAnnotation(OnPropertyChange.class);
+            if (onPC == null) {
+                continue;
+            }
+            for (String pn : onPC.value()) {
+                if (findPrprt(properties, pn) == null && findDerivedFrom(propDeps, pn).isEmpty()) {
+                    error("No Prprt named '" + pn + "' in the model", clazz);
+                    return false;
+                }
+            }
+            if (!e.getModifiers().contains(Modifier.STATIC)) {
+                error("@OnPrprtChange method needs to be static", e);
+                return false;
+            }
+            if (e.getModifiers().contains(Modifier.PRIVATE)) {
+                error("@OnPrprtChange method cannot be private", e);
+                return false;
+            }
+            if (e.getReturnType().getKind() != TypeKind.VOID) {
+                error("@OnPrprtChange method should return void", e);
+                return false;
+            }
+            String n = e.getSimpleName().toString();
+            
+            
+            for (String pn : onPC.value()) {
+                StringBuilder call = new StringBuilder();
+                call.append("  ").append(clazz.getSimpleName()).append(".").append(n).append("(");
+                call.append(wrapPropName(e, className, "name", pn));
+                call.append(");\n");
+                
+                Collection<String> change = functionDeps.get(pn);
+                if (change == null) {
+                    change = new ArrayList<String>();
+                    functionDeps.put(pn, change);
+                }
+                change.add(call.toString());
+                for (String dpn : findDerivedFrom(propDeps, pn)) {
+                    change = functionDeps.get(dpn);
+                    if (change == null) {
+                        change = new ArrayList<String>();
+                        functionDeps.put(dpn, change);
+                    }
+                    change.add(call.toString());
+                }
+            }
+        }
+        return true;
+    }
+
+    private boolean generateOperation(Element clazz, 
+        StringWriter body, String className, 
+        List<? extends Element> enclosedElements
+    ) {
+        for (Element m : enclosedElements) {
+            if (m.getKind() != ElementKind.METHOD) {
+                continue;
+            }
+            ExecutableElement e = (ExecutableElement)m;
+            ModelOperation mO = e.getAnnotation(ModelOperation.class);
+            if (mO == null) {
+                continue;
+            }
+            if (!e.getModifiers().contains(Modifier.STATIC)) {
+                error("@ModelOperation method needs to be static", e);
+                return false;
+            }
+            if (e.getModifiers().contains(Modifier.PRIVATE)) {
+                error("@ModelOperation method cannot be private", e);
+                return false;
+            }
+            if (e.getReturnType().getKind() != TypeKind.VOID) {
+                error("@ModelOperation method should return void", e);
+                return false;
+            }
+            List<String> args = new ArrayList<String>();
+            {
+                body.append("  public void ").append(m.getSimpleName()).append("(");
+                String sep = "";
+                boolean checkFirst = true;
+                for (VariableElement ve : e.getParameters()) {
+                    final TypeMirror type = ve.asType();
+                    CharSequence simpleName;
+                    if (type.getKind() == TypeKind.DECLARED) {
+                        simpleName = ((DeclaredType)type).asElement().getSimpleName();
+                    } else {
+                        simpleName = type.toString();
+                    }
+                    if (simpleName.toString().equals(className)) {
+                        checkFirst = false;
+                    } else {
+                        if (checkFirst) {
+                            error("First parameter of @ModelOperation method must be " + className, m);
+                            return false;
+                        }
+                        args.add(ve.getSimpleName().toString());
+                        body.append(sep).append("final ");
+                        body.append(ve.asType().toString()).append(" ");
+                        body.append(ve.toString());
+                        sep = ", ";
+                    }
+                }
+                body.append(") {\n");
+                body.append("    org.netbeans.html.json.impl.JSON.runInBrowser(this.context, new Runnable() { public void run() {\n");
+                body.append("      ").append(clazz.getSimpleName()).append(".").append(m.getSimpleName()).append("(");
+                body.append(className).append(".this");
+                for (String s : args) {
+                    body.append(", ").append(s);
+                }
+                body.append(");\n");
+                body.append("    }});\n");
+                body.append("  }\n");
+            }
+            
+        }
+        return true;
+    }
+    
+    
+    private boolean generateReceive(
+        Element clazz, StringWriter body, String className, 
+        List<? extends Element> enclosedElements, List<String> functions
+    ) {
+        for (Element m : enclosedElements) {
+            if (m.getKind() != ElementKind.METHOD) {
+                continue;
+            }
+            ExecutableElement e = (ExecutableElement)m;
+            OnReceive onR = e.getAnnotation(OnReceive.class);
+            if (onR == null) {
+                continue;
+            }
+            if (!e.getModifiers().contains(Modifier.STATIC)) {
+                error("@OnReceive method needs to be static", e);
+                return false;
+            }
+            if (e.getModifiers().contains(Modifier.PRIVATE)) {
+                error("@OnReceive method cannot be private", e);
+                return false;
+            }
+            if (e.getReturnType().getKind() != TypeKind.VOID) {
+                error("@OnReceive method should return void", e);
+                return false;
+            }
+            if (!onR.jsonp().isEmpty() && !"GET".equals(onR.method())) {
+                error("JSONP works only with GET transport method", e);
+            }
+            String dataMirror = findDataSpecified(e, onR);
+            if ("PUT".equals(onR.method()) && dataMirror == null) {
+                error("PUT method needs to specify a data() class", e);
+                return false;
+            }
+            if ("POST".equals(onR.method()) && dataMirror == null) {
+                error("POST method needs to specify a data() class", e);
+                return false;
+            }
+            String modelClass = null;
+            boolean expectsList = false;
+            List<String> args = new ArrayList<String>();
+            {
+                for (VariableElement ve : e.getParameters()) {
+                    TypeMirror modelType = null;
+                    final TypeMirror type = ve.asType();
+                    CharSequence simpleName;
+                    if (type.getKind() == TypeKind.DECLARED) {
+                        simpleName = ((DeclaredType)type).asElement().getSimpleName();
+                    } else {
+                        simpleName = type.toString();
+                    }
+                    if (simpleName.toString().equals(className)) {
+                        args.add(className + ".this");
+                    } else if (isModel(ve.asType())) {
+                        modelType = ve.asType();
+                    } else if (ve.asType().getKind() == TypeKind.ARRAY) {
+                        modelType = ((ArrayType)ve.asType()).getComponentType();
+                        expectsList = true;
+                    } else if (ve.asType().toString().equals("java.lang.String")) {
+                        modelType = ve.asType();
+                    }
+                    if (modelType != null) {
+                        if (modelClass != null) {
+                            error("There can be only one model class among arguments", e);
+                        } else {
+                            modelClass = modelType.toString();
+                            if (expectsList) {
+                                args.add("arr");
+                            } else {
+                                args.add("arr[0]");
+                            }
+                        }
+                    }
+                }
+            }
+            if (modelClass == null) {
+                error("The method needs to have one @Model class as parameter", e);
+            }
+            String n = e.getSimpleName().toString();
+            if ("WebSocket".equals(onR.method())) {
+                body.append("  /** Performs WebSocket communication. Call with <code>null</code> data parameter\n");
+                body.append("  * to open the connection (even if not required). Call with non-null data to\n");
+                body.append("  * send messages to server. Call again with <code>null</code> data to close the socket.\n");
+                body.append("  */\n");
+            }
+            body.append("  public void ").append(n).append("(");
+            StringBuilder urlBefore = new StringBuilder();
+            StringBuilder urlAfter = new StringBuilder();
+            String jsonpVarName = null;
+            {
+                String sep = "";
+                boolean skipJSONP = onR.jsonp().isEmpty();
+                for (String p : findParamNames(e, onR.url(), onR.jsonp(), urlBefore, urlAfter)) {
+                    if (!skipJSONP && p.equals(onR.jsonp())) {
+                        skipJSONP = true;
+                        jsonpVarName = p;
+                        continue;
+                    }
+                    body.append(sep);
+                    body.append("String ").append(p);
+                    sep = ", ";
+                }
+                if (!skipJSONP) {
+                    error(
+                        "Name of jsonp attribute ('" + onR.jsonp() + 
+                        "') is not used in url attribute '" + onR.url() + "'", e
+                    );
+                }
+                if (dataMirror != null) {
+                    body.append(sep).append(dataMirror.toString()).append(" data");
+                }
+            }
+            body.append(") {\n");
+            boolean webSocket = onR.method().equals("WebSocket");
+            if (webSocket) {
+                if (generateWSReceiveBody(body, onR, e, clazz, className, expectsList, modelClass, n, args, urlBefore, jsonpVarName, urlAfter, dataMirror)) {
+                    return false;
+                }
+                body.append("  }\n");
+                body.append("  private org.netbeans.html.json.impl.JSON.WS ws_" + e.getSimpleName() + ";\n");
+            } else {
+                if (generateJSONReceiveBody(body, onR, e, clazz, className, expectsList, modelClass, n, args, urlBefore, jsonpVarName, urlAfter, dataMirror)) {
+                    return false;
+                }
+                body.append("  }\n");
+            }
+        }
+        return true;
+    }
+
+    private boolean generateJSONReceiveBody(StringWriter body, OnReceive onR, ExecutableElement e, Element clazz, String className, boolean expectsList, String modelClass, String n, List<String> args, StringBuilder urlBefore, String jsonpVarName, StringBuilder urlAfter, String dataMirror) {
+        body.append(
+            "    class ProcessResult extends org.netbeans.html.json.impl.RcvrJSON {\n" +
+            "      @Override\n" +
+            "      public void onError(org.netbeans.html.json.impl.RcvrJSON.MsgEvnt ev) {\n" +
+            "        Exception value = ev.getException();\n"
+            );
+        if (onR.onError().isEmpty()) {
+            body.append(
+                "        value.printStackTrace();\n"
+                );
+        } else {
+            if (!findOnError(e, ((TypeElement)clazz), onR.onError(), className)) {
+                return true;
+            }
+            body.append("        ").append(clazz.getSimpleName()).append(".").append(onR.onError()).append("(");
+            body.append(className).append(".this, value);\n");
+        }
+        body.append(
+            "      }\n" +
+            "      @Override\n" +
+            "      public void onMessage(org.netbeans.html.json.impl.RcvrJSON.MsgEvnt ev) {\n"
+            );
+        if (expectsList) {
+            body.append(
+                "        " + modelClass + "[] arr = new " + modelClass + "[ev.dataSize()];\n"
+                );
+        } else {
+            body.append(
+                "        " + modelClass + "[] arr = { null };\n"
+                );
+        }
+        body.append(
+            "        ev.dataRead(context, " + modelClass + ".class, arr);\n"
+            );
+        {
+            body.append("        ").append(clazz.getSimpleName()).append(".").append(n).append("(");
+            String sep = "";
+            for (String arg : args) {
+                body.append(sep);
+                body.append(arg);
+                sep = ", ";
+            }
+            body.append(");\n");
+        }
+        body.append(
+            "      }\n" +
+            "    }\n"
+            );
+        body.append("    ProcessResult pr = new ProcessResult();\n");
+        body.append("    org.netbeans.html.json.impl.JSON.loadJSON(context, pr,\n        ");
+        body.append(urlBefore).append(", ");
+        if (jsonpVarName != null) {
+            body.append(urlAfter);
+        } else {
+            body.append("null");
+        }
+        if (!"GET".equals(onR.method()) || dataMirror != null) {
+            body.append(", \"").append(onR.method()).append('"');
+            if (dataMirror != null) {
+                body.append(", data");
+            } else {
+                body.append(", null");
+            }
+        } else {
+            body.append(", null, null");
+        }
+        body.append(");\n");
+        return false;
+    }
+    
+    private boolean generateWSReceiveBody(StringWriter body, OnReceive onR, ExecutableElement e, Element clazz, String className, boolean expectsList, String modelClass, String n, List<String> args, StringBuilder urlBefore, String jsonpVarName, StringBuilder urlAfter, String dataMirror) {
+        body.append(
+            "    class ProcessResult extends org.netbeans.html.json.impl.RcvrJSON {\n" +
+            "      @Override\n" +
+            "      public void onOpen(org.netbeans.html.json.impl.RcvrJSON.MsgEvnt ev) {\n"
+        );
+        body.append("        ").append(clazz.getSimpleName()).append(".").append(n).append("(");
+        {
+            String sep = "";
+            for (String arg : args) {
+                body.append(sep);
+                if (arg.startsWith("arr")) {
+                    body.append("null");
+                } else {
+                    body.append(arg);
+                }
+                sep = ", ";
+            }
+        }
+        body.append(");\n");
+        body.append(
+            "      }\n" +
+            "      @Override\n" +
+            "      public void onError(org.netbeans.html.json.impl.RcvrJSON.MsgEvnt ev) {\n" +
+            "        Exception value = ev.getException();\n"
+            );
+        if (onR.onError().isEmpty()) {
+            body.append(
+                "        value.printStackTrace();\n"
+                );
+        } else {
+            if (!findOnError(e, ((TypeElement)clazz), onR.onError(), className)) {
+                return true;
+            }
+            body.append("        ").append(clazz.getSimpleName()).append(".").append(onR.onError()).append("(");
+            body.append(className).append(".this, value);\n");
+        }
+        body.append(
+            "      }\n" +
+            "      @Override\n" +
+            "      public void onMessage(org.netbeans.html.json.impl.RcvrJSON.MsgEvnt ev) {\n"
+        );
+        if (expectsList) {
+            body.append(
+                "        " + modelClass + "[] arr = new " + modelClass + "[ev.dataSize()];\n"
+                );
+        } else {
+            body.append(
+                "        " + modelClass + "[] arr = { null };\n"
+                );
+        }
+        body.append(
+            "        ev.dataRead(context, " + modelClass + ".class, arr);\n"
+            );
+        {
+            body.append("        ").append(clazz.getSimpleName()).append(".").append(n).append("(");
+            String sep = "";
+            for (String arg : args) {
+                body.append(sep);
+                body.append(arg);
+                sep = ", ";
+            }
+            body.append(");\n");
+        }
+        body.append(
+            "      }\n"
+        );
+        if (!onR.onError().isEmpty()) {
+            body.append(
+                "      @Override\n"
+              + "      public void onClose(org.netbeans.html.json.impl.RcvrJSON.MsgEvnt ev) {\n"
+            );
+            body.append("        ").append(clazz.getSimpleName()).append(".").append(onR.onError()).append("(");
+            body.append(className).append(".this, null);\n");
+            body.append(
+                "      }\n"
+            );
+        }
+        body.append("    }\n");
+        body.append("    if (this.ws_").append(e.getSimpleName()).append(" == null) {\n");
+        body.append("      ProcessResult pr = new ProcessResult();\n");
+        body.append("      this.ws_").append(e.getSimpleName());
+        body.append("= org.netbeans.html.json.impl.JSON.openWS(context, pr,\n        ");
+        body.append(urlBefore).append(", data);\n");
+        body.append("    } else {\n");
+        body.append("      this.ws_").append(e.getSimpleName()).append(".send(context, ").append(urlBefore).append(", data);\n");
+        body.append("    }\n");
+        return false;
+    }
+
+    private CharSequence wrapParams(
+        ExecutableElement ee, String id, String className, String evName, String dataName
+    ) {
+        TypeMirror stringType = processingEnv.getElementUtils().getTypeElement("java.lang.String").asType();
+        StringBuilder params = new StringBuilder();
+        boolean first = true;
+        for (VariableElement ve : ee.getParameters()) {
+            if (!first) {
+                params.append(", ");
+            }
+            first = false;
+            String toCall = null;
+            String toFinish = null;
+            if (ve.asType() == stringType) {
+                if (ve.getSimpleName().contentEquals("id")) {
+                    params.append('"').append(id).append('"');
+                    continue;
+                }
+                toCall = "org.netbeans.html.json.impl.JSON.toString(context, ";
+            }
+            if (ve.asType().getKind() == TypeKind.DOUBLE) {
+                toCall = "org.netbeans.html.json.impl.JSON.toNumber(context, ";
+                toFinish = ".doubleValue()";
+            }
+            if (ve.asType().getKind() == TypeKind.INT) {
+                toCall = "org.netbeans.html.json.impl.JSON.toNumber(context, ";
+                toFinish = ".intValue()";
+            }
+            if (dataName != null && ve.getSimpleName().contentEquals(dataName) && isModel(ve.asType())) {
+                toCall = "org.netbeans.html.json.impl.JSON.toModel(context, " + ve.asType() + ".class, ";
+            }
+
+            if (toCall != null) {
+                params.append(toCall);
+                if (dataName != null && ve.getSimpleName().contentEquals(dataName)) {
+                    params.append(dataName);
+                    params.append(", null");
+                } else {
+                    if (evName == null) {
+                        final StringBuilder sb = new StringBuilder();
+                        sb.append("Unexpected string parameter name.");
+                        if (dataName != null) {
+                            sb.append(" Try \"").append(dataName).append("\"");
+                        }
+                        error(sb.toString(), ee);
+                    }
+                    params.append(evName);
+                    params.append(", \"");
+                    params.append(ve.getSimpleName().toString());
+                    params.append("\"");
+                }
+                params.append(")");
+                if (toFinish != null) {
+                    params.append(toFinish);
+                }
+                continue;
+            }
+            String rn = fqn(ve.asType(), ee);
+            int last = rn.lastIndexOf('.');
+            if (last >= 0) {
+                rn = rn.substring(last + 1);
+            }
+            if (rn.equals(className)) {
+                params.append(className).append(".this");
+                continue;
+            }
+            error(
+                "The annotated method can only accept " + className + " argument or argument named 'data'",
+                ee
+            );
+        }
+        return params;
+    }
+    
+    
+    private CharSequence wrapPropName(
+        ExecutableElement ee, String className, String propName, String propValue
+    ) {
+        TypeMirror stringType = processingEnv.getElementUtils().getTypeElement("java.lang.String").asType();
+        StringBuilder params = new StringBuilder();
+        boolean first = true;
+        for (VariableElement ve : ee.getParameters()) {
+            if (!first) {
+                params.append(", ");
+            }
+            first = false;
+            if (ve.asType() == stringType) {
+                if (propName != null && ve.getSimpleName().contentEquals(propName)) {
+                    params.append('"').append(propValue).append('"');
+                } else {
+                    error("Unexpected string parameter name. Try \"" + propName + "\".", ee);
+                }
+                continue;
+            }
+            String rn = fqn(ve.asType(), ee);
+            int last = rn.lastIndexOf('.');
+            if (last >= 0) {
+                rn = rn.substring(last + 1);
+            }
+            if (rn.equals(className)) {
+                params.append(className).append(".this");
+                continue;
+            }
+            error(
+                "@OnPrprtChange method can only accept String or " + className + " arguments",
+                ee);
+        }
+        return params;
+    }
+    
+    private boolean isModel(TypeMirror tm) {
+        if (tm.getKind() == TypeKind.ERROR) {
+            return true;
+        }
+        final Element e = processingEnv.getTypeUtils().asElement(tm);
+        if (e == null) {
+            return false;
+        }
+        for (Element ch : e.getEnclosedElements()) {
+            if (ch.getKind() == ElementKind.METHOD) {
+                ExecutableElement ee = (ExecutableElement)ch;
+                if (ee.getParameters().isEmpty() && ee.getSimpleName().contentEquals("modelFor")) {
+                    return true;
+                }
+            }
+        }
+        return models.values().contains(e.getSimpleName().toString());
+    }
+    
+    private void writeToString(Prprt[] props, Writer w) throws IOException {
+        w.write("  public String toString() {\n");
+        w.write("    StringBuilder sb = new StringBuilder();\n");
+        w.write("    sb.append('{');\n");
+        String sep = "";
+        for (Prprt p : props) {
+            w.write(sep);
+            w.append("    sb.append('\"').append(\"" + p.name() + "\")");
+                w.append(".append('\"').append(\":\");\n");
+            w.append("    sb.append(org.netbeans.html.json.impl.JSON.toJSON(prop_");
+            w.append(p.name()).append("));\n");
+            sep =    "    sb.append(',');\n";
+        }
+        w.write("    sb.append('}');\n");
+        w.write("    return sb.toString();\n");
+        w.write("  }\n");
+    }
+    private void writeClone(String className, Prprt[] props, Writer w) throws IOException {
+        w.write("  public " + className + " clone() {\n");
+        w.write("    return clone(context);\n");
+        w.write("  }\n");
+        w.write("  private " + className + " clone(net.java.html.BrwsrCtx ctx) {\n");
+        w.write("    " + className + " ret = new " + className + "(ctx);\n");
+        for (Prprt p : props) {
+            if (!p.array()) {
+                boolean isModel[] = { false };
+                boolean isEnum[] = { false };
+                boolean isPrimitive[] = { false };
+                checkType(p, isModel, isEnum, isPrimitive);
+                if (!isModel[0]) {
+                    w.write("    ret.prop_" + p.name() + " = prop_" + p.name() + ";\n");
+                    continue;
+                }
+                w.write("    ret.prop_" + p.name() + " =  prop_" + p.name() + "  == null ? null : prop_" + p.name() + ".clone();\n");
+            } else {
+                w.write("    ret.prop_" + p.name() + ".cloneAll(ctx, prop_" + p.name() + ");\n");
+            }
+        }
+        
+        w.write("    return ret;\n");
+        w.write("  }\n");
+    }
+
+    private String inPckName(Element e) {
+        StringBuilder sb = new StringBuilder();
+        while (e.getKind() != ElementKind.PACKAGE) {
+            if (sb.length() == 0) {
+                sb.append(e.getSimpleName());
+            } else {
+                sb.insert(0, '.');
+                sb.insert(0, e.getSimpleName());
+            }
+            e = e.getEnclosingElement();
+        }
+        return sb.toString();
+    }
+
+    private String fqn(TypeMirror pt, Element relative) {
+        if (pt.getKind() == TypeKind.ERROR) {
+            final Elements eu = processingEnv.getElementUtils();
+            PackageElement pckg = eu.getPackageOf(relative);
+            return pckg.getQualifiedName() + "." + pt.toString();
+        }
+        return pt.toString();
+    }
+
+    private String checkType(Prprt p, boolean[] isModel, boolean[] isEnum, boolean[] isPrimitive) {
+        TypeMirror tm;
+        try {
+            String ret = p.typeName(processingEnv);
+            TypeElement e = processingEnv.getElementUtils().getTypeElement(ret);
+            if (e == null) {
+                isModel[0] = true;
+                isEnum[0] = false;
+                isPrimitive[0] = false;
+                return ret;
+            }
+            tm = e.asType();
+        } catch (MirroredTypeException ex) {
+            tm = ex.getTypeMirror();
+        }
+        tm = processingEnv.getTypeUtils().erasure(tm);
+        if (isPrimitive[0] = tm.getKind().isPrimitive()) {
+            isEnum[0] = false;
+            isModel[0] = false;
+            return tm.toString();
+        }
+        final Element e = processingEnv.getTypeUtils().asElement(tm);
+        if (e.getKind() == ElementKind.CLASS && tm.getKind() == TypeKind.ERROR) {
+            isModel[0] = true;
+            isEnum[0] = false;
+            return e.getSimpleName().toString();
+        }
+        
+        final Model m = e == null ? null : e.getAnnotation(Model.class);
+        String ret;
+        if (m != null) {
+            ret = findPkgName(e) + '.' + m.className();
+            isModel[0] = true;
+            models.put(e, m.className());
+        } else if (findModelForMthd(e)) {
+            ret = ((TypeElement)e).getQualifiedName().toString();
+            isModel[0] = true;
+        } else {
+            ret = tm.toString();
+        }
+        TypeMirror enm = processingEnv.getElementUtils().getTypeElement("java.lang.Enum").asType();
+        enm = processingEnv.getTypeUtils().erasure(enm);
+        isEnum[0] = processingEnv.getTypeUtils().isSubtype(tm, enm);
+        return ret;
+    }
+    
+    private static boolean findModelForMthd(Element clazz) {
+        if (clazz == null) {
+            return false;
+        }
+        for (Element e : clazz.getEnclosedElements()) {
+            if (e.getKind() == ElementKind.METHOD) {
+                ExecutableElement ee = (ExecutableElement)e;
+                if (
+                    ee.getSimpleName().contentEquals("modelFor") &&
+                    ee.getParameters().isEmpty()
+                ) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private Iterable<String> findParamNames(
+        Element e, String url, String jsonParam, StringBuilder... both
+    ) {
+        List<String> params = new ArrayList<String>();
+        int wasJSON = 0;
+
+        for (int pos = 0; ;) {
+            int next = url.indexOf('{', pos);
+            if (next == -1) {
+                both[wasJSON].append('"')
+                    .append(url.substring(pos))
+                    .append('"');
+                return params;
+            }
+            int close = url.indexOf('}', next);
+            if (close == -1) {
+                error("Unbalanced '{' and '}' in " + url, e);
+                return params;
+            }
+            final String paramName = url.substring(next + 1, close);
+            params.add(paramName);
+            if (paramName.equals(jsonParam) && !jsonParam.isEmpty()) {
+                both[wasJSON].append('"')
+                    .append(url.substring(pos, next))
+                    .append('"');
+                wasJSON = 1;
+            } else {
+                both[wasJSON].append('"')
+                    .append(url.substring(pos, next))
+                    .append("\" + ").append(paramName).append(" + ");
+            }
+            pos = close + 1;
+        }
+    }
+
+    private static Prprt findPrprt(Prprt[] properties, String propName) {
+        for (Prprt p : properties) {
+            if (propName.equals(p.name())) {
+                return p;
+            }
+        }
+        return null;
+    }
+
+    private boolean isPrimitive(String type) {
+        return 
+            "int".equals(type) ||
+            "double".equals(type) ||
+            "long".equals(type) ||
+            "short".equals(type) ||
+            "byte".equals(type) ||
+            "char".equals(type) ||
+            "boolean".equals(type) ||
+            "float".equals(type);
+    }
+
+    private static Collection<String> findDerivedFrom(Map<String, Collection<String>> propsDeps, String derivedProp) {
+        Set<String> names = new HashSet<String>();
+        for (Map.Entry<String, Collection<String>> e : propsDeps.entrySet()) {
+            if (e.getValue().contains(derivedProp)) {
+                names.add(e.getKey());
+            }
+        }
+        return names;
+    }
+    
+    private Prprt[] createProps(Element e, Property[] arr) {
+        Prprt[] ret = Prprt.wrap(processingEnv, e, arr);
+        Prprt[] prev = verify.put(e, ret);
+        if (prev != null) {
+            error("Two sets of properties for ", e);
+        }
+        return ret;
+    }
+    
+    private static String strip(String s) {
+        int indx = s.indexOf("__");
+        if (indx >= 0) {
+            return s.substring(0, indx);
+        } else {
+            return s;
+        }
+    }
+
+    private String findDataSpecified(ExecutableElement e, OnReceive onR) {
+        try {
+            return onR.data().getName();
+        } catch (MirroredTypeException ex) {
+            final TypeMirror tm = ex.getTypeMirror();
+            String name;
+            final Element te = processingEnv.getTypeUtils().asElement(tm);
+            if (te.getKind() == ElementKind.CLASS && tm.getKind() == TypeKind.ERROR) {
+                name = te.getSimpleName().toString();
+            } else {
+                name = tm.toString();
+            }
+            return "java.lang.Object".equals(name) ? null : name;
+        } catch (Exception ex) {
+            // fallback
+        }
+        
+        AnnotationMirror found = null;
+        for (AnnotationMirror am : e.getAnnotationMirrors()) {
+            if (am.getAnnotationType().toString().equals(OnReceive.class.getName())) {
+                found = am;
+            }
+        }
+        if (found == null) {
+            return null;
+        }
+        
+        for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : found.getElementValues().entrySet()) {
+            ExecutableElement ee = entry.getKey();
+            AnnotationValue av = entry.getValue();
+            if (ee.getSimpleName().contentEquals("data")) {
+                List<? extends Object> values = getAnnoValues(processingEnv, e, found);
+                for (Object v : values) {
+                    String sv = v.toString();
+                    if (sv.startsWith("data = ") && sv.endsWith(".class")) {
+                        return sv.substring(7, sv.length() - 6);
+                    }
+                }
+                return "error";
+            }
+        }
+        return null;
+    }
+
+    static List<? extends Object> getAnnoValues(ProcessingEnvironment pe, Element e, AnnotationMirror am) {
+        try {
+            Class<?> trees = Class.forName("com.sun.tools.javac.api.JavacTrees");
+            Method m = trees.getMethod("instance", ProcessingEnvironment.class);
+            Object instance = m.invoke(null, pe);
+            m = instance.getClass().getMethod("getPath", Element.class, AnnotationMirror.class);
+            Object path = m.invoke(instance, e, am);
+            m = path.getClass().getMethod("getLeaf");
+            Object leaf = m.invoke(path);
+            m = leaf.getClass().getMethod("getArguments");
+            return (List) m.invoke(leaf);
+        } catch (Exception ex) {
+            return Collections.emptyList();
+        }
+    }
+
+    private static class Prprt {
+        private final Element e;
+        private final AnnotationMirror tm;
+        private final Property p;
+
+        public Prprt(Element e, AnnotationMirror tm, Property p) {
+            this.e = e;
+            this.tm = tm;
+            this.p = p;
+        }
+        
+        String name() {
+            return p.name();
+        }
+        
+        boolean array() {
+            return p.array();
+        }
+
+        String typeName(ProcessingEnvironment env) {
+            RuntimeException ex;
+            try {
+                return p.type().getName();
+            } catch (IncompleteAnnotationException e) {
+                ex = e;
+            } catch (AnnotationTypeMismatchException e) {
+                ex = e;
+            }
+            for (Object v : getAnnoValues(env, e, tm)) {
+                String s = v.toString().replace(" ", "");
+                if (s.startsWith("type=") && s.endsWith(".class")) {
+                    return s.substring(5, s.length() - 6);
+                }
+            }
+            throw ex;
+        }
+        
+        
+        static Prprt[] wrap(ProcessingEnvironment pe, Element e, Property[] arr) {
+            if (arr.length == 0) {
+                return new Prprt[0];
+            }
+            
+            if (e.getKind() != ElementKind.CLASS) {
+                throw new IllegalStateException("" + e.getKind());
+            }
+            TypeElement te = (TypeElement)e;
+            List<? extends AnnotationValue> val = null;
+            for (AnnotationMirror an : te.getAnnotationMirrors()) {
+                for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : an.getElementValues().entrySet()) {
+                    if (entry.getKey().getSimpleName().contentEquals("properties")) {
+                        val = (List)entry.getValue().getValue();
+                        break;
+                    }
+                }
+            }
+            if (val == null || val.size() != arr.length) {
+                pe.getMessager().printMessage(Diagnostic.Kind.ERROR, "" + val, e);
+                return new Prprt[0];
+            }
+            Prprt[] ret = new Prprt[arr.length];
+            BIG: for (int i = 0; i < ret.length; i++) {
+                AnnotationMirror am = (AnnotationMirror)val.get(i).getValue();
+                ret[i] = new Prprt(e, am, arr[i]);
+                
+            }
+            return ret;
+        }
+    }
+
+    @Override
+    public Iterable<? extends Completion> getCompletions(Element element, AnnotationMirror annotation, ExecutableElement member, String userText) {
+        final Level l = Level.FINE;
+        LOG.log(l, " element: {0}", element);
+        LOG.log(l, " annotation: {0}", annotation);
+        LOG.log(l, " member: {0}", member);
+        LOG.log(l, " userText: {0}", userText);
+        LOG.log(l, "str: {0}", annotation.getAnnotationType().toString());
+        if (annotation.getAnnotationType().toString().equals(OnReceive.class.getName())) {
+            if (member.getSimpleName().contentEquals("method")) {
+                return Arrays.asList(
+                    methodOf("GET"),
+                    methodOf("POST"),
+                    methodOf("PUT"),
+                    methodOf("DELETE"),
+                    methodOf("HEAD"),
+                    methodOf("WebSocket")
+                );
+            }
+        }
+        
+        return super.getCompletions(element, annotation, member, userText);
+    }
+    
+    private static final Completion methodOf(String method) {
+        ResourceBundle rb = ResourceBundle.getBundle("org.netbeans.html.json.impl.Bundle");
+        return Completions.of('"' + method + '"', rb.getString("MSG_Completion_" + method));
+    }
+    
+    private boolean findOnError(ExecutableElement errElem, TypeElement te, String name, String className) {
+        String err = null;
+        METHODS:
+        for (Element e : te.getEnclosedElements()) {
+            if (e.getKind() != ElementKind.METHOD) {
+                continue;
+            }
+            if (!e.getSimpleName().contentEquals(name)) {
+                continue;
+            }
+            if (!e.getModifiers().contains(Modifier.STATIC)) {
+                errElem = (ExecutableElement) e;
+                err = "Would have to be static";
+                continue;
+            }
+            ExecutableElement ee = (ExecutableElement) e;
+            TypeMirror excType = processingEnv.getElementUtils().getTypeElement(Exception.class.getName()).asType();
+            final List<? extends VariableElement> params = ee.getParameters();
+            boolean error = false;
+            if (params.size() != 2) {
+                error = true;
+            } else {
+                String firstType = params.get(0).asType().toString();
+                int lastDot = firstType.lastIndexOf('.');
+                if (lastDot != -1) {
+                    firstType = firstType.substring(lastDot + 1);
+                }
+                if (!firstType.equals(className)) {
+                    error = true;
+                }
+                if (!processingEnv.getTypeUtils().isAssignable(excType, params.get(1).asType())) {
+                    error = true;
+                }
+            }
+            if (error) {
+                errElem = (ExecutableElement) e;
+                err = "Error method first argument needs to be " + className + " and second Exception";
+                continue;
+            }
+            return true;
+        }
+        if (err == null) {
+            err = "Cannot find " + name + "(" + className + ", Exception) method in this class";
+        }
+        error(err, errElem);
+        return false;
+    }
+    
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/netbeans/html/json/impl/PropertyBindingAccessor.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/main/java/org/netbeans/html/json/impl/PropertyBindingAccessor.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,135 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+import net.java.html.BrwsrCtx;
+import org.apidesign.html.json.spi.FunctionBinding;
+import org.apidesign.html.json.spi.JSONCall;
+import org.apidesign.html.json.spi.PropertyBinding;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public abstract class PropertyBindingAccessor {
+    private static PropertyBindingAccessor DEFAULT;
+
+    protected PropertyBindingAccessor() {
+        if (DEFAULT != null) throw new IllegalStateException();
+        DEFAULT = this;
+    }
+    
+    static {
+        JSON.initClass(PropertyBinding.class);
+    }
+
+    protected abstract <M> PropertyBinding newBinding(PBData<M> d);
+    protected abstract <M> FunctionBinding newFunction(FBData<M> d);
+    protected abstract JSONCall newCall(
+        BrwsrCtx ctx, RcvrJSON callback, String urlBefore, String urlAfter,
+        String method, Object data
+    );
+
+    
+    static <M> PropertyBinding create(PBData<M> d) {
+        return DEFAULT.newBinding(d);
+    }
+    static <M> FunctionBinding createFunction(FBData<M> d) {
+        return DEFAULT.newFunction(d);
+    }
+    static JSONCall createCall(
+        BrwsrCtx ctx, RcvrJSON callback, String urlBefore, String urlAfter, 
+        String method, Object data
+    ) {
+        return DEFAULT.newCall(ctx, callback, urlBefore, urlAfter, method, data);
+    }
+
+    public static final class PBData<M> {
+        public final String name;
+        public final boolean readOnly;
+        private final M model;
+        private final SetAndGet<M> access;
+        private final Bindings<?> bindings;
+
+        public PBData(Bindings<?> bindings, String name, M model, SetAndGet<M> access, boolean readOnly) {
+            this.bindings = bindings;
+            this.name = name;
+            this.model = model;
+            this.access = access;
+            this.readOnly = readOnly;
+        }
+
+        public void setValue(Object v) {
+            access.setValue(model, v);
+        }
+
+        public Object getValue() {
+            return access.getValue(model);
+        }
+
+        public boolean isReadOnly() {
+            return readOnly;
+        }
+
+        public Bindings getBindings() {
+            return bindings;
+        }
+    } // end of PBData
+    
+    public static final class FBData<M> {
+        public final String name;
+        private final M model;
+        private final Callback<M> access;
+
+        public FBData(String name, M model, Callback<M> access) {
+            this.name = name;
+            this.model = model;
+            this.access = access;
+        }
+
+
+        public void call(Object data, Object ev) {
+            access.call(model, data, ev);
+        }
+    } // end of FBData
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/netbeans/html/json/impl/RcvrJSON.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/main/java/org/netbeans/html/json/impl/RcvrJSON.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,149 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+import net.java.html.BrwsrCtx;
+
+/** Super type for those who wish to receive JSON messages.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public abstract class RcvrJSON {
+    protected void onOpen(MsgEvnt msg) {}
+    protected abstract void onMessage(MsgEvnt msg);
+    protected void onClose(MsgEvnt msg) {}
+    protected abstract void onError(MsgEvnt msg);
+    
+    public abstract static class MsgEvnt {
+        MsgEvnt() {
+        }
+        
+        public Throwable getError() {
+            return null;
+        }
+        
+        public final Exception getException() {
+            Throwable t = getError();
+            if (t instanceof Exception) {
+                return (Exception)t;
+            }
+            if (t == null) {
+                return null;
+            }
+            return new Exception(t);
+        }
+        
+        public int dataSize() {
+            return -1;
+        }
+        
+        public <Data> void dataRead(BrwsrCtx ctx, Class<? extends Data> type, Data[] fillTheArray) {
+        }
+
+        public abstract void dispatch(RcvrJSON r);
+        
+        public static MsgEvnt createError(final Throwable t) {
+            return new MsgEvnt() {
+                @Override
+                public Throwable getError() {
+                    return t;
+                }
+
+                @Override
+                public void dispatch(RcvrJSON r) {
+                    r.onError(this);
+                }
+            };
+        }
+        
+        public static MsgEvnt createMessage(final Object value) {
+            return new MsgEvnt() {
+                @Override
+                public int dataSize() {
+                    if (value instanceof Object[]) {
+                        return ((Object[])value).length;
+                    } else {
+                        return 1;
+                    }
+                }
+                
+                @Override
+                public <Data> void dataRead(BrwsrCtx context, Class<? extends Data> type, Data[] arr) {
+                    if (value instanceof Object[]) {
+                        Object[] data = ((Object[]) value);
+                        for (int i = 0; i < data.length && i < arr.length; i++) {
+                            arr[i] = org.netbeans.html.json.impl.JSON.read(context, type, data[i]);
+                        }
+                    } else {
+                        if (arr.length > 0) {
+                            arr[0] = org.netbeans.html.json.impl.JSON.read(context, type, value);
+                        }
+                    }
+                }
+                
+                @Override
+                public void dispatch(RcvrJSON r) {
+                    r.onMessage(this);
+                }
+            };
+        }
+        
+        public static MsgEvnt createOpen() {
+            return new MsgEvnt() {
+                @Override
+                public void dispatch(RcvrJSON r) {
+                    r.onOpen(this);
+                }
+            };
+        }
+
+        public static MsgEvnt createClose() {
+            return new MsgEvnt() {
+                @Override
+                public void dispatch(RcvrJSON r) {
+                    r.onClose(this);
+                }
+            };
+        }
+    } // end MsgEvnt
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/netbeans/html/json/impl/SetAndGet.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/main/java/org/netbeans/html/json/impl/SetAndGet.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,54 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+import org.apidesign.html.json.spi.PropertyBinding;
+
+/** A way to implement a {@link PropertyBinding}.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public interface SetAndGet<Data> {
+    public void setValue(Data data, Object value);
+    public Object getValue(Data data);
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/java/org/netbeans/html/json/impl/WrapperObject.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/main/java/org/netbeans/html/json/impl/WrapperObject.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,82 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+import java.util.Collection;
+import org.netbeans.html.json.impl.PropertyBindingAccessor.PBData;
+
+/** A way to extract real object from a model classes.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class WrapperObject {
+    private Object ko;
+    
+    private WrapperObject() {
+    }
+    
+    public void setRealObject(Object ko) {
+        this.ko = ko;
+    }
+    
+    public static Object find(Object object) {
+        return find(object, null);
+    }
+    
+    public static Object find(Object object, Bindings model) {
+        if (object == null) {
+            return null;
+        }
+        
+        if (object instanceof JSONList) {
+            return ((JSONList<?>)object).koData();
+        }
+        if (object instanceof Collection) {
+            return JSONList.koData((Collection<?>)object, model);
+        }
+        
+        WrapperObject ro = new WrapperObject();
+        object.equals(ro);
+        return ro.ko;
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/resources/org/apidesign/html/json/impl/Bundle.properties
--- a/json/src/main/resources/org/apidesign/html/json/impl/Bundle.properties	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-
-MSG_Completion_GET=The GET method means retrieve whatever information \
- (in the form of an entity) is identified by the Request-URI. \
- If the Request-URI refers to a data-producing process, \
- it is the produced data which shall be returned as the entity in \
- the response and not the source text of the process, \
- unless that text happens to be the output of the process.
-
-MSG_Completion_HEAD=The HEAD method is identical to GET except that the server \
- MUST NOT return a message-body in the response. The metainformation \
- contained in the HTTP headers in response to a HEAD request SHOULD be \
- identical to the information sent in response to a GET request. \
- This method can be used for obtaining metainformation about the entity implied \
- by the request without transferring the entity-body itself. \
- This method is often used for testing hypertext links for validity, \
- accessibility, and recent modification.
-
-MSG_Completion_POST=The POST method is used to request that the origin server \
- accept the entity enclosed in the request as a new subordinate of the resource \
- identified by the Request-URI in the Request-Line. POST is designed to allow \
- a uniform method to cover annotation of existing resources,\ 
- posting a message to a bulletin board, newsgroup, mailing list, or similar \
- group of articles, providing a block of data, such as the result of submitting a \
- form, to a data-handling process or extending a database through an append operation. \
- The actual function performed by the POST method is determined by the server \
- and is usually dependent on the Request-URI. The posted entity is subordinate \
- to that URI in the same way that a file is subordinate to a directory containing it, \
- a news article is subordinate to a newsgroup to which it is posted, \
- or a record is subordinate to a database.
-
-MSG_Completion_PUT=The PUT method requests that the enclosed entity be stored \
- under the supplied Request-URI. If the Request-URI refers to an already \
- existing resource, the enclosed entity SHOULD be considered as a modified \
- version of the one residing on the origin server. If the Request-URI does \
- not point to an existing resource, and that URI is capable of being defined \
- as a new resource by the requesting user agent, the origin server can \
- create the resource with that URI. If a new resource is created, the origin \
- server MUST inform the user agent via the 201 (Created) response. \
- If an existing resource is modified, either the 200 (OK) or 204 (No Content) \
- response codes SHOULD be sent to indicate successful completion of the request. \
- If the resource could not be created or modified with the Request-URI, an \
- appropriate error response SHOULD be given that reflects the nature of the problem. \
- The recipient of the entity MUST NOT ignore any Content-* (e.g. Content-Range) \
- headers that it does not understand or implement and MUST return \
- a 501 (Not Implemented) response in such cases.
-
-MSG_Completion_DELETE=The DELETE method requests that the origin server delete \
- the resource identified by the Request-URI. This method MAY be overridden \
- by human intervention (or other means) on the origin server. The client \
- cannot be guaranteed that the operation has been carried out, even if \
- the status code returned from the origin server indicates that the action \
- has been completed successfully. However, the server SHOULD NOT indicate \
- success unless, at the time the response is given, it intends to delete \
- the resource or move it to an inaccessible location.
-
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/resources/org/apidesign/html/json/spi/package.html
--- a/json/src/main/resources/org/apidesign/html/json/spi/package.html	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-<!--
-
-    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-    Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-    Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-    Other names may be trademarks of their respective owners.
-
-    The contents of this file are subject to the terms of either the GNU
-    General Public License Version 2 only ("GPL") or the Common
-    Development and Distribution License("CDDL") (collectively, the
-    "License"). You may not use this file except in compliance with the
-    License. You can obtain a copy of the License at
-    http://www.netbeans.org/cddl-gplv2.html
-    or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-    specific language governing permissions and limitations under the
-    License.  When distributing the software, include this License Header
-    Notice in each file and include the License file at
-    nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-    particular file as subject to the "Classpath" exception as provided
-    by Oracle in the GPL Version 2 section of the License file that
-    accompanied this code. If applicable, add the following below the
-    License Header, with the fields enclosed by brackets [] replaced by
-    your own identifying information:
-    "Portions Copyrighted [year] [name of copyright owner]"
-
-    Contributor(s):
-
-    The Original Software is NetBeans. The Initial Developer of the Original
-    Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
-
-    If you wish your version of this file to be governed by only the CDDL
-    or only the GPL Version 2, indicate your decision by adding
-    "[Contributor] elects to include this software in this distribution
-    under the [CDDL or GPL Version 2] license." If you do not indicate a
-    single choice of license, a recipient has the option to distribute
-    your version of this file under either the CDDL, the GPL Version 2 or
-    to extend the choice of license to its licensees as provided above.
-    However, if you add GPL Version 2 code and therefore, elected the GPL
-    Version 2 license, then the option applies only if the new code is
-    made subject to such option by the copyright holder.
-
--->
-<!DOCTYPE html>
-<html>
-    <head>
-        <title></title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>
-        <div>Implement 
-            <a href="Technology.html">Technology</a> and
-            <a href="Transfer.html">Transfer</a> and use 
-            <a href="ContextBuilder.html">ContextBuilder</a> to create an instance
-            of <code>Context</code> representing your technology.
-        </div>
-    </body>
-</html>
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/resources/org/netbeans/html/json/impl/Bundle.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/main/resources/org/netbeans/html/json/impl/Bundle.properties	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,97 @@
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#
+# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+# Other names may be trademarks of their respective owners.
+#
+# The contents of this file are subject to the terms of either the GNU
+# General Public License Version 2 only ("GPL") or the Common
+# Development and Distribution License("CDDL") (collectively, the
+# "License"). You may not use this file except in compliance with the
+# License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html
+# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+# specific language governing permissions and limitations under the
+# License.  When distributing the software, include this License Header
+# Notice in each file and include the License file at
+# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that
+# accompanied this code. If applicable, add the following below the
+# License Header, with the fields enclosed by brackets [] replaced by
+# your own identifying information:
+# "Portions Copyrighted [year] [name of copyright owner]"
+#
+# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original
+# Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL
+# or only the GPL Version 2, indicate your decision by adding
+# "[Contributor] elects to include this software in this distribution
+# under the [CDDL or GPL Version 2] license." If you do not indicate a
+# single choice of license, a recipient has the option to distribute
+# your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above.
+# However, if you add GPL Version 2 code and therefore, elected the GPL
+# Version 2 license, then the option applies only if the new code is
+# made subject to such option by the copyright holder.
+#
+
+MSG_Completion_GET=The GET method means retrieve whatever information \
+ (in the form of an entity) is identified by the Request-URI. \
+ If the Request-URI refers to a data-producing process, \
+ it is the produced data which shall be returned as the entity in \
+ the response and not the source text of the process, \
+ unless that text happens to be the output of the process.
+
+MSG_Completion_HEAD=The HEAD method is identical to GET except that the server \
+ MUST NOT return a message-body in the response. The metainformation \
+ contained in the HTTP headers in response to a HEAD request SHOULD be \
+ identical to the information sent in response to a GET request. \
+ This method can be used for obtaining metainformation about the entity implied \
+ by the request without transferring the entity-body itself. \
+ This method is often used for testing hypertext links for validity, \
+ accessibility, and recent modification.
+
+MSG_Completion_POST=The POST method is used to request that the origin server \
+ accept the entity enclosed in the request as a new subordinate of the resource \
+ identified by the Request-URI in the Request-Line. POST is designed to allow \
+ a uniform method to cover annotation of existing resources,\ 
+ posting a message to a bulletin board, newsgroup, mailing list, or similar \
+ group of articles, providing a block of data, such as the result of submitting a \
+ form, to a data-handling process or extending a database through an append operation. \
+ The actual function performed by the POST method is determined by the server \
+ and is usually dependent on the Request-URI. The posted entity is subordinate \
+ to that URI in the same way that a file is subordinate to a directory containing it, \
+ a news article is subordinate to a newsgroup to which it is posted, \
+ or a record is subordinate to a database.
+
+MSG_Completion_PUT=The PUT method requests that the enclosed entity be stored \
+ under the supplied Request-URI. If the Request-URI refers to an already \
+ existing resource, the enclosed entity SHOULD be considered as a modified \
+ version of the one residing on the origin server. If the Request-URI does \
+ not point to an existing resource, and that URI is capable of being defined \
+ as a new resource by the requesting user agent, the origin server can \
+ create the resource with that URI. If a new resource is created, the origin \
+ server MUST inform the user agent via the 201 (Created) response. \
+ If an existing resource is modified, either the 200 (OK) or 204 (No Content) \
+ response codes SHOULD be sent to indicate successful completion of the request. \
+ If the resource could not be created or modified with the Request-URI, an \
+ appropriate error response SHOULD be given that reflects the nature of the problem. \
+ The recipient of the entity MUST NOT ignore any Content-* (e.g. Content-Range) \
+ headers that it does not understand or implement and MUST return \
+ a 501 (Not Implemented) response in such cases.
+
+MSG_Completion_DELETE=The DELETE method requests that the origin server delete \
+ the resource identified by the Request-URI. This method MAY be overridden \
+ by human intervention (or other means) on the origin server. The client \
+ cannot be guaranteed that the operation has been carried out, even if \
+ the status code returned from the origin server indicates that the action \
+ has been completed successfully. However, the server SHOULD NOT indicate \
+ success unless, at the time the response is given, it intends to delete \
+ the resource or move it to an inaccessible location.
+
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/main/resources/org/netbeans/html/json/spi/package.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/main/resources/org/netbeans/html/json/spi/package.html	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,59 @@
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+
+    Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+    Other names may be trademarks of their respective owners.
+
+    The contents of this file are subject to the terms of either the GNU
+    General Public License Version 2 only ("GPL") or the Common
+    Development and Distribution License("CDDL") (collectively, the
+    "License"). You may not use this file except in compliance with the
+    License. You can obtain a copy of the License at
+    http://www.netbeans.org/cddl-gplv2.html
+    or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+    specific language governing permissions and limitations under the
+    License.  When distributing the software, include this License Header
+    Notice in each file and include the License file at
+    nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+    particular file as subject to the "Classpath" exception as provided
+    by Oracle in the GPL Version 2 section of the License file that
+    accompanied this code. If applicable, add the following below the
+    License Header, with the fields enclosed by brackets [] replaced by
+    your own identifying information:
+    "Portions Copyrighted [year] [name of copyright owner]"
+
+    Contributor(s):
+
+    The Original Software is NetBeans. The Initial Developer of the Original
+    Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+
+    If you wish your version of this file to be governed by only the CDDL
+    or only the GPL Version 2, indicate your decision by adding
+    "[Contributor] elects to include this software in this distribution
+    under the [CDDL or GPL Version 2] license." If you do not indicate a
+    single choice of license, a recipient has the option to distribute
+    your version of this file under either the CDDL, the GPL Version 2 or
+    to extend the choice of license to its licensees as provided above.
+    However, if you add GPL Version 2 code and therefore, elected the GPL
+    Version 2 license, then the option applies only if the new code is
+    made subject to such option by the copyright holder.
+
+-->
+<!DOCTYPE html>
+<html>
+    <head>
+        <title></title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head>
+    <body>
+        <div>Implement 
+            <a href="Technology.html">Technology</a> and
+            <a href="Transfer.html">Transfer</a> and use 
+            <a href="ContextBuilder.html">ContextBuilder</a> to create an instance
+            of <code>Context</code> representing your technology.
+        </div>
+    </body>
+</html>
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/test/java/net/java/html/json/MapModelTest.java
--- a/json/src/test/java/net/java/html/json/MapModelTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/json/src/test/java/net/java/html/json/MapModelTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -49,7 +49,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.apidesign.html.context.spi.Contexts;
-import org.apidesign.html.json.impl.WrapperObject;
+import org.netbeans.html.json.impl.WrapperObject;
 import org.apidesign.html.json.spi.FunctionBinding;
 import org.apidesign.html.json.spi.JSONCall;
 import org.apidesign.html.json.spi.PropertyBinding;
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/test/java/net/java/html/json/TypesTest.java
--- a/json/src/test/java/net/java/html/json/TypesTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ b/json/src/test/java/net/java/html/json/TypesTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -46,7 +46,7 @@
 import java.util.Map;
 import net.java.html.json.MapModelTest.One;
 import org.apidesign.html.context.spi.Contexts;
-import org.apidesign.html.json.impl.WrapperObject;
+import org.netbeans.html.json.impl.WrapperObject;
 import org.apidesign.html.json.spi.Technology;
 import org.apidesign.html.json.spi.Transfer;
 import org.testng.annotations.BeforeMethod;
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/test/java/org/apidesign/html/json/impl/ConstructorTest.java
--- a/json/src/test/java/org/apidesign/html/json/impl/ConstructorTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-import net.java.html.json.Model;
-import net.java.html.json.Property;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertEquals;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Model(className="Man", properties={
-    @Property(name = "name", type = String.class),
-    @Property(name = "other", type = Address.class, array = true),
-    @Property(name = "primary", type = Address.class),
-    @Property(name = "childrenNames", type = String.class, array = true)
-})
-public class ConstructorTest {
-    @Model(className = "Address", properties = {
-        @Property(name = "place", type = String.class)
-    })
-    static final class AddressModel {
-    }
-    
-    @Test public void initializedByDefault() {
-        Man m = new Man();
-        assertNotNull(m.getPrimary(), "Single subobjects are initialized");
-    }
-    
-    @Test public void hasRichConstructor() {
-        Man m = new Man("Jarda", new Address("home"), new Address("work"), new Address("hotel"));
-        assertEquals(m.getName(), "Jarda");
-        assertNotNull(m.getPrimary(), "Primary address specified");
-        assertNotNull(m.getPrimary().getPlace(), "home");
-        assertEquals(m.getOther().size(), 2, "Two other addresses");
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/test/java/org/apidesign/html/json/impl/EmployeeImpl.java
--- a/json/src/test/java/org/apidesign/html/json/impl/EmployeeImpl.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-import net.java.html.json.Model;
-import net.java.html.json.OnReceive;
-import net.java.html.json.Person;
-import net.java.html.json.Property;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Model(className = "Employee", properties = {
-    @Property(name = "person", type = Person.class),
-    @Property(name = "employer", type = Employer.class)
-})
-public class EmployeeImpl {
-    @OnReceive(url = "some/url")
-    static void changePersonality(Employee e, Person p) {
-        e.setPerson(p);
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/test/java/org/apidesign/html/json/impl/EmployerTest.java
--- a/json/src/test/java/org/apidesign/html/json/impl/EmployerTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-import net.java.html.BrwsrCtx;
-import net.java.html.json.Model;
-import net.java.html.json.Models;
-import net.java.html.json.Property;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Model(className = "Employer", properties = {
-    @Property(name = "name", type = String.class)
-})
-public class EmployerTest {
-    @Test public void preLoadsTheClass() {
-        Employer em = Models.fromRaw(BrwsrCtx.EMPTY, Employer.class, this);
-        Assert.assertNotNull(em, "Class loaded");
-        em.applyBindings();
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/test/java/org/apidesign/html/json/impl/JSONListTest.java
--- a/json/src/test/java/org/apidesign/html/json/impl/JSONListTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,192 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-import net.java.html.BrwsrCtx;
-import net.java.html.json.Models;
-import net.java.html.json.People;
-import net.java.html.json.Person;
-import net.java.html.json.Sex;
-import org.apidesign.html.context.spi.Contexts;
-import org.apidesign.html.json.spi.FunctionBinding;
-import org.apidesign.html.json.spi.PropertyBinding;
-import org.apidesign.html.json.spi.Technology;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class JSONListTest implements Technology<Object> {
-    private boolean replaceArray;
-    private final Map<String,PropertyBinding> bindings = new HashMap<String,PropertyBinding>();
-    
-    public JSONListTest() {
-    }
-    
-    @BeforeMethod public void clear() {
-        replaceArray = false;
-    }
-
-    @Test public void testConvertorOnAnObject() {
-        BrwsrCtx c = Contexts.newBuilder().register(Technology.class, this, 1).build();
-        
-        Person p = Models.bind(new Person(), c);
-        p.setFirstName("1");
-        p.setLastName("2");
-        p.setSex(Sex.MALE);
-
-        Object real = WrapperObject.find(p);
-        assertEquals(this, real, "I am the right model");
-    }
-    
-    @Test public void testConvertorOnAnArray() {
-        BrwsrCtx c = Contexts.newBuilder().register(Technology.class, this, 1).build();
-        
-        Person p = Models.bind(new Person(), c);
-        p.setFirstName("1");
-        p.setLastName("2");
-        p.setSex(Sex.MALE);
-        
-        People people = Models.bind(new People(p), c).applyBindings();
-        assertEquals(people.getInfo().toString(), "[{\"firstName\":\"1\",\"lastName\":\"2\",\"sex\":\"MALE\"}]", "Converted to real JSON");
-        
-        PropertyBinding pb = bindings.get("info");
-        assertNotNull(pb, "Binding for info found");
-        
-        Object real = pb.getValue();
-        assertTrue(real instanceof Object[], "It is an array: " + real);
-        Object[] arr = (Object[])real;
-        assertEquals(arr.length, 1, "Size is one");
-        assertEquals(this, arr[0], "I am the right model");
-    }
-    
-    @Test public void testNicknames() {
-        BrwsrCtx c = Contexts.newBuilder().register(Technology.class, this, 1).build();
-        
-        People people = Models.bind(new People(), c).applyBindings();
-        people.getNicknames().add("One");
-        people.getNicknames().add("Two");
-        
-        PropertyBinding pb = bindings.get("nicknames");
-        assertNotNull(pb, "Binding for info found");
-        
-        Object real = pb.getValue();
-        assertTrue(real instanceof Object[], "It is an array: " + real);
-        Object[] arr = (Object[])real;
-        assertEquals(arr.length, 2, "Length two");
-        assertEquals(arr[0], "One", "Text should be in the model");
-        assertEquals(arr[1], "Two", "2nd text in the model");
-    }
-    
-    @Test public void testConvertorOnAnArrayWithWrapper() {
-        this.replaceArray = true;
-        BrwsrCtx c = Contexts.newBuilder().register(Technology.class, this, 1).build();
-        
-        Person p = Models.bind(new Person(), c);
-        p.setFirstName("1");
-        p.setLastName("2");
-        p.setSex(Sex.MALE);
-        
-        People people = Models.bind(new People(), c).applyBindings();
-        people.getInfo().add(p);
-        
-        Object real = WrapperObject.find(people.getInfo());
-        assertEquals(real, this, "I am the model of the array");
-    }
-
-    @Test public void bindingsOnArray() {
-        this.replaceArray = true;
-        BrwsrCtx c = Contexts.newBuilder().register(Technology.class, this, 1).build();
-        
-        People p = Models.bind(new People(), c).applyBindings();
-        p.getAge().add(30);
-        
-        PropertyBinding pb = bindings.get("age");
-        assertNotNull(pb, "There is a binding for age list");
-        
-        assertEquals(pb.getValue(), this, "I am the model of the array");
-    }
-
-    @Override
-    public Object wrapModel(Object model) {
-        return this;
-    }
-
-    @Override
-    public void bind(PropertyBinding b, Object model, Object data) {
-        bindings.put(b.getPropertyName(), b);
-    }
-
-    @Override
-    public void valueHasMutated(Object data, String propertyName) {
-    }
-
-    @Override
-    public void expose(FunctionBinding fb, Object model, Object d) {
-    }
-
-    @Override
-    public void applyBindings(Object data) {
-    }
-
-    @Override
-    public Object wrapArray(Object[] arr) {
-        return replaceArray ? this : arr;
-    }
-
-    @Override
-    public <M> M toModel(Class<M> modelClass, Object data) {
-        return modelClass.cast(data);
-    }
-
-    @Override
-    public void runSafe(Runnable r) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/test/java/org/apidesign/html/json/impl/JSONTest.java
--- a/json/src/test/java/org/apidesign/html/json/impl/JSONTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class JSONTest {
-    
-    public JSONTest() {
-    }
-
-    @Test public void longToStringValue() {
-        assertEquals(JSON.stringValue(Long.valueOf(1)), "1");
-    }
-    
-    @Test public void booleanIsSortOfNumber() {
-        assertEquals(JSON.numberValue(Boolean.TRUE), Integer.valueOf(1));
-        assertEquals(JSON.numberValue(Boolean.FALSE), Integer.valueOf(0));
-    }
-    
-    @Test public void numberToChar() {
-        assertEquals(JSON.charValue(65), Character.valueOf('A'));
-    }
-    @Test public void booleanToChar() {
-        assertEquals(JSON.charValue(false), Character.valueOf((char)0));
-        assertEquals(JSON.charValue(true), Character.valueOf((char)1));
-    }
-    @Test public void stringToChar() {
-        assertEquals(JSON.charValue("Ahoj"), Character.valueOf('A'));
-    }
-    @Test public void stringToBoolean() {
-        assertEquals(JSON.boolValue("false"), Boolean.FALSE);
-        assertEquals(JSON.boolValue("True"), Boolean.TRUE);
-    }
-    @Test public void numberToBoolean() {
-        assertEquals(JSON.boolValue(0), Boolean.FALSE);
-        assertEquals(JSON.boolValue(1), Boolean.TRUE);
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/test/java/org/apidesign/html/json/impl/NoPropertiesTest.java
--- a/json/src/test/java/org/apidesign/html/json/impl/NoPropertiesTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.json.impl;
-
-import net.java.html.json.Model;
-
-/** Originally could not compile.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Model(className="NoProperties", properties = {
-})
-public class NoPropertiesTest {
-    
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/test/java/org/netbeans/html/json/impl/ConstructorTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/test/java/org/netbeans/html/json/impl/ConstructorTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,80 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+import net.java.html.json.Model;
+import net.java.html.json.Property;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Model(className="Man", properties={
+    @Property(name = "name", type = String.class),
+    @Property(name = "other", type = Address.class, array = true),
+    @Property(name = "primary", type = Address.class),
+    @Property(name = "childrenNames", type = String.class, array = true)
+})
+public class ConstructorTest {
+    @Model(className = "Address", properties = {
+        @Property(name = "place", type = String.class)
+    })
+    static final class AddressModel {
+    }
+    
+    @Test public void initializedByDefault() {
+        Man m = new Man();
+        assertNotNull(m.getPrimary(), "Single subobjects are initialized");
+    }
+    
+    @Test public void hasRichConstructor() {
+        Man m = new Man("Jarda", new Address("home"), new Address("work"), new Address("hotel"));
+        assertEquals(m.getName(), "Jarda");
+        assertNotNull(m.getPrimary(), "Primary address specified");
+        assertNotNull(m.getPrimary().getPlace(), "home");
+        assertEquals(m.getOther().size(), 2, "Two other addresses");
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/test/java/org/netbeans/html/json/impl/EmployeeImpl.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/test/java/org/netbeans/html/json/impl/EmployeeImpl.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,63 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+import net.java.html.json.Model;
+import net.java.html.json.OnReceive;
+import net.java.html.json.Person;
+import net.java.html.json.Property;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Model(className = "Employee", properties = {
+    @Property(name = "person", type = Person.class),
+    @Property(name = "employer", type = Employer.class)
+})
+public class EmployeeImpl {
+    @OnReceive(url = "some/url")
+    static void changePersonality(Employee e, Person p) {
+        e.setPerson(p);
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/test/java/org/netbeans/html/json/impl/EmployerTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/test/java/org/netbeans/html/json/impl/EmployerTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,65 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+import net.java.html.BrwsrCtx;
+import net.java.html.json.Model;
+import net.java.html.json.Models;
+import net.java.html.json.Property;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Model(className = "Employer", properties = {
+    @Property(name = "name", type = String.class)
+})
+public class EmployerTest {
+    @Test public void preLoadsTheClass() {
+        Employer em = Models.fromRaw(BrwsrCtx.EMPTY, Employer.class, this);
+        Assert.assertNotNull(em, "Class loaded");
+        em.applyBindings();
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/test/java/org/netbeans/html/json/impl/JSONListTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/test/java/org/netbeans/html/json/impl/JSONListTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,192 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+import net.java.html.BrwsrCtx;
+import net.java.html.json.Models;
+import net.java.html.json.People;
+import net.java.html.json.Person;
+import net.java.html.json.Sex;
+import org.apidesign.html.context.spi.Contexts;
+import org.apidesign.html.json.spi.FunctionBinding;
+import org.apidesign.html.json.spi.PropertyBinding;
+import org.apidesign.html.json.spi.Technology;
+import static org.testng.Assert.*;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class JSONListTest implements Technology<Object> {
+    private boolean replaceArray;
+    private final Map<String,PropertyBinding> bindings = new HashMap<String,PropertyBinding>();
+    
+    public JSONListTest() {
+    }
+    
+    @BeforeMethod public void clear() {
+        replaceArray = false;
+    }
+
+    @Test public void testConvertorOnAnObject() {
+        BrwsrCtx c = Contexts.newBuilder().register(Technology.class, this, 1).build();
+        
+        Person p = Models.bind(new Person(), c);
+        p.setFirstName("1");
+        p.setLastName("2");
+        p.setSex(Sex.MALE);
+
+        Object real = WrapperObject.find(p);
+        assertEquals(this, real, "I am the right model");
+    }
+    
+    @Test public void testConvertorOnAnArray() {
+        BrwsrCtx c = Contexts.newBuilder().register(Technology.class, this, 1).build();
+        
+        Person p = Models.bind(new Person(), c);
+        p.setFirstName("1");
+        p.setLastName("2");
+        p.setSex(Sex.MALE);
+        
+        People people = Models.bind(new People(p), c).applyBindings();
+        assertEquals(people.getInfo().toString(), "[{\"firstName\":\"1\",\"lastName\":\"2\",\"sex\":\"MALE\"}]", "Converted to real JSON");
+        
+        PropertyBinding pb = bindings.get("info");
+        assertNotNull(pb, "Binding for info found");
+        
+        Object real = pb.getValue();
+        assertTrue(real instanceof Object[], "It is an array: " + real);
+        Object[] arr = (Object[])real;
+        assertEquals(arr.length, 1, "Size is one");
+        assertEquals(this, arr[0], "I am the right model");
+    }
+    
+    @Test public void testNicknames() {
+        BrwsrCtx c = Contexts.newBuilder().register(Technology.class, this, 1).build();
+        
+        People people = Models.bind(new People(), c).applyBindings();
+        people.getNicknames().add("One");
+        people.getNicknames().add("Two");
+        
+        PropertyBinding pb = bindings.get("nicknames");
+        assertNotNull(pb, "Binding for info found");
+        
+        Object real = pb.getValue();
+        assertTrue(real instanceof Object[], "It is an array: " + real);
+        Object[] arr = (Object[])real;
+        assertEquals(arr.length, 2, "Length two");
+        assertEquals(arr[0], "One", "Text should be in the model");
+        assertEquals(arr[1], "Two", "2nd text in the model");
+    }
+    
+    @Test public void testConvertorOnAnArrayWithWrapper() {
+        this.replaceArray = true;
+        BrwsrCtx c = Contexts.newBuilder().register(Technology.class, this, 1).build();
+        
+        Person p = Models.bind(new Person(), c);
+        p.setFirstName("1");
+        p.setLastName("2");
+        p.setSex(Sex.MALE);
+        
+        People people = Models.bind(new People(), c).applyBindings();
+        people.getInfo().add(p);
+        
+        Object real = WrapperObject.find(people.getInfo());
+        assertEquals(real, this, "I am the model of the array");
+    }
+
+    @Test public void bindingsOnArray() {
+        this.replaceArray = true;
+        BrwsrCtx c = Contexts.newBuilder().register(Technology.class, this, 1).build();
+        
+        People p = Models.bind(new People(), c).applyBindings();
+        p.getAge().add(30);
+        
+        PropertyBinding pb = bindings.get("age");
+        assertNotNull(pb, "There is a binding for age list");
+        
+        assertEquals(pb.getValue(), this, "I am the model of the array");
+    }
+
+    @Override
+    public Object wrapModel(Object model) {
+        return this;
+    }
+
+    @Override
+    public void bind(PropertyBinding b, Object model, Object data) {
+        bindings.put(b.getPropertyName(), b);
+    }
+
+    @Override
+    public void valueHasMutated(Object data, String propertyName) {
+    }
+
+    @Override
+    public void expose(FunctionBinding fb, Object model, Object d) {
+    }
+
+    @Override
+    public void applyBindings(Object data) {
+    }
+
+    @Override
+    public Object wrapArray(Object[] arr) {
+        return replaceArray ? this : arr;
+    }
+
+    @Override
+    public <M> M toModel(Class<M> modelClass, Object data) {
+        return modelClass.cast(data);
+    }
+
+    @Override
+    public void runSafe(Runnable r) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/test/java/org/netbeans/html/json/impl/JSONTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/test/java/org/netbeans/html/json/impl/JSONTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,85 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+import org.netbeans.html.json.impl.JSON;
+import static org.testng.Assert.*;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class JSONTest {
+    
+    public JSONTest() {
+    }
+
+    @Test public void longToStringValue() {
+        assertEquals(JSON.stringValue(Long.valueOf(1)), "1");
+    }
+    
+    @Test public void booleanIsSortOfNumber() {
+        assertEquals(JSON.numberValue(Boolean.TRUE), Integer.valueOf(1));
+        assertEquals(JSON.numberValue(Boolean.FALSE), Integer.valueOf(0));
+    }
+    
+    @Test public void numberToChar() {
+        assertEquals(JSON.charValue(65), Character.valueOf('A'));
+    }
+    @Test public void booleanToChar() {
+        assertEquals(JSON.charValue(false), Character.valueOf((char)0));
+        assertEquals(JSON.charValue(true), Character.valueOf((char)1));
+    }
+    @Test public void stringToChar() {
+        assertEquals(JSON.charValue("Ahoj"), Character.valueOf('A'));
+    }
+    @Test public void stringToBoolean() {
+        assertEquals(JSON.boolValue("false"), Boolean.FALSE);
+        assertEquals(JSON.boolValue("True"), Boolean.TRUE);
+    }
+    @Test public void numberToBoolean() {
+        assertEquals(JSON.boolValue(0), Boolean.FALSE);
+        assertEquals(JSON.boolValue(1), Boolean.TRUE);
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e json/src/test/java/org/netbeans/html/json/impl/NoPropertiesTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/src/test/java/org/netbeans/html/json/impl/NoPropertiesTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,55 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.json.impl;
+
+import net.java.html.json.Model;
+
+/** Originally could not compile.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Model(className="NoProperties", properties = {
+})
+public class NoPropertiesTest {
+    
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-archetype-test/src/test/java/org/apidesign/html/archetype/test/ArchetypeVersionTest.java
--- a/ko-archetype-test/src/test/java/org/apidesign/html/archetype/test/ArchetypeVersionTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.archetype.test;
-
-import java.io.IOException;
-import java.net.URL;
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-import javax.xml.xpath.XPathFactoryConfigurationException;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeClass;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class ArchetypeVersionTest {
-    private String version;
-    
-    public ArchetypeVersionTest() {
-    }
-    
-    @BeforeClass public void readCurrentVersion() throws Exception {
-        version = findCurrentVersion();
-        assertFalse(version.isEmpty(), "There should be some version string");
-    }
-    
-
-    @Test public void testComparePomDepsVersions() throws Exception {
-        final ClassLoader l = ArchetypeVersionTest.class.getClassLoader();
-        URL r = l.getResource("archetype-resources/pom.xml");
-        assertNotNull(r, "Archetype pom found");
-        
-        final XPathFactory fact = XPathFactory.newInstance();
-        XPathExpression xp2 = fact.newXPath().compile(
-            "//properties/net.java.html.version/text()"
-        );
-        
-        Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(r.openStream());
-        String arch = (String) xp2.evaluate(dom, XPathConstants.STRING);
-
-        assertEquals(arch, version, "net.java.html.json dependency needs to be on latest version");
-    }
-    
-    @Test public void testNbActions() throws Exception {
-        final ClassLoader l = ArchetypeVersionTest.class.getClassLoader();
-        URL r = l.getResource("archetype-resources/nbactions.xml");
-        assertNotNull(r, "Archetype nb file found");
-        
-        final XPathFactory fact = XPathFactory.newInstance();
-        XPathExpression xp2 = fact.newXPath().compile(
-            "//goal/text()"
-        );
-        
-        Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(r.openStream());
-        NodeList goals = (NodeList) xp2.evaluate(dom, XPathConstants.NODESET);
-        
-        for (int i = 0; i < goals.getLength(); i++) {
-            String s = goals.item(i).getTextContent();
-            if (s.contains("apidesign")) {
-                assertFalse(s.matches(".*apidesign.*[0-9].*"), "No numbers: " + s);
-            }
-        }
-    }
-
-    static String findCurrentVersion() throws XPathExpressionException, IOException, ParserConfigurationException, SAXException, XPathFactoryConfigurationException {
-        final ClassLoader l = ArchetypeVersionTest.class.getClassLoader();
-        URL u = l.getResource("META-INF/maven/org.netbeans.html/knockout4j-archetype/pom.xml");
-        assertNotNull(u, "Own pom found: " + System.getProperty("java.class.path"));
-
-        final XPathFactory fact = XPathFactory.newInstance();
-        fact.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-
-        XPathExpression xp = fact.newXPath().compile("project/version/text()");
-        
-        Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(u.openStream());
-        return xp.evaluate(dom);
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-archetype-test/src/test/java/org/apidesign/html/archetype/test/VerifyArchetypeTest.java
--- a/ko-archetype-test/src/test/java/org/apidesign/html/archetype/test/VerifyArchetypeTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.archetype.test;
-
-import java.io.File;
-import java.util.Properties;
-import org.apache.maven.it.Verifier;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class VerifyArchetypeTest {
-    @Test public void projectCompiles() throws Exception {
-        final File dir = new File("target/tests/fxcompile/").getAbsoluteFile();
-        generateFromArchetype(dir);
-        
-        File created = new File(dir, "o-a-test");
-        assertTrue(created.isDirectory(), "Project created");
-        assertTrue(new File(created, "pom.xml").isFile(), "Pom file is in there");
-        
-        Verifier v = new Verifier(created.getAbsolutePath());
-        v.executeGoal("verify");
-        
-        v.verifyErrorFreeLog();
-        
-        for (String l : v.loadFile(v.getBasedir(), v.getLogFileName(), false)) {
-            if (l.contains("j2js")) {
-                fail("No pre-compilaton:\n" + l);
-            }
-        }
-        
-        v.verifyTextInLog("fxcompile/o-a-test/target/o-a-test-1.0-SNAPSHOT-html.java.net.zip");
-    }
-    
-    private Verifier generateFromArchetype(final File dir, String... params) throws Exception {
-        Verifier v = new Verifier(dir.getAbsolutePath());
-        v.setAutoclean(false);
-        v.setLogFileName("generate.log");
-        v.deleteDirectory("");
-        dir.mkdirs();
-        Properties sysProp = v.getSystemProperties();
-        sysProp.put("groupId", "org.apidesign.test");
-        sysProp.put("artifactId", "o-a-test");
-        sysProp.put("package", "org.apidesign.test.oat");
-        sysProp.put("archetypeGroupId", "org.apidesign.html");
-        sysProp.put("archetypeArtifactId", "knockout4j-archetype");
-        sysProp.put("archetypeVersion", ArchetypeVersionTest.findCurrentVersion());
-        
-        for (String p : params) {
-            v.addCliOption(p);
-        }
-        v.executeGoal("archetype:generate");
-        v.verifyErrorFreeLog();
-        return v;
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-archetype-test/src/test/java/org/netbeans/html/archetype/test/ArchetypeVersionTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-archetype-test/src/test/java/org/netbeans/html/archetype/test/ArchetypeVersionTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,128 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.archetype.test;
+
+import java.io.IOException;
+import java.net.URL;
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import javax.xml.xpath.XPathFactoryConfigurationException;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+import org.testng.annotations.BeforeClass;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class ArchetypeVersionTest {
+    private String version;
+    
+    public ArchetypeVersionTest() {
+    }
+    
+    @BeforeClass public void readCurrentVersion() throws Exception {
+        version = findCurrentVersion();
+        assertFalse(version.isEmpty(), "There should be some version string");
+    }
+    
+
+    @Test public void testComparePomDepsVersions() throws Exception {
+        final ClassLoader l = ArchetypeVersionTest.class.getClassLoader();
+        URL r = l.getResource("archetype-resources/pom.xml");
+        assertNotNull(r, "Archetype pom found");
+        
+        final XPathFactory fact = XPathFactory.newInstance();
+        XPathExpression xp2 = fact.newXPath().compile(
+            "//properties/net.java.html.version/text()"
+        );
+        
+        Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(r.openStream());
+        String arch = (String) xp2.evaluate(dom, XPathConstants.STRING);
+
+        assertEquals(arch, version, "net.java.html.json dependency needs to be on latest version");
+    }
+    
+    @Test public void testNbActions() throws Exception {
+        final ClassLoader l = ArchetypeVersionTest.class.getClassLoader();
+        URL r = l.getResource("archetype-resources/nbactions.xml");
+        assertNotNull(r, "Archetype nb file found");
+        
+        final XPathFactory fact = XPathFactory.newInstance();
+        XPathExpression xp2 = fact.newXPath().compile(
+            "//goal/text()"
+        );
+        
+        Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(r.openStream());
+        NodeList goals = (NodeList) xp2.evaluate(dom, XPathConstants.NODESET);
+        
+        for (int i = 0; i < goals.getLength(); i++) {
+            String s = goals.item(i).getTextContent();
+            if (s.contains("apidesign")) {
+                assertFalse(s.matches(".*apidesign.*[0-9].*"), "No numbers: " + s);
+            }
+        }
+    }
+
+    static String findCurrentVersion() throws XPathExpressionException, IOException, ParserConfigurationException, SAXException, XPathFactoryConfigurationException {
+        final ClassLoader l = ArchetypeVersionTest.class.getClassLoader();
+        URL u = l.getResource("META-INF/maven/org.netbeans.html/knockout4j-archetype/pom.xml");
+        assertNotNull(u, "Own pom found: " + System.getProperty("java.class.path"));
+
+        final XPathFactory fact = XPathFactory.newInstance();
+        fact.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+
+        XPathExpression xp = fact.newXPath().compile("project/version/text()");
+        
+        Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(u.openStream());
+        return xp.evaluate(dom);
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-archetype-test/src/test/java/org/netbeans/html/archetype/test/VerifyArchetypeTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-archetype-test/src/test/java/org/netbeans/html/archetype/test/VerifyArchetypeTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,99 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.archetype.test;
+
+import java.io.File;
+import java.util.Properties;
+import org.apache.maven.it.Verifier;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class VerifyArchetypeTest {
+    @Test public void projectCompiles() throws Exception {
+        final File dir = new File("target/tests/fxcompile/").getAbsoluteFile();
+        generateFromArchetype(dir);
+        
+        File created = new File(dir, "o-a-test");
+        assertTrue(created.isDirectory(), "Project created");
+        assertTrue(new File(created, "pom.xml").isFile(), "Pom file is in there");
+        
+        Verifier v = new Verifier(created.getAbsolutePath());
+        v.executeGoal("verify");
+        
+        v.verifyErrorFreeLog();
+        
+        for (String l : v.loadFile(v.getBasedir(), v.getLogFileName(), false)) {
+            if (l.contains("j2js")) {
+                fail("No pre-compilaton:\n" + l);
+            }
+        }
+        
+        v.verifyTextInLog("fxcompile/o-a-test/target/o-a-test-1.0-SNAPSHOT-html.java.net.zip");
+    }
+    
+    private Verifier generateFromArchetype(final File dir, String... params) throws Exception {
+        Verifier v = new Verifier(dir.getAbsolutePath());
+        v.setAutoclean(false);
+        v.setLogFileName("generate.log");
+        v.deleteDirectory("");
+        dir.mkdirs();
+        Properties sysProp = v.getSystemProperties();
+        sysProp.put("groupId", "org.apidesign.test");
+        sysProp.put("artifactId", "o-a-test");
+        sysProp.put("package", "org.apidesign.test.oat");
+        sysProp.put("archetypeGroupId", "org.apidesign.html");
+        sysProp.put("archetypeArtifactId", "knockout4j-archetype");
+        sysProp.put("archetypeVersion", ArchetypeVersionTest.findCurrentVersion());
+        
+        for (String p : params) {
+            v.addCliOption(p);
+        }
+        v.executeGoal("archetype:generate");
+        v.verifyErrorFreeLog();
+        return v;
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-archetype/src/main/java/org/apidesign/html/archetype/package-info.java
--- a/ko-archetype/src/main/java/org/apidesign/html/archetype/package-info.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.archetype;
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-archetype/src/main/java/org/netbeans/html/archetype/package-info.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-archetype/src/main/java/org/netbeans/html/archetype/package-info.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,43 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.archetype;
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/main/java/org/apidesign/html/kofx/Console.java
--- a/ko-fx/src/main/java/org/apidesign/html/kofx/Console.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.kofx;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import net.java.html.js.JavaScriptBody;
-
-/** This is an implementation package - just
- * include its JAR on classpath and use official {@link Context} API
- * to access the functionality.
- * <p>
- * Redirects JavaScript's messages to Java's {@link Logger}.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-final class Console {
-    private static final Logger LOG = Logger.getLogger(Console.class.getName());
-    
-    private Console() {
-    }
-
-    static void register() {
-        registerImpl("log", Level.INFO);
-        registerImpl("info", Level.INFO);
-        registerImpl("warn", Level.WARNING);
-        registerImpl("error", Level.SEVERE);
-    }
-    
-    @JavaScriptBody(args = { "attr", "l" }, 
-        javacall = true, body = 
-        "  window.console[attr] = function(m) {\n"
-      + "    @org.apidesign.html.kofx.Console::log(Ljava/util/logging/Level;Ljava/lang/String;)(l, m);\n"
-      + "  };\n"
-    )
-    private static native void registerImpl(String attr, Level l);
-    
-    static void log(Level l, String msg) {
-        LOG.log(l, msg);
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/main/java/org/apidesign/html/kofx/FXContext.java
--- a/ko-fx/src/main/java/org/apidesign/html/kofx/FXContext.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,222 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.kofx;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ServiceLoader;
-import java.util.logging.Logger;
-import javafx.application.Platform;
-import net.java.html.js.JavaScriptBody;
-import netscape.javascript.JSObject;
-import org.apidesign.html.boot.spi.Fn;
-import org.apidesign.html.context.spi.Contexts;
-import org.apidesign.html.json.spi.FunctionBinding;
-import org.apidesign.html.json.spi.JSONCall;
-import org.apidesign.html.json.spi.PropertyBinding;
-import org.apidesign.html.json.spi.Technology;
-import org.apidesign.html.json.spi.Transfer;
-import org.apidesign.html.json.spi.WSTransfer;
-import org.openide.util.lookup.ServiceProvider;
-
-/** This is an implementation package - just
- * include its JAR on classpath and use official {@link Context} API
- * to access the functionality.
- * <p>
- * Registers {@link ContextProvider}, so {@link ServiceLoader} can find it.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class FXContext
-implements Technology.BatchInit<JSObject>, Transfer, WSTransfer<LoadWS> {
-    static final Logger LOG = Logger.getLogger(FXContext.class.getName());
-    private static Boolean javaScriptEnabled;
-    private final Fn.Presenter browserContext;
-
-    public FXContext(Fn.Presenter browserContext) {
-        this.browserContext = browserContext;
-    }
-    
-    @JavaScriptBody(args = {}, body = "return true;")
-    private static boolean isJavaScriptEnabledJs() {
-        return false;
-    }
-    
-    static boolean isJavaScriptEnabled() {
-        if (javaScriptEnabled != null) {
-            return javaScriptEnabled;
-        }
-        return javaScriptEnabled = isJavaScriptEnabledJs();
-    }
-
-    final boolean areWebSocketsSupported() {
-        return LoadWS.isSupported();
-    }
-
-
-    @Override
-    public JSObject wrapModel(Object model, PropertyBinding[] propArr, FunctionBinding[] funcArr) {
-        String[] propNames = new String[propArr.length];
-        boolean[] propReadOnly = new boolean[propArr.length];
-        Object[] propValues = new Object[propArr.length];
-        for (int i = 0; i < propNames.length; i++) {
-            propNames[i] = propArr[i].getPropertyName();
-            propReadOnly[i] = propArr[i].isReadOnly();
-            propValues[i] = propArr[i].getValue();
-        }
-        String[] funcNames = new String[funcArr.length];
-        for (int i = 0; i < funcNames.length; i++) {
-            funcNames[i] = funcArr[i].getFunctionName();
-        }
-        
-        return Knockout.wrapModel(model, 
-            propNames, propReadOnly, Knockout.toArray(propValues), propArr, 
-            funcNames, funcArr
-        );
-    }
-    
-    @Override
-    public JSObject wrapModel(Object model) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void bind(PropertyBinding b, Object model, JSObject data) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void valueHasMutated(JSObject data, String propertyName) {
-        Knockout.valueHasMutated(data, propertyName);
-    }
-
-    @Override
-    public void expose(FunctionBinding fb, Object model, JSObject d) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void applyBindings(JSObject data) {
-        Knockout.applyBindings(data);
-    }
-
-    @Override
-    public Object wrapArray(Object[] arr) {
-        return Knockout.toArray(arr);
-    }
-
-    @Override
-    public void extract(Object obj, String[] props, Object[] values) {
-        LoadJSON.extractJSON(obj, props, values);
-    }
-
-    @Override
-    public void loadJSON(final JSONCall call) {
-        LoadJSON.loadJSON(call);
-    }
-
-    @Override
-    public <M> M toModel(Class<M> modelClass, Object data) {
-        if (data instanceof JSObject) {
-            data = ((JSObject)data).getMember("ko-fx.model"); // NOI18N
-        }
-        return modelClass.cast(data);
-    }
-
-    @Override
-    public Object toJSON(InputStream is) throws IOException {
-        return LoadJSON.parse(is);
-    }
-
-    @Override
-    public void runSafe(final Runnable r) {
-        class Wrap implements Runnable {
-            @Override public void run() {
-                try (Closeable c = Fn.activate(browserContext)) {
-                    r.run();
-                } catch (IOException ex) {
-                    // cannot be thrown
-                }
-            }
-        }
-        Wrap w = new Wrap();
-        
-        if (Platform.isFxApplicationThread()) {
-            w.run();
-        } else {
-            Platform.runLater(w);
-        }
-    }
-
-    @Override
-    public LoadWS open(String url, JSONCall onReply) {
-        return new LoadWS(onReply, url);
-    }
-
-    @Override
-    public void send(LoadWS socket, JSONCall data) {
-        socket.send(data);
-    }
-
-    @Override
-    public void close(LoadWS socket) {
-        socket.close();
-    }
-    
-    @ServiceProvider(service = Contexts.Provider.class)
-    public static final class Prvdr implements Contexts.Provider {
-        @Override
-        public void fillContext(Contexts.Builder context, Class<?> requestor) {
-            if (isJavaScriptEnabled()) {
-                FXContext c = new FXContext(Fn.activePresenter());
-                
-                context.register(Technology.class, c, 100);
-                context.register(Transfer.class, c, 100);
-                if (c.areWebSocketsSupported()) {
-                    context.register(WSTransfer.class, c, 100);
-                }
-            }
-        }
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/main/java/org/apidesign/html/kofx/Knockout.java
--- a/ko-fx/src/main/java/org/apidesign/html/kofx/Knockout.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.kofx;
-
-import net.java.html.js.JavaScriptBody;
-import net.java.html.js.JavaScriptResource;
-import net.java.html.json.Model;
-import netscape.javascript.JSObject;
-import org.apidesign.html.json.spi.FunctionBinding;
-import org.apidesign.html.json.spi.PropertyBinding;
-
-/** This is an implementation package - just
- * include its JAR on classpath and use official {@link Context} API
- * to access the functionality.
- * <p>
- * Provides binding between {@link Model models} and knockout.js running
- * inside a JavaFX WebView. 
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@JavaScriptResource("knockout-2.2.1.js")
-final class Knockout {
-    static final JSObject KObject;
-    static {
-        Console.register();
-        KObject = (JSObject) kObj();
-    }
-
-    static Object toArray(Object[] arr) {
-        return KObject.call("array", arr);
-    }
-    
-    @JavaScriptBody(args = { "model", "prop" }, body =
-          "if (model) {\n"
-        + "  var koProp = model[prop];\n"
-        + "  if (koProp && koProp['valueHasMutated']) {\n"
-        + "    koProp['valueHasMutated']();\n"
-        + "  }\n"
-        + "}\n"
-    )
-    public native static void valueHasMutated(JSObject model, String prop);
-
-    @JavaScriptBody(args = { "bindings" }, body = "ko.applyBindings(bindings);")
-    native static void applyBindings(Object bindings);
-    
-    @JavaScriptBody(args = {}, body =
-              "  var k = {};"
-            + "  k.array= function() {"
-            + "    return Array.prototype.slice.call(arguments);"
-            + "  };"
-            + "  return k;"
-    )
-    private static native Object kObj();
-        
-        
-    @JavaScriptBody(
-        javacall = true,
-        args = {"model", "propNames", "propReadOnly", "propValues", "propArr", "funcNames", "funcArr"},
-        body
-        = "var ret = {};\n"
-        + "ret['ko-fx.model'] = model;\n"
-        + "function koComputed(name, readOnly, value, prop) {\n"
-        + "  function realGetter() {\n"
-        + "    try {"
-        + "      var v = prop.@org.apidesign.html.json.spi.PropertyBinding::getValue()();"
-        + "      return v;"
-        + "    } catch (e) {"
-        + "      alert(\"Cannot call getValue on \" + model + \" prop: \" + name + \" error: \" + e);"
-        + "    }"
-        + "  }\n"
-        + "  var activeGetter = function() { return value; };\n"
-        + "  var bnd = {"
-        + "    read: function() {"
-        + "      var r = activeGetter();"
-        + "      activeGetter = realGetter;"
-        + "      return r;"
-        + "    },"
-        + "    owner: ret\n"
-        + "  };\n"
-        + "  if (!readOnly) {\n"
-        + "    bnd.write = function(val) {\n"
-        + "      prop.@org.apidesign.html.json.spi.PropertyBinding::setValue(Ljava/lang/Object;)(val);\n"
-        + "    };"
-        + "  };"
-        + "  ret[name] = ko.computed(bnd);"
-        + "}\n"
-        + "for (var i = 0; i < propNames.length; i++) {\n"
-        + "  koComputed(propNames[i], propReadOnly[i], propValues[i], propArr[i]);\n"
-        + "}\n"
-        + "function koExpose(name, func) {\n"
-        + "  ret[name] = function(data, ev) {\n"
-        + "    func.@org.apidesign.html.json.spi.FunctionBinding::call(Ljava/lang/Object;Ljava/lang/Object;)(data, ev);\n"
-        + "  };\n"
-        + "}\n"
-        + "for (var i = 0; i < funcNames.length; i++) {\n"
-        + "  koExpose(funcNames[i], funcArr[i]);\n"
-        + "}\n"
-        + "return ret;\n"
-        )
-    static native JSObject wrapModel(
-        Object model,
-        String[] propNames, boolean[] propReadOnly, Object propValues, PropertyBinding[] propArr,
-        String[] funcNames, FunctionBinding[] funcArr
-    );
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/main/java/org/apidesign/html/kofx/LoadJSON.java
--- a/ko-fx/src/main/java/org/apidesign/html/kofx/LoadJSON.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,267 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.kofx;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PushbackInputStream;
-import java.io.Reader;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Iterator;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javafx.application.Platform;
-import net.java.html.js.JavaScriptBody;
-import netscape.javascript.JSObject;
-import org.apidesign.html.json.spi.JSONCall;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
-/** This is an implementation package - just
- * include its JAR on classpath and use official {@link Context} API
- * to access the functionality.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-final class LoadJSON implements Runnable {
-    private static final Logger LOG = FXContext.LOG;
-    private static final Executor REQ = Executors.newCachedThreadPool(new ThreadFactory() {
-        @Override
-        public Thread newThread(Runnable runnable) {
-            Thread thread = Executors.defaultThreadFactory().newThread(runnable);
-            thread.setDaemon(true);
-            return thread;
-        }
-    });
-
-    private final JSONCall call;
-    private final URL base;
-    private Throwable error;
-    private Object json;
-
-
-    private LoadJSON(JSONCall call) {
-        this.call = call;
-        URL b;
-        try {
-            b = new URL(findBaseURL());
-        } catch (MalformedURLException ex) {
-            LOG.log(Level.SEVERE, "Can't find base url for " + call.composeURL("dummy"), ex);
-            b = null;
-        }
-        this.base = b;
-    }
-
-    public static void loadJSON(JSONCall call) {
-        assert !"WebSocket".equals(call.getMethod());
-        REQ.execute(new LoadJSON((call)));
-    }
-
-    @Override
-    public void run() {
-        if (Platform.isFxApplicationThread()) {
-            if (error != null) {
-                call.notifyError(error);
-            } else {
-                call.notifySuccess(json);
-            }
-            return;
-        }
-        final String url;
-        if (call.isJSONP()) {
-            url = call.composeURL("dummy");
-        } else {
-            url = call.composeURL(null);
-        }
-        try {
-            final URL u = new URL(base, url.replace(" ", "%20"));
-            URLConnection conn = u.openConnection();
-            if (conn instanceof HttpURLConnection) {
-                HttpURLConnection huc = (HttpURLConnection) conn;
-                if (call.getMethod() != null) {
-                    huc.setRequestMethod(call.getMethod());
-                }
-                if (call.isDoOutput()) {
-                    huc.setDoOutput(true);
-                    final OutputStream os = huc.getOutputStream();
-                    call.writeData(os);
-                    os.flush();
-                }
-            }
-            final PushbackInputStream is = new PushbackInputStream(
-                conn.getInputStream(), 1
-            );
-            boolean array = false;
-            boolean string = false;
-            if (call.isJSONP()) {
-                for (;;) {
-                    int ch = is.read();
-                    if (ch == -1) {
-                        break;
-                    }
-                    if (ch == '[') {
-                        is.unread(ch);
-                        array = true;
-                        break;
-                    }
-                    if (ch == '{') {
-                        is.unread(ch);
-                        break;
-                    }
-                }
-            } else {
-                int ch = is.read();
-                if (ch == -1) {
-                    string = true;
-                } else {
-                    array = ch == '[';
-                    is.unread(ch);
-                    if (!array && ch != '{') {
-                        string = true;
-                    }
-                }
-            }
-            try {
-                if (string) {
-                    throw new JSONException("");
-                }
-                Reader r = new InputStreamReader(is, "UTF-8");
-
-                JSONTokener tok = new JSONTokener(r);
-                Object obj;
-                obj = array ? new JSONArray(tok) : new JSONObject(tok);
-                json = convertToArray(obj);
-            } catch (JSONException ex) {
-                Reader r = new InputStreamReader(is, "UTF-8");
-                StringBuilder sb = new StringBuilder();
-                for (;;) {
-                    int ch = r.read();
-                    if (ch == -1) {
-                        break;
-                    }
-                    sb.append((char)ch);
-                }
-                json = sb.toString();
-            }
-        } catch (IOException ex) {
-            error = ex;
-        } finally {
-            Platform.runLater(this);
-        }
-    }
-
-    static Object convertToArray(Object o) throws JSONException {
-        if (o instanceof JSONArray) {
-            JSONArray ja = (JSONArray)o;
-            Object[] arr = new Object[ja.length()];
-            for (int i = 0; i < arr.length; i++) {
-                arr[i] = convertToArray(ja.get(i));
-            }
-            return arr;
-        } else if (o instanceof JSONObject) {
-            JSONObject obj = (JSONObject)o;
-            Iterator it = obj.keys();
-            while (it.hasNext()) {
-                String key = (String)it.next();
-                obj.put(key, convertToArray(obj.get(key)));
-            }
-            return obj;
-        } else {
-            return o;
-        }
-    }
-    
-    public static void extractJSON(Object jsonObject, String[] props, Object[] values) {
-        if (jsonObject instanceof JSONObject) {
-            JSONObject obj = (JSONObject)jsonObject;
-            for (int i = 0; i < props.length; i++) {
-                try {
-                    values[i] = obj.has(props[i]) ? obj.get(props[i]) : null;
-                } catch (JSONException ex) {
-                    LoadJSON.LOG.log(Level.SEVERE, "Can't read " + props[i] + " from " + jsonObject, ex);
-                }
-            }
-        }
-        if (jsonObject instanceof JSObject) {
-            JSObject obj = (JSObject)jsonObject;
-            for (int i = 0; i < props.length; i++) {
-                Object val = obj.getMember(props[i]);
-                values[i] = isDefined(val) ? val : null;
-            }
-        }
-    }
-    
-    public static Object parse(InputStream is) throws IOException {
-        try {
-            InputStreamReader r = new InputStreamReader(is, "UTF-8");
-            JSONTokener t = new JSONTokener(r);
-            return new JSONObject(t);
-        } catch (JSONException ex) {
-            throw new IOException(ex);
-        }
-    }
-
-    @JavaScriptBody(args = {  }, body = 
-          "var h;"
-        + "if (!!window && !!window.location && !!window.location.href)\n"
-        + "  h = window.location.href;\n"
-        + "else "
-        + "  h = null;"
-        + "return h;\n"
-    )
-    private static native String findBaseURL();
-    
-    private static boolean isDefined(Object val) {
-        return !"undefined".equals(val);
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/main/java/org/apidesign/html/kofx/LoadWS.java
--- a/ko-fx/src/main/java/org/apidesign/html/kofx/LoadWS.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.kofx;
-
-import net.java.html.js.JavaScriptBody;
-import org.apidesign.html.json.spi.JSONCall;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
-/** Communication with WebSockets for WebView 1.8.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-final class LoadWS {
-    private static final boolean SUPPORTED = isWebSocket();
-    private final Object ws;
-    private final JSONCall call;
-
-    LoadWS(JSONCall first, String url) {
-        call = first;
-        ws = initWebSocket(this, url);
-        if (ws == null) {
-            first.notifyError(new IllegalArgumentException("Wrong URL: " + url));
-        }
-    }
-    
-    static boolean isSupported() {
-        return SUPPORTED;
-    }
-    
-    void send(JSONCall call) {
-        push(call);
-    }
-    
-    private synchronized void push(JSONCall call) {
-        send(ws, call.getMessage());
-    }
-
-    void onOpen(Object ev) {
-        if (!call.isDoOutput()) {
-            call.notifySuccess(null);
-        }
-    }
-    
-    void onMessage(Object ev, String data) {
-        Object json;
-        try {
-            data = data.trim();
-            
-            JSONTokener tok = new JSONTokener(data);
-            Object obj;
-            obj = data.startsWith("[") ? new JSONArray(tok) : new JSONObject(tok);
-            json = LoadJSON.convertToArray(obj);
-        } catch (JSONException ex) {
-            json = data;
-        }
-        call.notifySuccess(json);
-    }
-    
-    void onError(Object ev) {
-        call.notifyError(new Exception(ev.toString()));
-    }
-
-    void onClose(boolean wasClean, int code, String reason) {
-        call.notifyError(null);
-    }
-    
-    @JavaScriptBody(args = {}, body = "if (window.WebSocket) return true; else return false;")
-    private static boolean isWebSocket() {
-        return false;
-    }
-
-    @JavaScriptBody(args = { "back", "url" }, javacall = true, body = ""
-        + "if (window.WebSocket) {"
-        + "  try {"
-        + "    var ws = new window.WebSocket(url);"
-        + "    ws.onopen = function(ev) { back.@org.apidesign.html.kofx.LoadWS::onOpen(Ljava/lang/Object;)(ev); };"
-        + "    ws.onmessage = function(ev) { back.@org.apidesign.html.kofx.LoadWS::onMessage(Ljava/lang/Object;Ljava/lang/String;)(ev, ev.data); };"
-        + "    ws.onerror = function(ev) { back.@org.apidesign.html.kofx.LoadWS::onError(Ljava/lang/Object;)(ev); };"
-        + "    ws.onclose = function(ev) { back.@org.apidesign.html.kofx.LoadWS::onClose(ZILjava/lang/String;)(ev.wasClean, ev.code, ev.reason); };"
-        + "    return ws;"
-        + "  } catch (ex) {"
-        + "    return null;"
-        + "  }"
-        + "} else {"
-        + "  return null;"
-        + "}"
-    )
-    private static Object initWebSocket(Object back, String url) {
-        return null;
-    }
-    
-
-    @JavaScriptBody(args = { "ws", "msg" }, body = ""
-        + "ws.send(msg);"
-    )
-    private void send(Object ws, String msg) {
-    }
-
-    @JavaScriptBody(args = { "ws" }, body = "ws.close();")
-    private static void close(Object ws) {
-    }
-
-    void close() {
-        close(ws);
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/main/java/org/netbeans/html/kofx/Console.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-fx/src/main/java/org/netbeans/html/kofx/Console.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,81 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.kofx;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.java.html.js.JavaScriptBody;
+
+/** This is an implementation package - just
+ * include its JAR on classpath and use official {@link Context} API
+ * to access the functionality.
+ * <p>
+ * Redirects JavaScript's messages to Java's {@link Logger}.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class Console {
+    private static final Logger LOG = Logger.getLogger(Console.class.getName());
+    
+    private Console() {
+    }
+
+    static void register() {
+        registerImpl("log", Level.INFO);
+        registerImpl("info", Level.INFO);
+        registerImpl("warn", Level.WARNING);
+        registerImpl("error", Level.SEVERE);
+    }
+    
+    @JavaScriptBody(args = { "attr", "l" }, 
+        javacall = true, body = 
+        "  window.console[attr] = function(m) {\n"
+      + "    @org.netbeans.html.kofx.Console::log(Ljava/util/logging/Level;Ljava/lang/String;)(l, m);\n"
+      + "  };\n"
+    )
+    private static native void registerImpl(String attr, Level l);
+    
+    static void log(Level l, String msg) {
+        LOG.log(l, msg);
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/main/java/org/netbeans/html/kofx/FXContext.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-fx/src/main/java/org/netbeans/html/kofx/FXContext.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,222 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.kofx;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ServiceLoader;
+import java.util.logging.Logger;
+import javafx.application.Platform;
+import net.java.html.js.JavaScriptBody;
+import netscape.javascript.JSObject;
+import org.apidesign.html.boot.spi.Fn;
+import org.apidesign.html.context.spi.Contexts;
+import org.apidesign.html.json.spi.FunctionBinding;
+import org.apidesign.html.json.spi.JSONCall;
+import org.apidesign.html.json.spi.PropertyBinding;
+import org.apidesign.html.json.spi.Technology;
+import org.apidesign.html.json.spi.Transfer;
+import org.apidesign.html.json.spi.WSTransfer;
+import org.openide.util.lookup.ServiceProvider;
+
+/** This is an implementation package - just
+ * include its JAR on classpath and use official {@link Context} API
+ * to access the functionality.
+ * <p>
+ * Registers {@link ContextProvider}, so {@link ServiceLoader} can find it.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class FXContext
+implements Technology.BatchInit<JSObject>, Transfer, WSTransfer<LoadWS> {
+    static final Logger LOG = Logger.getLogger(FXContext.class.getName());
+    private static Boolean javaScriptEnabled;
+    private final Fn.Presenter browserContext;
+
+    public FXContext(Fn.Presenter browserContext) {
+        this.browserContext = browserContext;
+    }
+    
+    @JavaScriptBody(args = {}, body = "return true;")
+    private static boolean isJavaScriptEnabledJs() {
+        return false;
+    }
+    
+    static boolean isJavaScriptEnabled() {
+        if (javaScriptEnabled != null) {
+            return javaScriptEnabled;
+        }
+        return javaScriptEnabled = isJavaScriptEnabledJs();
+    }
+
+    final boolean areWebSocketsSupported() {
+        return LoadWS.isSupported();
+    }
+
+
+    @Override
+    public JSObject wrapModel(Object model, PropertyBinding[] propArr, FunctionBinding[] funcArr) {
+        String[] propNames = new String[propArr.length];
+        boolean[] propReadOnly = new boolean[propArr.length];
+        Object[] propValues = new Object[propArr.length];
+        for (int i = 0; i < propNames.length; i++) {
+            propNames[i] = propArr[i].getPropertyName();
+            propReadOnly[i] = propArr[i].isReadOnly();
+            propValues[i] = propArr[i].getValue();
+        }
+        String[] funcNames = new String[funcArr.length];
+        for (int i = 0; i < funcNames.length; i++) {
+            funcNames[i] = funcArr[i].getFunctionName();
+        }
+        
+        return Knockout.wrapModel(model, 
+            propNames, propReadOnly, Knockout.toArray(propValues), propArr, 
+            funcNames, funcArr
+        );
+    }
+    
+    @Override
+    public JSObject wrapModel(Object model) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void bind(PropertyBinding b, Object model, JSObject data) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void valueHasMutated(JSObject data, String propertyName) {
+        Knockout.valueHasMutated(data, propertyName);
+    }
+
+    @Override
+    public void expose(FunctionBinding fb, Object model, JSObject d) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void applyBindings(JSObject data) {
+        Knockout.applyBindings(data);
+    }
+
+    @Override
+    public Object wrapArray(Object[] arr) {
+        return Knockout.toArray(arr);
+    }
+
+    @Override
+    public void extract(Object obj, String[] props, Object[] values) {
+        LoadJSON.extractJSON(obj, props, values);
+    }
+
+    @Override
+    public void loadJSON(final JSONCall call) {
+        LoadJSON.loadJSON(call);
+    }
+
+    @Override
+    public <M> M toModel(Class<M> modelClass, Object data) {
+        if (data instanceof JSObject) {
+            data = ((JSObject)data).getMember("ko-fx.model"); // NOI18N
+        }
+        return modelClass.cast(data);
+    }
+
+    @Override
+    public Object toJSON(InputStream is) throws IOException {
+        return LoadJSON.parse(is);
+    }
+
+    @Override
+    public void runSafe(final Runnable r) {
+        class Wrap implements Runnable {
+            @Override public void run() {
+                try (Closeable c = Fn.activate(browserContext)) {
+                    r.run();
+                } catch (IOException ex) {
+                    // cannot be thrown
+                }
+            }
+        }
+        Wrap w = new Wrap();
+        
+        if (Platform.isFxApplicationThread()) {
+            w.run();
+        } else {
+            Platform.runLater(w);
+        }
+    }
+
+    @Override
+    public LoadWS open(String url, JSONCall onReply) {
+        return new LoadWS(onReply, url);
+    }
+
+    @Override
+    public void send(LoadWS socket, JSONCall data) {
+        socket.send(data);
+    }
+
+    @Override
+    public void close(LoadWS socket) {
+        socket.close();
+    }
+    
+    @ServiceProvider(service = Contexts.Provider.class)
+    public static final class Prvdr implements Contexts.Provider {
+        @Override
+        public void fillContext(Contexts.Builder context, Class<?> requestor) {
+            if (isJavaScriptEnabled()) {
+                FXContext c = new FXContext(Fn.activePresenter());
+                
+                context.register(Technology.class, c, 100);
+                context.register(Transfer.class, c, 100);
+                if (c.areWebSocketsSupported()) {
+                    context.register(WSTransfer.class, c, 100);
+                }
+            }
+        }
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/main/java/org/netbeans/html/kofx/Knockout.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-fx/src/main/java/org/netbeans/html/kofx/Knockout.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,145 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.kofx;
+
+import net.java.html.js.JavaScriptBody;
+import net.java.html.js.JavaScriptResource;
+import net.java.html.json.Model;
+import netscape.javascript.JSObject;
+import org.apidesign.html.json.spi.FunctionBinding;
+import org.apidesign.html.json.spi.PropertyBinding;
+
+/** This is an implementation package - just
+ * include its JAR on classpath and use official {@link Context} API
+ * to access the functionality.
+ * <p>
+ * Provides binding between {@link Model models} and knockout.js running
+ * inside a JavaFX WebView. 
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@JavaScriptResource("knockout-2.2.1.js")
+final class Knockout {
+    static final JSObject KObject;
+    static {
+        Console.register();
+        KObject = (JSObject) kObj();
+    }
+
+    static Object toArray(Object[] arr) {
+        return KObject.call("array", arr);
+    }
+    
+    @JavaScriptBody(args = { "model", "prop" }, body =
+          "if (model) {\n"
+        + "  var koProp = model[prop];\n"
+        + "  if (koProp && koProp['valueHasMutated']) {\n"
+        + "    koProp['valueHasMutated']();\n"
+        + "  }\n"
+        + "}\n"
+    )
+    public native static void valueHasMutated(JSObject model, String prop);
+
+    @JavaScriptBody(args = { "bindings" }, body = "ko.applyBindings(bindings);")
+    native static void applyBindings(Object bindings);
+    
+    @JavaScriptBody(args = {}, body =
+              "  var k = {};"
+            + "  k.array= function() {"
+            + "    return Array.prototype.slice.call(arguments);"
+            + "  };"
+            + "  return k;"
+    )
+    private static native Object kObj();
+        
+        
+    @JavaScriptBody(
+        javacall = true,
+        args = {"model", "propNames", "propReadOnly", "propValues", "propArr", "funcNames", "funcArr"},
+        body
+        = "var ret = {};\n"
+        + "ret['ko-fx.model'] = model;\n"
+        + "function koComputed(name, readOnly, value, prop) {\n"
+        + "  function realGetter() {\n"
+        + "    try {"
+        + "      var v = prop.@org.apidesign.html.json.spi.PropertyBinding::getValue()();"
+        + "      return v;"
+        + "    } catch (e) {"
+        + "      alert(\"Cannot call getValue on \" + model + \" prop: \" + name + \" error: \" + e);"
+        + "    }"
+        + "  }\n"
+        + "  var activeGetter = function() { return value; };\n"
+        + "  var bnd = {"
+        + "    read: function() {"
+        + "      var r = activeGetter();"
+        + "      activeGetter = realGetter;"
+        + "      return r;"
+        + "    },"
+        + "    owner: ret\n"
+        + "  };\n"
+        + "  if (!readOnly) {\n"
+        + "    bnd.write = function(val) {\n"
+        + "      prop.@org.apidesign.html.json.spi.PropertyBinding::setValue(Ljava/lang/Object;)(val);\n"
+        + "    };"
+        + "  };"
+        + "  ret[name] = ko.computed(bnd);"
+        + "}\n"
+        + "for (var i = 0; i < propNames.length; i++) {\n"
+        + "  koComputed(propNames[i], propReadOnly[i], propValues[i], propArr[i]);\n"
+        + "}\n"
+        + "function koExpose(name, func) {\n"
+        + "  ret[name] = function(data, ev) {\n"
+        + "    func.@org.apidesign.html.json.spi.FunctionBinding::call(Ljava/lang/Object;Ljava/lang/Object;)(data, ev);\n"
+        + "  };\n"
+        + "}\n"
+        + "for (var i = 0; i < funcNames.length; i++) {\n"
+        + "  koExpose(funcNames[i], funcArr[i]);\n"
+        + "}\n"
+        + "return ret;\n"
+        )
+    static native JSObject wrapModel(
+        Object model,
+        String[] propNames, boolean[] propReadOnly, Object propValues, PropertyBinding[] propArr,
+        String[] funcNames, FunctionBinding[] funcArr
+    );
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/main/java/org/netbeans/html/kofx/LoadJSON.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-fx/src/main/java/org/netbeans/html/kofx/LoadJSON.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,267 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.kofx;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PushbackInputStream;
+import java.io.Reader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Iterator;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javafx.application.Platform;
+import net.java.html.js.JavaScriptBody;
+import netscape.javascript.JSObject;
+import org.apidesign.html.json.spi.JSONCall;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+
+/** This is an implementation package - just
+ * include its JAR on classpath and use official {@link Context} API
+ * to access the functionality.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class LoadJSON implements Runnable {
+    private static final Logger LOG = FXContext.LOG;
+    private static final Executor REQ = Executors.newCachedThreadPool(new ThreadFactory() {
+        @Override
+        public Thread newThread(Runnable runnable) {
+            Thread thread = Executors.defaultThreadFactory().newThread(runnable);
+            thread.setDaemon(true);
+            return thread;
+        }
+    });
+
+    private final JSONCall call;
+    private final URL base;
+    private Throwable error;
+    private Object json;
+
+
+    private LoadJSON(JSONCall call) {
+        this.call = call;
+        URL b;
+        try {
+            b = new URL(findBaseURL());
+        } catch (MalformedURLException ex) {
+            LOG.log(Level.SEVERE, "Can't find base url for " + call.composeURL("dummy"), ex);
+            b = null;
+        }
+        this.base = b;
+    }
+
+    public static void loadJSON(JSONCall call) {
+        assert !"WebSocket".equals(call.getMethod());
+        REQ.execute(new LoadJSON((call)));
+    }
+
+    @Override
+    public void run() {
+        if (Platform.isFxApplicationThread()) {
+            if (error != null) {
+                call.notifyError(error);
+            } else {
+                call.notifySuccess(json);
+            }
+            return;
+        }
+        final String url;
+        if (call.isJSONP()) {
+            url = call.composeURL("dummy");
+        } else {
+            url = call.composeURL(null);
+        }
+        try {
+            final URL u = new URL(base, url.replace(" ", "%20"));
+            URLConnection conn = u.openConnection();
+            if (conn instanceof HttpURLConnection) {
+                HttpURLConnection huc = (HttpURLConnection) conn;
+                if (call.getMethod() != null) {
+                    huc.setRequestMethod(call.getMethod());
+                }
+                if (call.isDoOutput()) {
+                    huc.setDoOutput(true);
+                    final OutputStream os = huc.getOutputStream();
+                    call.writeData(os);
+                    os.flush();
+                }
+            }
+            final PushbackInputStream is = new PushbackInputStream(
+                conn.getInputStream(), 1
+            );
+            boolean array = false;
+            boolean string = false;
+            if (call.isJSONP()) {
+                for (;;) {
+                    int ch = is.read();
+                    if (ch == -1) {
+                        break;
+                    }
+                    if (ch == '[') {
+                        is.unread(ch);
+                        array = true;
+                        break;
+                    }
+                    if (ch == '{') {
+                        is.unread(ch);
+                        break;
+                    }
+                }
+            } else {
+                int ch = is.read();
+                if (ch == -1) {
+                    string = true;
+                } else {
+                    array = ch == '[';
+                    is.unread(ch);
+                    if (!array && ch != '{') {
+                        string = true;
+                    }
+                }
+            }
+            try {
+                if (string) {
+                    throw new JSONException("");
+                }
+                Reader r = new InputStreamReader(is, "UTF-8");
+
+                JSONTokener tok = new JSONTokener(r);
+                Object obj;
+                obj = array ? new JSONArray(tok) : new JSONObject(tok);
+                json = convertToArray(obj);
+            } catch (JSONException ex) {
+                Reader r = new InputStreamReader(is, "UTF-8");
+                StringBuilder sb = new StringBuilder();
+                for (;;) {
+                    int ch = r.read();
+                    if (ch == -1) {
+                        break;
+                    }
+                    sb.append((char)ch);
+                }
+                json = sb.toString();
+            }
+        } catch (IOException ex) {
+            error = ex;
+        } finally {
+            Platform.runLater(this);
+        }
+    }
+
+    static Object convertToArray(Object o) throws JSONException {
+        if (o instanceof JSONArray) {
+            JSONArray ja = (JSONArray)o;
+            Object[] arr = new Object[ja.length()];
+            for (int i = 0; i < arr.length; i++) {
+                arr[i] = convertToArray(ja.get(i));
+            }
+            return arr;
+        } else if (o instanceof JSONObject) {
+            JSONObject obj = (JSONObject)o;
+            Iterator it = obj.keys();
+            while (it.hasNext()) {
+                String key = (String)it.next();
+                obj.put(key, convertToArray(obj.get(key)));
+            }
+            return obj;
+        } else {
+            return o;
+        }
+    }
+    
+    public static void extractJSON(Object jsonObject, String[] props, Object[] values) {
+        if (jsonObject instanceof JSONObject) {
+            JSONObject obj = (JSONObject)jsonObject;
+            for (int i = 0; i < props.length; i++) {
+                try {
+                    values[i] = obj.has(props[i]) ? obj.get(props[i]) : null;
+                } catch (JSONException ex) {
+                    LoadJSON.LOG.log(Level.SEVERE, "Can't read " + props[i] + " from " + jsonObject, ex);
+                }
+            }
+        }
+        if (jsonObject instanceof JSObject) {
+            JSObject obj = (JSObject)jsonObject;
+            for (int i = 0; i < props.length; i++) {
+                Object val = obj.getMember(props[i]);
+                values[i] = isDefined(val) ? val : null;
+            }
+        }
+    }
+    
+    public static Object parse(InputStream is) throws IOException {
+        try {
+            InputStreamReader r = new InputStreamReader(is, "UTF-8");
+            JSONTokener t = new JSONTokener(r);
+            return new JSONObject(t);
+        } catch (JSONException ex) {
+            throw new IOException(ex);
+        }
+    }
+
+    @JavaScriptBody(args = {  }, body = 
+          "var h;"
+        + "if (!!window && !!window.location && !!window.location.href)\n"
+        + "  h = window.location.href;\n"
+        + "else "
+        + "  h = null;"
+        + "return h;\n"
+    )
+    private static native String findBaseURL();
+    
+    private static boolean isDefined(Object val) {
+        return !"undefined".equals(val);
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/main/java/org/netbeans/html/kofx/LoadWS.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-fx/src/main/java/org/netbeans/html/kofx/LoadWS.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,149 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.kofx;
+
+import net.java.html.js.JavaScriptBody;
+import org.apidesign.html.json.spi.JSONCall;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+
+/** Communication with WebSockets for WebView 1.8.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class LoadWS {
+    private static final boolean SUPPORTED = isWebSocket();
+    private final Object ws;
+    private final JSONCall call;
+
+    LoadWS(JSONCall first, String url) {
+        call = first;
+        ws = initWebSocket(this, url);
+        if (ws == null) {
+            first.notifyError(new IllegalArgumentException("Wrong URL: " + url));
+        }
+    }
+    
+    static boolean isSupported() {
+        return SUPPORTED;
+    }
+    
+    void send(JSONCall call) {
+        push(call);
+    }
+    
+    private synchronized void push(JSONCall call) {
+        send(ws, call.getMessage());
+    }
+
+    void onOpen(Object ev) {
+        if (!call.isDoOutput()) {
+            call.notifySuccess(null);
+        }
+    }
+    
+    void onMessage(Object ev, String data) {
+        Object json;
+        try {
+            data = data.trim();
+            
+            JSONTokener tok = new JSONTokener(data);
+            Object obj;
+            obj = data.startsWith("[") ? new JSONArray(tok) : new JSONObject(tok);
+            json = LoadJSON.convertToArray(obj);
+        } catch (JSONException ex) {
+            json = data;
+        }
+        call.notifySuccess(json);
+    }
+    
+    void onError(Object ev) {
+        call.notifyError(new Exception(ev.toString()));
+    }
+
+    void onClose(boolean wasClean, int code, String reason) {
+        call.notifyError(null);
+    }
+    
+    @JavaScriptBody(args = {}, body = "if (window.WebSocket) return true; else return false;")
+    private static boolean isWebSocket() {
+        return false;
+    }
+
+    @JavaScriptBody(args = { "back", "url" }, javacall = true, body = ""
+        + "if (window.WebSocket) {"
+        + "  try {"
+        + "    var ws = new window.WebSocket(url);"
+        + "    ws.onopen = function(ev) { back.@org.netbeans.html.kofx.LoadWS::onOpen(Ljava/lang/Object;)(ev); };"
+        + "    ws.onmessage = function(ev) { back.@org.netbeans.html.kofx.LoadWS::onMessage(Ljava/lang/Object;Ljava/lang/String;)(ev, ev.data); };"
+        + "    ws.onerror = function(ev) { back.@org.netbeans.html.kofx.LoadWS::onError(Ljava/lang/Object;)(ev); };"
+        + "    ws.onclose = function(ev) { back.@org.netbeans.html.kofx.LoadWS::onClose(ZILjava/lang/String;)(ev.wasClean, ev.code, ev.reason); };"
+        + "    return ws;"
+        + "  } catch (ex) {"
+        + "    return null;"
+        + "  }"
+        + "} else {"
+        + "  return null;"
+        + "}"
+    )
+    private static Object initWebSocket(Object back, String url) {
+        return null;
+    }
+    
+
+    @JavaScriptBody(args = { "ws", "msg" }, body = ""
+        + "ws.send(msg);"
+    )
+    private void send(Object ws, String msg) {
+    }
+
+    @JavaScriptBody(args = { "ws" }, body = "ws.close();")
+    private static void close(Object ws) {
+    }
+
+    void close() {
+        close(ws);
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/main/resources/org/apidesign/html/kofx/knockout-2.2.1.js
--- a/ko-fx/src/main/resources/org/apidesign/html/kofx/knockout-2.2.1.js	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3594 +0,0 @@
-// Knockout JavaScript library v2.2.1
-// (c) Steven Sanderson - http://knockoutjs.com/
-// License: MIT (http://www.opensource.org/licenses/mit-license.php)
-
-(function(){
-var DEBUG=true;
-(function(window,document,navigator,jQuery,undefined){
-!function(factory) {
-    // Support three module loading scenarios
-    if (typeof require === 'function' && typeof exports === 'object' && typeof module === 'object') {
-        // [1] CommonJS/Node.js
-        var target = module['exports'] || exports; // module.exports is for Node.js
-        factory(target);
-    } else if (typeof define === 'function' && define['amd']) {
-        // [2] AMD anonymous module
-        define(['exports'], factory);
-    } else {
-        // [3] No module loader (plain <script> tag) - put directly in global namespace
-        factory(window['ko'] = {});
-    }
-}(function(koExports){
-// Internally, all KO objects are attached to koExports (even the non-exported ones whose names will be minified by the closure compiler).
-// In the future, the following "ko" variable may be made distinct from "koExports" so that private objects are not externally reachable.
-var ko = typeof koExports !== 'undefined' ? koExports : {};
-// Google Closure Compiler helpers (used only to make the minified file smaller)
-ko.exportSymbol = function(koPath, object) {
-	var tokens = koPath.split(".");
-
-	// In the future, "ko" may become distinct from "koExports" (so that non-exported objects are not reachable)
-	// At that point, "target" would be set to: (typeof koExports !== "undefined" ? koExports : ko)
-	var target = ko;
-
-	for (var i = 0; i < tokens.length - 1; i++)
-		target = target[tokens[i]];
-	target[tokens[tokens.length - 1]] = object;
-};
-ko.exportProperty = function(owner, publicName, object) {
-  owner[publicName] = object;
-};
-ko.version = "2.2.1";
-
-ko.exportSymbol('version', ko.version);
-ko.utils = new (function () {
-    var stringTrimRegex = /^(\s|\u00A0)+|(\s|\u00A0)+$/g;
-
-    // Represent the known event types in a compact way, then at runtime transform it into a hash with event name as key (for fast lookup)
-    var knownEvents = {}, knownEventTypesByEventName = {};
-    var keyEventTypeName = /Firefox\/2/i.test(navigator.userAgent) ? 'KeyboardEvent' : 'UIEvents';
-    knownEvents[keyEventTypeName] = ['keyup', 'keydown', 'keypress'];
-    knownEvents['MouseEvents'] = ['click', 'dblclick', 'mousedown', 'mouseup', 'mousemove', 'mouseover', 'mouseout', 'mouseenter', 'mouseleave'];
-    for (var eventType in knownEvents) {
-        var knownEventsForType = knownEvents[eventType];
-        if (knownEventsForType.length) {
-            for (var i = 0, j = knownEventsForType.length; i < j; i++)
-                knownEventTypesByEventName[knownEventsForType[i]] = eventType;
-        }
-    }
-    var eventsThatMustBeRegisteredUsingAttachEvent = { 'propertychange': true }; // Workaround for an IE9 issue - https://github.com/SteveSanderson/knockout/issues/406
-
-    // Detect IE versions for bug workarounds (uses IE conditionals, not UA string, for robustness)
-    // Note that, since IE 10 does not support conditional comments, the following logic only detects IE < 10.
-    // Currently this is by design, since IE 10+ behaves correctly when treated as a standard browser.
-    // If there is a future need to detect specific versions of IE10+, we will amend this.
-    var ieVersion = (function() {
-        var version = 3, div = document.createElement('div'), iElems = div.getElementsByTagName('i');
-
-        // Keep constructing conditional HTML blocks until we hit one that resolves to an empty fragment
-        while (
-            div.innerHTML = '<!--[if gt IE ' + (++version) + ']><i></i><![endif]-->',
-            iElems[0]
-        );
-        return version > 4 ? version : undefined;
-    }());
-    var isIe6 = ieVersion === 6,
-        isIe7 = ieVersion === 7;
-
-    function isClickOnCheckableElement(element, eventType) {
-        if ((ko.utils.tagNameLower(element) !== "input") || !element.type) return false;
-        if (eventType.toLowerCase() != "click") return false;
-        var inputType = element.type;
-        return (inputType == "checkbox") || (inputType == "radio");
-    }
-
-    return {
-        fieldsIncludedWithJsonPost: ['authenticity_token', /^__RequestVerificationToken(_.*)?$/],
-
-        arrayForEach: function (array, action) {
-            for (var i = 0, j = array.length; i < j; i++)
-                action(array[i]);
-        },
-
-        arrayIndexOf: function (array, item) {
-            if (typeof Array.prototype.indexOf == "function")
-                return Array.prototype.indexOf.call(array, item);
-            for (var i = 0, j = array.length; i < j; i++)
-                if (array[i] === item)
-                    return i;
-            return -1;
-        },
-
-        arrayFirst: function (array, predicate, predicateOwner) {
-            for (var i = 0, j = array.length; i < j; i++)
-                if (predicate.call(predicateOwner, array[i]))
-                    return array[i];
-            return null;
-        },
-
-        arrayRemoveItem: function (array, itemToRemove) {
-            var index = ko.utils.arrayIndexOf(array, itemToRemove);
-            if (index >= 0)
-                array.splice(index, 1);
-        },
-
-        arrayGetDistinctValues: function (array) {
-            array = array || [];
-            var result = [];
-            for (var i = 0, j = array.length; i < j; i++) {
-                if (ko.utils.arrayIndexOf(result, array[i]) < 0)
-                    result.push(array[i]);
-            }
-            return result;
-        },
-
-        arrayMap: function (array, mapping) {
-            array = array || [];
-            var result = [];
-            for (var i = 0, j = array.length; i < j; i++)
-                result.push(mapping(array[i]));
-            return result;
-        },
-
-        arrayFilter: function (array, predicate) {
-            array = array || [];
-            var result = [];
-            for (var i = 0, j = array.length; i < j; i++)
-                if (predicate(array[i]))
-                    result.push(array[i]);
-            return result;
-        },
-
-        arrayPushAll: function (array, valuesToPush) {
-            if (valuesToPush instanceof Array)
-                array.push.apply(array, valuesToPush);
-            else
-                for (var i = 0, j = valuesToPush.length; i < j; i++)
-                    array.push(valuesToPush[i]);
-            return array;
-        },
-
-        extend: function (target, source) {
-            if (source) {
-                for(var prop in source) {
-                    if(source.hasOwnProperty(prop)) {
-                        target[prop] = source[prop];
-                    }
-                }
-            }
-            return target;
-        },
-
-        emptyDomNode: function (domNode) {
-            while (domNode.firstChild) {
-                ko.removeNode(domNode.firstChild);
-            }
-        },
-
-        moveCleanedNodesToContainerElement: function(nodes) {
-            // Ensure it's a real array, as we're about to reparent the nodes and
-            // we don't want the underlying collection to change while we're doing that.
-            var nodesArray = ko.utils.makeArray(nodes);
-
-            var container = document.createElement('div');
-            for (var i = 0, j = nodesArray.length; i < j; i++) {
-                container.appendChild(ko.cleanNode(nodesArray[i]));
-            }
-            return container;
-        },
-
-        cloneNodes: function (nodesArray, shouldCleanNodes) {
-            for (var i = 0, j = nodesArray.length, newNodesArray = []; i < j; i++) {
-                var clonedNode = nodesArray[i].cloneNode(true);
-                newNodesArray.push(shouldCleanNodes ? ko.cleanNode(clonedNode) : clonedNode);
-            }
-            return newNodesArray;
-        },
-
-        setDomNodeChildren: function (domNode, childNodes) {
-            ko.utils.emptyDomNode(domNode);
-            if (childNodes) {
-                for (var i = 0, j = childNodes.length; i < j; i++)
-                    domNode.appendChild(childNodes[i]);
-            }
-        },
-
-        replaceDomNodes: function (nodeToReplaceOrNodeArray, newNodesArray) {
-            var nodesToReplaceArray = nodeToReplaceOrNodeArray.nodeType ? [nodeToReplaceOrNodeArray] : nodeToReplaceOrNodeArray;
-            if (nodesToReplaceArray.length > 0) {
-                var insertionPoint = nodesToReplaceArray[0];
-                var parent = insertionPoint.parentNode;
-                for (var i = 0, j = newNodesArray.length; i < j; i++)
-                    parent.insertBefore(newNodesArray[i], insertionPoint);
-                for (var i = 0, j = nodesToReplaceArray.length; i < j; i++) {
-                    ko.removeNode(nodesToReplaceArray[i]);
-                }
-            }
-        },
-
-        setOptionNodeSelectionState: function (optionNode, isSelected) {
-            // IE6 sometimes throws "unknown error" if you try to write to .selected directly, whereas Firefox struggles with setAttribute. Pick one based on browser.
-            if (ieVersion < 7)
-                optionNode.setAttribute("selected", isSelected);
-            else
-                optionNode.selected = isSelected;
-        },
-
-        stringTrim: function (string) {
-            return (string || "").replace(stringTrimRegex, "");
-        },
-
-        stringTokenize: function (string, delimiter) {
-            var result = [];
-            var tokens = (string || "").split(delimiter);
-            for (var i = 0, j = tokens.length; i < j; i++) {
-                var trimmed = ko.utils.stringTrim(tokens[i]);
-                if (trimmed !== "")
-                    result.push(trimmed);
-            }
-            return result;
-        },
-
-        stringStartsWith: function (string, startsWith) {
-            string = string || "";
-            if (startsWith.length > string.length)
-                return false;
-            return string.substring(0, startsWith.length) === startsWith;
-        },
-
-        domNodeIsContainedBy: function (node, containedByNode) {
-            if (containedByNode.compareDocumentPosition)
-                return (containedByNode.compareDocumentPosition(node) & 16) == 16;
-            while (node != null) {
-                if (node == containedByNode)
-                    return true;
-                node = node.parentNode;
-            }
-            return false;
-        },
-
-        domNodeIsAttachedToDocument: function (node) {
-            return ko.utils.domNodeIsContainedBy(node, node.ownerDocument);
-        },
-
-        tagNameLower: function(element) {
-            // For HTML elements, tagName will always be upper case; for XHTML elements, it'll be lower case.
-            // Possible future optimization: If we know it's an element from an XHTML document (not HTML),
-            // we don't need to do the .toLowerCase() as it will always be lower case anyway.
-            return element && element.tagName && element.tagName.toLowerCase();
-        },
-
-        registerEventHandler: function (element, eventType, handler) {
-            var mustUseAttachEvent = ieVersion && eventsThatMustBeRegisteredUsingAttachEvent[eventType];
-            if (!mustUseAttachEvent && typeof jQuery != "undefined") {
-                if (isClickOnCheckableElement(element, eventType)) {
-                    // For click events on checkboxes, jQuery interferes with the event handling in an awkward way:
-                    // it toggles the element checked state *after* the click event handlers run, whereas native
-                    // click events toggle the checked state *before* the event handler.
-                    // Fix this by intecepting the handler and applying the correct checkedness before it runs.
-                    var originalHandler = handler;
-                    handler = function(event, eventData) {
-                        var jQuerySuppliedCheckedState = this.checked;
-                        if (eventData)
-                            this.checked = eventData.checkedStateBeforeEvent !== true;
-                        originalHandler.call(this, event);
-                        this.checked = jQuerySuppliedCheckedState; // Restore the state jQuery applied
-                    };
-                }
-                jQuery(element)['bind'](eventType, handler);
-            } else if (!mustUseAttachEvent && typeof element.addEventListener == "function")
-                element.addEventListener(eventType, handler, false);
-            else if (typeof element.attachEvent != "undefined")
-                element.attachEvent("on" + eventType, function (event) {
-                    handler.call(element, event);
-                });
-            else
-                throw new Error("Browser doesn't support addEventListener or attachEvent");
-        },
-
-        triggerEvent: function (element, eventType) {
-            if (!(element && element.nodeType))
-                throw new Error("element must be a DOM node when calling triggerEvent");
-
-            if (typeof jQuery != "undefined") {
-                var eventData = [];
-                if (isClickOnCheckableElement(element, eventType)) {
-                    // Work around the jQuery "click events on checkboxes" issue described above by storing the original checked state before triggering the handler
-                    eventData.push({ checkedStateBeforeEvent: element.checked });
-                }
-                jQuery(element)['trigger'](eventType, eventData);
-            } else if (typeof document.createEvent == "function") {
-                if (typeof element.dispatchEvent == "function") {
-                    var eventCategory = knownEventTypesByEventName[eventType] || "HTMLEvents";
-                    var event = document.createEvent(eventCategory);
-                    event.initEvent(eventType, true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, element);
-                    element.dispatchEvent(event);
-                }
-                else
-                    throw new Error("The supplied element doesn't support dispatchEvent");
-            } else if (typeof element.fireEvent != "undefined") {
-                // Unlike other browsers, IE doesn't change the checked state of checkboxes/radiobuttons when you trigger their "click" event
-                // so to make it consistent, we'll do it manually here
-                if (isClickOnCheckableElement(element, eventType))
-                    element.checked = element.checked !== true;
-                element.fireEvent("on" + eventType);
-            }
-            else
-                throw new Error("Browser doesn't support triggering events");
-        },
-
-        unwrapObservable: function (value) {
-            return ko.isObservable(value) ? value() : value;
-        },
-
-        peekObservable: function (value) {
-            return ko.isObservable(value) ? value.peek() : value;
-        },
-
-        toggleDomNodeCssClass: function (node, classNames, shouldHaveClass) {
-            if (classNames) {
-                var cssClassNameRegex = /[\w-]+/g,
-                    currentClassNames = node.className.match(cssClassNameRegex) || [];
-                ko.utils.arrayForEach(classNames.match(cssClassNameRegex), function(className) {
-                    var indexOfClass = ko.utils.arrayIndexOf(currentClassNames, className);
-                    if (indexOfClass >= 0) {
-                        if (!shouldHaveClass)
-                            currentClassNames.splice(indexOfClass, 1);
-                    } else {
-                        if (shouldHaveClass)
-                            currentClassNames.push(className);
-                    }
-                });
-                node.className = currentClassNames.join(" ");
-            }
-        },
-
-        setTextContent: function(element, textContent) {
-            var value = ko.utils.unwrapObservable(textContent);
-            if ((value === null) || (value === undefined))
-                value = "";
-
-            if (element.nodeType === 3) {
-                element.data = value;
-            } else {
-                // We need there to be exactly one child: a text node.
-                // If there are no children, more than one, or if it's not a text node,
-                // we'll clear everything and create a single text node.
-                var innerTextNode = ko.virtualElements.firstChild(element);
-                if (!innerTextNode || innerTextNode.nodeType != 3 || ko.virtualElements.nextSibling(innerTextNode)) {
-                    ko.virtualElements.setDomNodeChildren(element, [document.createTextNode(value)]);
-                } else {
-                    innerTextNode.data = value;
-                }
-
-                ko.utils.forceRefresh(element);
-            }
-        },
-
-        setElementName: function(element, name) {
-            element.name = name;
-
-            // Workaround IE 6/7 issue
-            // - https://github.com/SteveSanderson/knockout/issues/197
-            // - http://www.matts411.com/post/setting_the_name_attribute_in_ie_dom/
-            if (ieVersion <= 7) {
-                try {
-                    element.mergeAttributes(document.createElement("<input name='" + element.name + "'/>"), false);
-                }
-                catch(e) {} // For IE9 with doc mode "IE9 Standards" and browser mode "IE9 Compatibility View"
-            }
-        },
-
-        forceRefresh: function(node) {
-            // Workaround for an IE9 rendering bug - https://github.com/SteveSanderson/knockout/issues/209
-            if (ieVersion >= 9) {
-                // For text nodes and comment nodes (most likely virtual elements), we will have to refresh the container
-                var elem = node.nodeType == 1 ? node : node.parentNode;
-                if (elem.style)
-                    elem.style.zoom = elem.style.zoom;
-            }
-        },
-
-        ensureSelectElementIsRenderedCorrectly: function(selectElement) {
-            // Workaround for IE9 rendering bug - it doesn't reliably display all the text in dynamically-added select boxes unless you force it to re-render by updating the width.
-            // (See https://github.com/SteveSanderson/knockout/issues/312, http://stackoverflow.com/questions/5908494/select-only-shows-first-char-of-selected-option)
-            if (ieVersion >= 9) {
-                var originalWidth = selectElement.style.width;
-                selectElement.style.width = 0;
-                selectElement.style.width = originalWidth;
-            }
-        },
-
-        range: function (min, max) {
-            min = ko.utils.unwrapObservable(min);
-            max = ko.utils.unwrapObservable(max);
-            var result = [];
-            for (var i = min; i <= max; i++)
-                result.push(i);
-            return result;
-        },
-
-        makeArray: function(arrayLikeObject) {
-            var result = [];
-            for (var i = 0, j = arrayLikeObject.length; i < j; i++) {
-                result.push(arrayLikeObject[i]);
-            };
-            return result;
-        },
-
-        isIe6 : isIe6,
-        isIe7 : isIe7,
-        ieVersion : ieVersion,
-
-        getFormFields: function(form, fieldName) {
-            var fields = ko.utils.makeArray(form.getElementsByTagName("input")).concat(ko.utils.makeArray(form.getElementsByTagName("textarea")));
-            var isMatchingField = (typeof fieldName == 'string')
-                ? function(field) { return field.name === fieldName }
-                : function(field) { return fieldName.test(field.name) }; // Treat fieldName as regex or object containing predicate
-            var matches = [];
-            for (var i = fields.length - 1; i >= 0; i--) {
-                if (isMatchingField(fields[i]))
-                    matches.push(fields[i]);
-            };
-            return matches;
-        },
-
-        parseJson: function (jsonString) {
-            if (typeof jsonString == "string") {
-                jsonString = ko.utils.stringTrim(jsonString);
-                if (jsonString) {
-                    if (window.JSON && window.JSON.parse) // Use native parsing where available
-                        return window.JSON.parse(jsonString);
-                    return (new Function("return " + jsonString))(); // Fallback on less safe parsing for older browsers
-                }
-            }
-            return null;
-        },
-
-        stringifyJson: function (data, replacer, space) {   // replacer and space are optional
-            if ((typeof JSON == "undefined") || (typeof JSON.stringify == "undefined"))
-                throw new Error("Cannot find JSON.stringify(). Some browsers (e.g., IE < 8) don't support it natively, but you can overcome this by adding a script reference to json2.js, downloadable from http://www.json.org/json2.js");
-            return JSON.stringify(ko.utils.unwrapObservable(data), replacer, space);
-        },
-
-        postJson: function (urlOrForm, data, options) {
-            options = options || {};
-            var params = options['params'] || {};
-            var includeFields = options['includeFields'] || this.fieldsIncludedWithJsonPost;
-            var url = urlOrForm;
-
-            // If we were given a form, use its 'action' URL and pick out any requested field values
-            if((typeof urlOrForm == 'object') && (ko.utils.tagNameLower(urlOrForm) === "form")) {
-                var originalForm = urlOrForm;
-                url = originalForm.action;
-                for (var i = includeFields.length - 1; i >= 0; i--) {
-                    var fields = ko.utils.getFormFields(originalForm, includeFields[i]);
-                    for (var j = fields.length - 1; j >= 0; j--)
-                        params[fields[j].name] = fields[j].value;
-                }
-            }
-
-            data = ko.utils.unwrapObservable(data);
-            var form = document.createElement("form");
-            form.style.display = "none";
-            form.action = url;
-            form.method = "post";
-            for (var key in data) {
-                var input = document.createElement("input");
-                input.name = key;
-                input.value = ko.utils.stringifyJson(ko.utils.unwrapObservable(data[key]));
-                form.appendChild(input);
-            }
-            for (var key in params) {
-                var input = document.createElement("input");
-                input.name = key;
-                input.value = params[key];
-                form.appendChild(input);
-            }
-            document.body.appendChild(form);
-            options['submitter'] ? options['submitter'](form) : form.submit();
-            setTimeout(function () { form.parentNode.removeChild(form); }, 0);
-        }
-    }
-})();
-
-ko.exportSymbol('utils', ko.utils);
-ko.exportSymbol('utils.arrayForEach', ko.utils.arrayForEach);
-ko.exportSymbol('utils.arrayFirst', ko.utils.arrayFirst);
-ko.exportSymbol('utils.arrayFilter', ko.utils.arrayFilter);
-ko.exportSymbol('utils.arrayGetDistinctValues', ko.utils.arrayGetDistinctValues);
-ko.exportSymbol('utils.arrayIndexOf', ko.utils.arrayIndexOf);
-ko.exportSymbol('utils.arrayMap', ko.utils.arrayMap);
-ko.exportSymbol('utils.arrayPushAll', ko.utils.arrayPushAll);
-ko.exportSymbol('utils.arrayRemoveItem', ko.utils.arrayRemoveItem);
-ko.exportSymbol('utils.extend', ko.utils.extend);
-ko.exportSymbol('utils.fieldsIncludedWithJsonPost', ko.utils.fieldsIncludedWithJsonPost);
-ko.exportSymbol('utils.getFormFields', ko.utils.getFormFields);
-ko.exportSymbol('utils.peekObservable', ko.utils.peekObservable);
-ko.exportSymbol('utils.postJson', ko.utils.postJson);
-ko.exportSymbol('utils.parseJson', ko.utils.parseJson);
-ko.exportSymbol('utils.registerEventHandler', ko.utils.registerEventHandler);
-ko.exportSymbol('utils.stringifyJson', ko.utils.stringifyJson);
-ko.exportSymbol('utils.range', ko.utils.range);
-ko.exportSymbol('utils.toggleDomNodeCssClass', ko.utils.toggleDomNodeCssClass);
-ko.exportSymbol('utils.triggerEvent', ko.utils.triggerEvent);
-ko.exportSymbol('utils.unwrapObservable', ko.utils.unwrapObservable);
-
-if (!Function.prototype['bind']) {
-    // Function.prototype.bind is a standard part of ECMAScript 5th Edition (December 2009, http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-262.pdf)
-    // In case the browser doesn't implement it natively, provide a JavaScript implementation. This implementation is based on the one in prototype.js
-    Function.prototype['bind'] = function (object) {
-        var originalFunction = this, args = Array.prototype.slice.call(arguments), object = args.shift();
-        return function () {
-            return originalFunction.apply(object, args.concat(Array.prototype.slice.call(arguments)));
-        };
-    };
-}
-
-ko.utils.domData = new (function () {
-    var uniqueId = 0;
-    var dataStoreKeyExpandoPropertyName = "__ko__" + (new Date).getTime();
-    var dataStore = {};
-    return {
-        get: function (node, key) {
-            var allDataForNode = ko.utils.domData.getAll(node, false);
-            return allDataForNode === undefined ? undefined : allDataForNode[key];
-        },
-        set: function (node, key, value) {
-            if (value === undefined) {
-                // Make sure we don't actually create a new domData key if we are actually deleting a value
-                if (ko.utils.domData.getAll(node, false) === undefined)
-                    return;
-            }
-            var allDataForNode = ko.utils.domData.getAll(node, true);
-            allDataForNode[key] = value;
-        },
-        getAll: function (node, createIfNotFound) {
-            var dataStoreKey = node[dataStoreKeyExpandoPropertyName];
-            var hasExistingDataStore = dataStoreKey && (dataStoreKey !== "null") && dataStore[dataStoreKey];
-            if (!hasExistingDataStore) {
-                if (!createIfNotFound)
-                    return undefined;
-                dataStoreKey = node[dataStoreKeyExpandoPropertyName] = "ko" + uniqueId++;
-                dataStore[dataStoreKey] = {};
-            }
-            return dataStore[dataStoreKey];
-        },
-        clear: function (node) {
-            var dataStoreKey = node[dataStoreKeyExpandoPropertyName];
-            if (dataStoreKey) {
-                delete dataStore[dataStoreKey];
-                node[dataStoreKeyExpandoPropertyName] = null;
-                return true; // Exposing "did clean" flag purely so specs can infer whether things have been cleaned up as intended
-            }
-            return false;
-        }
-    }
-})();
-
-ko.exportSymbol('utils.domData', ko.utils.domData);
-ko.exportSymbol('utils.domData.clear', ko.utils.domData.clear); // Exporting only so specs can clear up after themselves fully
-
-ko.utils.domNodeDisposal = new (function () {
-    var domDataKey = "__ko_domNodeDisposal__" + (new Date).getTime();
-    var cleanableNodeTypes = { 1: true, 8: true, 9: true };       // Element, Comment, Document
-    var cleanableNodeTypesWithDescendants = { 1: true, 9: true }; // Element, Document
-
-    function getDisposeCallbacksCollection(node, createIfNotFound) {
-        var allDisposeCallbacks = ko.utils.domData.get(node, domDataKey);
-        if ((allDisposeCallbacks === undefined) && createIfNotFound) {
-            allDisposeCallbacks = [];
-            ko.utils.domData.set(node, domDataKey, allDisposeCallbacks);
-        }
-        return allDisposeCallbacks;
-    }
-    function destroyCallbacksCollection(node) {
-        ko.utils.domData.set(node, domDataKey, undefined);
-    }
-
-    function cleanSingleNode(node) {
-        // Run all the dispose callbacks
-        var callbacks = getDisposeCallbacksCollection(node, false);
-        if (callbacks) {
-            callbacks = callbacks.slice(0); // Clone, as the array may be modified during iteration (typically, callbacks will remove themselves)
-            for (var i = 0; i < callbacks.length; i++)
-                callbacks[i](node);
-        }
-
-        // Also erase the DOM data
-        ko.utils.domData.clear(node);
-
-        // Special support for jQuery here because it's so commonly used.
-        // Many jQuery plugins (including jquery.tmpl) store data using jQuery's equivalent of domData
-        // so notify it to tear down any resources associated with the node & descendants here.
-        if ((typeof jQuery == "function") && (typeof jQuery['cleanData'] == "function"))
-            jQuery['cleanData']([node]);
-
-        // Also clear any immediate-child comment nodes, as these wouldn't have been found by
-        // node.getElementsByTagName("*") in cleanNode() (comment nodes aren't elements)
-        if (cleanableNodeTypesWithDescendants[node.nodeType])
-            cleanImmediateCommentTypeChildren(node);
-    }
-
-    function cleanImmediateCommentTypeChildren(nodeWithChildren) {
-        var child, nextChild = nodeWithChildren.firstChild;
-        while (child = nextChild) {
-            nextChild = child.nextSibling;
-            if (child.nodeType === 8)
-                cleanSingleNode(child);
-        }
-    }
-
-    return {
-        addDisposeCallback : function(node, callback) {
-            if (typeof callback != "function")
-                throw new Error("Callback must be a function");
-            getDisposeCallbacksCollection(node, true).push(callback);
-        },
-
-        removeDisposeCallback : function(node, callback) {
-            var callbacksCollection = getDisposeCallbacksCollection(node, false);
-            if (callbacksCollection) {
-                ko.utils.arrayRemoveItem(callbacksCollection, callback);
-                if (callbacksCollection.length == 0)
-                    destroyCallbacksCollection(node);
-            }
-        },
-
-        cleanNode : function(node) {
-            // First clean this node, where applicable
-            if (cleanableNodeTypes[node.nodeType]) {
-                cleanSingleNode(node);
-
-                // ... then its descendants, where applicable
-                if (cleanableNodeTypesWithDescendants[node.nodeType]) {
-                    // Clone the descendants list in case it changes during iteration
-                    var descendants = [];
-                    ko.utils.arrayPushAll(descendants, node.getElementsByTagName("*"));
-                    for (var i = 0, j = descendants.length; i < j; i++)
-                        cleanSingleNode(descendants[i]);
-                }
-            }
-            return node;
-        },
-
-        removeNode : function(node) {
-            ko.cleanNode(node);
-            if (node.parentNode)
-                node.parentNode.removeChild(node);
-        }
-    }
-})();
-ko.cleanNode = ko.utils.domNodeDisposal.cleanNode; // Shorthand name for convenience
-ko.removeNode = ko.utils.domNodeDisposal.removeNode; // Shorthand name for convenience
-ko.exportSymbol('cleanNode', ko.cleanNode);
-ko.exportSymbol('removeNode', ko.removeNode);
-ko.exportSymbol('utils.domNodeDisposal', ko.utils.domNodeDisposal);
-ko.exportSymbol('utils.domNodeDisposal.addDisposeCallback', ko.utils.domNodeDisposal.addDisposeCallback);
-ko.exportSymbol('utils.domNodeDisposal.removeDisposeCallback', ko.utils.domNodeDisposal.removeDisposeCallback);
-(function () {
-    var leadingCommentRegex = /^(\s*)<!--(.*?)-->/;
-
-    function simpleHtmlParse(html) {
-        // Based on jQuery's "clean" function, but only accounting for table-related elements.
-        // If you have referenced jQuery, this won't be used anyway - KO will use jQuery's "clean" function directly
-
-        // Note that there's still an issue in IE < 9 whereby it will discard comment nodes that are the first child of
-        // a descendant node. For example: "<div><!-- mycomment -->abc</div>" will get parsed as "<div>abc</div>"
-        // This won't affect anyone who has referenced jQuery, and there's always the workaround of inserting a dummy node
-        // (possibly a text node) in front of the comment. So, KO does not attempt to workaround this IE issue automatically at present.
-
-        // Trim whitespace, otherwise indexOf won't work as expected
-        var tags = ko.utils.stringTrim(html).toLowerCase(), div = document.createElement("div");
-
-        // Finds the first match from the left column, and returns the corresponding "wrap" data from the right column
-        var wrap = tags.match(/^<(thead|tbody|tfoot)/)              && [1, "<table>", "</table>"] ||
-                   !tags.indexOf("<tr")                             && [2, "<table><tbody>", "</tbody></table>"] ||
-                   (!tags.indexOf("<td") || !tags.indexOf("<th"))   && [3, "<table><tbody><tr>", "</tr></tbody></table>"] ||
-                   /* anything else */                                 [0, "", ""];
-
-        // Go to html and back, then peel off extra wrappers
-        // Note that we always prefix with some dummy text, because otherwise, IE<9 will strip out leading comment nodes in descendants. Total madness.
-        var markup = "ignored<div>" + wrap[1] + html + wrap[2] + "</div>";
-        if (typeof window['innerShiv'] == "function") {
-            div.appendChild(window['innerShiv'](markup));
-        } else {
-            div.innerHTML = markup;
-        }
-
-        // Move to the right depth
-        while (wrap[0]--)
-            div = div.lastChild;
-
-        return ko.utils.makeArray(div.lastChild.childNodes);
-    }
-
-    function jQueryHtmlParse(html) {
-        // jQuery's "parseHTML" function was introduced in jQuery 1.8.0 and is a documented public API.
-        if (jQuery['parseHTML']) {
-            return jQuery['parseHTML'](html);
-        } else {
-            // For jQuery < 1.8.0, we fall back on the undocumented internal "clean" function.
-            var elems = jQuery['clean']([html]);
-
-            // As of jQuery 1.7.1, jQuery parses the HTML by appending it to some dummy parent nodes held in an in-memory document fragment.
-            // Unfortunately, it never clears the dummy parent nodes from the document fragment, so it leaks memory over time.
-            // Fix this by finding the top-most dummy parent element, and detaching it from its owner fragment.
-            if (elems && elems[0]) {
-                // Find the top-most parent element that's a direct child of a document fragment
-                var elem = elems[0];
-                while (elem.parentNode && elem.parentNode.nodeType !== 11 /* i.e., DocumentFragment */)
-                    elem = elem.parentNode;
-                // ... then detach it
-                if (elem.parentNode)
-                    elem.parentNode.removeChild(elem);
-            }
-
-            return elems;
-        }
-    }
-
-    ko.utils.parseHtmlFragment = function(html) {
-        return typeof jQuery != 'undefined' ? jQueryHtmlParse(html)   // As below, benefit from jQuery's optimisations where possible
-                                            : simpleHtmlParse(html);  // ... otherwise, this simple logic will do in most common cases.
-    };
-
-    ko.utils.setHtml = function(node, html) {
-        ko.utils.emptyDomNode(node);
-
-        // There's no legitimate reason to display a stringified observable without unwrapping it, so we'll unwrap it
-        html = ko.utils.unwrapObservable(html);
-
-        if ((html !== null) && (html !== undefined)) {
-            if (typeof html != 'string')
-                html = html.toString();
-
-            // jQuery contains a lot of sophisticated code to parse arbitrary HTML fragments,
-            // for example <tr> elements which are not normally allowed to exist on their own.
-            // If you've referenced jQuery we'll use that rather than duplicating its code.
-            if (typeof jQuery != 'undefined') {
-                jQuery(node)['html'](html);
-            } else {
-                // ... otherwise, use KO's own parsing logic.
-                var parsedNodes = ko.utils.parseHtmlFragment(html);
-                for (var i = 0; i < parsedNodes.length; i++)
-                    node.appendChild(parsedNodes[i]);
-            }
-        }
-    };
-})();
-
-ko.exportSymbol('utils.parseHtmlFragment', ko.utils.parseHtmlFragment);
-ko.exportSymbol('utils.setHtml', ko.utils.setHtml);
-
-ko.memoization = (function () {
-    var memos = {};
-
-    function randomMax8HexChars() {
-        return (((1 + Math.random()) * 0x100000000) | 0).toString(16).substring(1);
-    }
-    function generateRandomId() {
-        return randomMax8HexChars() + randomMax8HexChars();
-    }
-    function findMemoNodes(rootNode, appendToArray) {
-        if (!rootNode)
-            return;
-        if (rootNode.nodeType == 8) {
-            var memoId = ko.memoization.parseMemoText(rootNode.nodeValue);
-            if (memoId != null)
-                appendToArray.push({ domNode: rootNode, memoId: memoId });
-        } else if (rootNode.nodeType == 1) {
-            for (var i = 0, childNodes = rootNode.childNodes, j = childNodes.length; i < j; i++)
-                findMemoNodes(childNodes[i], appendToArray);
-        }
-    }
-
-    return {
-        memoize: function (callback) {
-            if (typeof callback != "function")
-                throw new Error("You can only pass a function to ko.memoization.memoize()");
-            var memoId = generateRandomId();
-            memos[memoId] = callback;
-            return "<!--[ko_memo:" + memoId + "]-->";
-        },
-
-        unmemoize: function (memoId, callbackParams) {
-            var callback = memos[memoId];
-            if (callback === undefined)
-                throw new Error("Couldn't find any memo with ID " + memoId + ". Perhaps it's already been unmemoized.");
-            try {
-                callback.apply(null, callbackParams || []);
-                return true;
-            }
-            finally { delete memos[memoId]; }
-        },
-
-        unmemoizeDomNodeAndDescendants: function (domNode, extraCallbackParamsArray) {
-            var memos = [];
-            findMemoNodes(domNode, memos);
-            for (var i = 0, j = memos.length; i < j; i++) {
-                var node = memos[i].domNode;
-                var combinedParams = [node];
-                if (extraCallbackParamsArray)
-                    ko.utils.arrayPushAll(combinedParams, extraCallbackParamsArray);
-                ko.memoization.unmemoize(memos[i].memoId, combinedParams);
-                node.nodeValue = ""; // Neuter this node so we don't try to unmemoize it again
-                if (node.parentNode)
-                    node.parentNode.removeChild(node); // If possible, erase it totally (not always possible - someone else might just hold a reference to it then call unmemoizeDomNodeAndDescendants again)
-            }
-        },
-
-        parseMemoText: function (memoText) {
-            var match = memoText.match(/^\[ko_memo\:(.*?)\]$/);
-            return match ? match[1] : null;
-        }
-    };
-})();
-
-ko.exportSymbol('memoization', ko.memoization);
-ko.exportSymbol('memoization.memoize', ko.memoization.memoize);
-ko.exportSymbol('memoization.unmemoize', ko.memoization.unmemoize);
-ko.exportSymbol('memoization.parseMemoText', ko.memoization.parseMemoText);
-ko.exportSymbol('memoization.unmemoizeDomNodeAndDescendants', ko.memoization.unmemoizeDomNodeAndDescendants);
-ko.extenders = {
-    'throttle': function(target, timeout) {
-        // Throttling means two things:
-
-        // (1) For dependent observables, we throttle *evaluations* so that, no matter how fast its dependencies
-        //     notify updates, the target doesn't re-evaluate (and hence doesn't notify) faster than a certain rate
-        target['throttleEvaluation'] = timeout;
-
-        // (2) For writable targets (observables, or writable dependent observables), we throttle *writes*
-        //     so the target cannot change value synchronously or faster than a certain rate
-        var writeTimeoutInstance = null;
-        return ko.dependentObservable({
-            'read': target,
-            'write': function(value) {
-                clearTimeout(writeTimeoutInstance);
-                writeTimeoutInstance = setTimeout(function() {
-                    target(value);
-                }, timeout);
-            }
-        });
-    },
-
-    'notify': function(target, notifyWhen) {
-        target["equalityComparer"] = notifyWhen == "always"
-            ? function() { return false } // Treat all values as not equal
-            : ko.observable["fn"]["equalityComparer"];
-        return target;
-    }
-};
-
-function applyExtenders(requestedExtenders) {
-    var target = this;
-    if (requestedExtenders) {
-        for (var key in requestedExtenders) {
-            var extenderHandler = ko.extenders[key];
-            if (typeof extenderHandler == 'function') {
-                target = extenderHandler(target, requestedExtenders[key]);
-            }
-        }
-    }
-    return target;
-}
-
-ko.exportSymbol('extenders', ko.extenders);
-
-ko.subscription = function (target, callback, disposeCallback) {
-    this.target = target;
-    this.callback = callback;
-    this.disposeCallback = disposeCallback;
-    ko.exportProperty(this, 'dispose', this.dispose);
-};
-ko.subscription.prototype.dispose = function () {
-    this.isDisposed = true;
-    this.disposeCallback();
-};
-
-ko.subscribable = function () {
-    this._subscriptions = {};
-
-    ko.utils.extend(this, ko.subscribable['fn']);
-    ko.exportProperty(this, 'subscribe', this.subscribe);
-    ko.exportProperty(this, 'extend', this.extend);
-    ko.exportProperty(this, 'getSubscriptionsCount', this.getSubscriptionsCount);
-}
-
-var defaultEvent = "change";
-
-ko.subscribable['fn'] = {
-    subscribe: function (callback, callbackTarget, event) {
-        event = event || defaultEvent;
-        var boundCallback = callbackTarget ? callback.bind(callbackTarget) : callback;
-
-        var subscription = new ko.subscription(this, boundCallback, function () {
-            ko.utils.arrayRemoveItem(this._subscriptions[event], subscription);
-        }.bind(this));
-
-        if (!this._subscriptions[event])
-            this._subscriptions[event] = [];
-        this._subscriptions[event].push(subscription);
-        return subscription;
-    },
-
-    "notifySubscribers": function (valueToNotify, event) {
-        event = event || defaultEvent;
-        if (this._subscriptions[event]) {
-            ko.dependencyDetection.ignore(function() {
-                ko.utils.arrayForEach(this._subscriptions[event].slice(0), function (subscription) {
-                    // In case a subscription was disposed during the arrayForEach cycle, check
-                    // for isDisposed on each subscription before invoking its callback
-                    if (subscription && (subscription.isDisposed !== true))
-                        subscription.callback(valueToNotify);
-                });
-            }, this);
-        }
-    },
-
-    getSubscriptionsCount: function () {
-        var total = 0;
-        for (var eventName in this._subscriptions) {
-            if (this._subscriptions.hasOwnProperty(eventName))
-                total += this._subscriptions[eventName].length;
-        }
-        return total;
-    },
-
-    extend: applyExtenders
-};
-
-
-ko.isSubscribable = function (instance) {
-    return typeof instance.subscribe == "function" && typeof instance["notifySubscribers"] == "function";
-};
-
-ko.exportSymbol('subscribable', ko.subscribable);
-ko.exportSymbol('isSubscribable', ko.isSubscribable);
-
-ko.dependencyDetection = (function () {
-    var _frames = [];
-
-    return {
-        begin: function (callback) {
-            _frames.push({ callback: callback, distinctDependencies:[] });
-        },
-
-        end: function () {
-            _frames.pop();
-        },
-
-        registerDependency: function (subscribable) {
-            if (!ko.isSubscribable(subscribable))
-                throw new Error("Only subscribable things can act as dependencies");
-            if (_frames.length > 0) {
-                var topFrame = _frames[_frames.length - 1];
-                if (!topFrame || ko.utils.arrayIndexOf(topFrame.distinctDependencies, subscribable) >= 0)
-                    return;
-                topFrame.distinctDependencies.push(subscribable);
-                topFrame.callback(subscribable);
-            }
-        },
-
-        ignore: function(callback, callbackTarget, callbackArgs) {
-            try {
-                _frames.push(null);
-                return callback.apply(callbackTarget, callbackArgs || []);
-            } finally {
-                _frames.pop();
-            }
-        }
-    };
-})();
-var primitiveTypes = { 'undefined':true, 'boolean':true, 'number':true, 'string':true };
-
-ko.observable = function (initialValue) {
-    var _latestValue = initialValue;
-
-    function observable() {
-        if (arguments.length > 0) {
-            // Write
-
-            // Ignore writes if the value hasn't changed
-            if ((!observable['equalityComparer']) || !observable['equalityComparer'](_latestValue, arguments[0])) {
-                observable.valueWillMutate();
-                _latestValue = arguments[0];
-                if (DEBUG) observable._latestValue = _latestValue;
-                observable.valueHasMutated();
-            }
-            return this; // Permits chained assignments
-        }
-        else {
-            // Read
-            ko.dependencyDetection.registerDependency(observable); // The caller only needs to be notified of changes if they did a "read" operation
-            return _latestValue;
-        }
-    }
-    if (DEBUG) observable._latestValue = _latestValue;
-    ko.subscribable.call(observable);
-    observable.peek = function() { return _latestValue };
-    observable.valueHasMutated = function () { observable["notifySubscribers"](_latestValue); }
-    observable.valueWillMutate = function () { observable["notifySubscribers"](_latestValue, "beforeChange"); }
-    ko.utils.extend(observable, ko.observable['fn']);
-
-    ko.exportProperty(observable, 'peek', observable.peek);
-    ko.exportProperty(observable, "valueHasMutated", observable.valueHasMutated);
-    ko.exportProperty(observable, "valueWillMutate", observable.valueWillMutate);
-
-    return observable;
-}
-
-ko.observable['fn'] = {
-    "equalityComparer": function valuesArePrimitiveAndEqual(a, b) {
-        var oldValueIsPrimitive = (a === null) || (typeof(a) in primitiveTypes);
-        return oldValueIsPrimitive ? (a === b) : false;
-    }
-};
-
-var protoProperty = ko.observable.protoProperty = "__ko_proto__";
-ko.observable['fn'][protoProperty] = ko.observable;
-
-ko.hasPrototype = function(instance, prototype) {
-    if ((instance === null) || (instance === undefined) || (instance[protoProperty] === undefined)) return false;
-    if (instance[protoProperty] === prototype) return true;
-    return ko.hasPrototype(instance[protoProperty], prototype); // Walk the prototype chain
-};
-
-ko.isObservable = function (instance) {
-    return ko.hasPrototype(instance, ko.observable);
-}
-ko.isWriteableObservable = function (instance) {
-    // Observable
-    if ((typeof instance == "function") && instance[protoProperty] === ko.observable)
-        return true;
-    // Writeable dependent observable
-    if ((typeof instance == "function") && (instance[protoProperty] === ko.dependentObservable) && (instance.hasWriteFunction))
-        return true;
-    // Anything else
-    return false;
-}
-
-
-ko.exportSymbol('observable', ko.observable);
-ko.exportSymbol('isObservable', ko.isObservable);
-ko.exportSymbol('isWriteableObservable', ko.isWriteableObservable);
-ko.observableArray = function (initialValues) {
-    if (arguments.length == 0) {
-        // Zero-parameter constructor initializes to empty array
-        initialValues = [];
-    }
-    if ((initialValues !== null) && (initialValues !== undefined) && !('length' in initialValues))
-        throw new Error("The argument passed when initializing an observable array must be an array, or null, or undefined.");
-
-    var result = ko.observable(initialValues);
-    ko.utils.extend(result, ko.observableArray['fn']);
-    return result;
-}
-
-ko.observableArray['fn'] = {
-    'remove': function (valueOrPredicate) {
-        var underlyingArray = this.peek();
-        var removedValues = [];
-        var predicate = typeof valueOrPredicate == "function" ? valueOrPredicate : function (value) { return value === valueOrPredicate; };
-        for (var i = 0; i < underlyingArray.length; i++) {
-            var value = underlyingArray[i];
-            if (predicate(value)) {
-                if (removedValues.length === 0) {
-                    this.valueWillMutate();
-                }
-                removedValues.push(value);
-                underlyingArray.splice(i, 1);
-                i--;
-            }
-        }
-        if (removedValues.length) {
-            this.valueHasMutated();
-        }
-        return removedValues;
-    },
-
-    'removeAll': function (arrayOfValues) {
-        // If you passed zero args, we remove everything
-        if (arrayOfValues === undefined) {
-            var underlyingArray = this.peek();
-            var allValues = underlyingArray.slice(0);
-            this.valueWillMutate();
-            underlyingArray.splice(0, underlyingArray.length);
-            this.valueHasMutated();
-            return allValues;
-        }
-        // If you passed an arg, we interpret it as an array of entries to remove
-        if (!arrayOfValues)
-            return [];
-        return this['remove'](function (value) {
-            return ko.utils.arrayIndexOf(arrayOfValues, value) >= 0;
-        });
-    },
-
-    'destroy': function (valueOrPredicate) {
-        var underlyingArray = this.peek();
-        var predicate = typeof valueOrPredicate == "function" ? valueOrPredicate : function (value) { return value === valueOrPredicate; };
-        this.valueWillMutate();
-        for (var i = underlyingArray.length - 1; i >= 0; i--) {
-            var value = underlyingArray[i];
-            if (predicate(value))
-                underlyingArray[i]["_destroy"] = true;
-        }
-        this.valueHasMutated();
-    },
-
-    'destroyAll': function (arrayOfValues) {
-        // If you passed zero args, we destroy everything
-        if (arrayOfValues === undefined)
-            return this['destroy'](function() { return true });
-
-        // If you passed an arg, we interpret it as an array of entries to destroy
-        if (!arrayOfValues)
-            return [];
-        return this['destroy'](function (value) {
-            return ko.utils.arrayIndexOf(arrayOfValues, value) >= 0;
-        });
-    },
-
-    'indexOf': function (item) {
-        var underlyingArray = this();
-        return ko.utils.arrayIndexOf(underlyingArray, item);
-    },
-
-    'replace': function(oldItem, newItem) {
-        var index = this['indexOf'](oldItem);
-        if (index >= 0) {
-            this.valueWillMutate();
-            this.peek()[index] = newItem;
-            this.valueHasMutated();
-        }
-    }
-}
-
-// Populate ko.observableArray.fn with read/write functions from native arrays
-// Important: Do not add any additional functions here that may reasonably be used to *read* data from the array
-// because we'll eval them without causing subscriptions, so ko.computed output could end up getting stale
-ko.utils.arrayForEach(["pop", "push", "reverse", "shift", "sort", "splice", "unshift"], function (methodName) {
-    ko.observableArray['fn'][methodName] = function () {
-        // Use "peek" to avoid creating a subscription in any computed that we're executing in the context of
-        // (for consistency with mutating regular observables)
-        var underlyingArray = this.peek();
-        this.valueWillMutate();
-        var methodCallResult = underlyingArray[methodName].apply(underlyingArray, arguments);
-        this.valueHasMutated();
-        return methodCallResult;
-    };
-});
-
-// Populate ko.observableArray.fn with read-only functions from native arrays
-ko.utils.arrayForEach(["slice"], function (methodName) {
-    ko.observableArray['fn'][methodName] = function () {
-        var underlyingArray = this();
-        return underlyingArray[methodName].apply(underlyingArray, arguments);
-    };
-});
-
-ko.exportSymbol('observableArray', ko.observableArray);
-ko.dependentObservable = function (evaluatorFunctionOrOptions, evaluatorFunctionTarget, options) {
-    var _latestValue,
-        _hasBeenEvaluated = false,
-        _isBeingEvaluated = false,
-        readFunction = evaluatorFunctionOrOptions;
-
-    if (readFunction && typeof readFunction == "object") {
-        // Single-parameter syntax - everything is on this "options" param
-        options = readFunction;
-        readFunction = options["read"];
-    } else {
-        // Multi-parameter syntax - construct the options according to the params passed
-        options = options || {};
-        if (!readFunction)
-            readFunction = options["read"];
-    }
-    if (typeof readFunction != "function")
-        throw new Error("Pass a function that returns the value of the ko.computed");
-
-    function addSubscriptionToDependency(subscribable) {
-        _subscriptionsToDependencies.push(subscribable.subscribe(evaluatePossiblyAsync));
-    }
-
-    function disposeAllSubscriptionsToDependencies() {
-        ko.utils.arrayForEach(_subscriptionsToDependencies, function (subscription) {
-            subscription.dispose();
-        });
-        _subscriptionsToDependencies = [];
-    }
-
-    function evaluatePossiblyAsync() {
-        var throttleEvaluationTimeout = dependentObservable['throttleEvaluation'];
-        if (throttleEvaluationTimeout && throttleEvaluationTimeout >= 0) {
-            clearTimeout(evaluationTimeoutInstance);
-            evaluationTimeoutInstance = setTimeout(evaluateImmediate, throttleEvaluationTimeout);
-        } else
-            evaluateImmediate();
-    }
-
-    function evaluateImmediate() {
-        if (_isBeingEvaluated) {
-            // If the evaluation of a ko.computed causes side effects, it's possible that it will trigger its own re-evaluation.
-            // This is not desirable (it's hard for a developer to realise a chain of dependencies might cause this, and they almost
-            // certainly didn't intend infinite re-evaluations). So, for predictability, we simply prevent ko.computeds from causing
-            // their own re-evaluation. Further discussion at https://github.com/SteveSanderson/knockout/pull/387
-            return;
-        }
-
-        // Don't dispose on first evaluation, because the "disposeWhen" callback might
-        // e.g., dispose when the associated DOM element isn't in the doc, and it's not
-        // going to be in the doc until *after* the first evaluation
-        if (_hasBeenEvaluated && disposeWhen()) {
-            dispose();
-            return;
-        }
-
-        _isBeingEvaluated = true;
-        try {
-            // Initially, we assume that none of the subscriptions are still being used (i.e., all are candidates for disposal).
-            // Then, during evaluation, we cross off any that are in fact still being used.
-            var disposalCandidates = ko.utils.arrayMap(_subscriptionsToDependencies, function(item) {return item.target;});
-
-            ko.dependencyDetection.begin(function(subscribable) {
-                var inOld;
-                if ((inOld = ko.utils.arrayIndexOf(disposalCandidates, subscribable)) >= 0)
-                    disposalCandidates[inOld] = undefined; // Don't want to dispose this subscription, as it's still being used
-                else
-                    addSubscriptionToDependency(subscribable); // Brand new subscription - add it
-            });
-
-            var newValue = readFunction.call(evaluatorFunctionTarget);
-
-            // For each subscription no longer being used, remove it from the active subscriptions list and dispose it
-            for (var i = disposalCandidates.length - 1; i >= 0; i--) {
-                if (disposalCandidates[i])
-                    _subscriptionsToDependencies.splice(i, 1)[0].dispose();
-            }
-            _hasBeenEvaluated = true;
-
-            dependentObservable["notifySubscribers"](_latestValue, "beforeChange");
-            _latestValue = newValue;
-            if (DEBUG) dependentObservable._latestValue = _latestValue;
-        } finally {
-            ko.dependencyDetection.end();
-        }
-
-        dependentObservable["notifySubscribers"](_latestValue);
-        _isBeingEvaluated = false;
-        if (!_subscriptionsToDependencies.length)
-            dispose();
-    }
-
-    function dependentObservable() {
-        if (arguments.length > 0) {
-            if (typeof writeFunction === "function") {
-                // Writing a value
-                writeFunction.apply(evaluatorFunctionTarget, arguments);
-            } else {
-                throw new Error("Cannot write a value to a ko.computed unless you specify a 'write' option. If you wish to read the current value, don't pass any parameters.");
-            }
-            return this; // Permits chained assignments
-        } else {
-            // Reading the value
-            if (!_hasBeenEvaluated)
-                evaluateImmediate();
-            ko.dependencyDetection.registerDependency(dependentObservable);
-            return _latestValue;
-        }
-    }
-
-    function peek() {
-        if (!_hasBeenEvaluated)
-            evaluateImmediate();
-        return _latestValue;
-    }
-
-    function isActive() {
-        return !_hasBeenEvaluated || _subscriptionsToDependencies.length > 0;
-    }
-
-    // By here, "options" is always non-null
-    var writeFunction = options["write"],
-        disposeWhenNodeIsRemoved = options["disposeWhenNodeIsRemoved"] || options.disposeWhenNodeIsRemoved || null,
-        disposeWhen = options["disposeWhen"] || options.disposeWhen || function() { return false; },
-        dispose = disposeAllSubscriptionsToDependencies,
-        _subscriptionsToDependencies = [],
-        evaluationTimeoutInstance = null;
-
-    if (!evaluatorFunctionTarget)
-        evaluatorFunctionTarget = options["owner"];
-
-    dependentObservable.peek = peek;
-    dependentObservable.getDependenciesCount = function () { return _subscriptionsToDependencies.length; };
-    dependentObservable.hasWriteFunction = typeof options["write"] === "function";
-    dependentObservable.dispose = function () { dispose(); };
-    dependentObservable.isActive = isActive;
-    dependentObservable.valueHasMutated = function() {
-        _hasBeenEvaluated = false;
-        evaluateImmediate();
-    };
-
-    ko.subscribable.call(dependentObservable);
-    ko.utils.extend(dependentObservable, ko.dependentObservable['fn']);
-
-    ko.exportProperty(dependentObservable, 'peek', dependentObservable.peek);
-    ko.exportProperty(dependentObservable, 'dispose', dependentObservable.dispose);
-    ko.exportProperty(dependentObservable, 'isActive', dependentObservable.isActive);
-    ko.exportProperty(dependentObservable, 'getDependenciesCount', dependentObservable.getDependenciesCount);
-
-    // Evaluate, unless deferEvaluation is true
-    if (options['deferEvaluation'] !== true)
-        evaluateImmediate();
-
-    // Build "disposeWhenNodeIsRemoved" and "disposeWhenNodeIsRemovedCallback" option values.
-    // But skip if isActive is false (there will never be any dependencies to dispose).
-    // (Note: "disposeWhenNodeIsRemoved" option both proactively disposes as soon as the node is removed using ko.removeNode(),
-    // plus adds a "disposeWhen" callback that, on each evaluation, disposes if the node was removed by some other means.)
-    if (disposeWhenNodeIsRemoved && isActive()) {
-        dispose = function() {
-            ko.utils.domNodeDisposal.removeDisposeCallback(disposeWhenNodeIsRemoved, arguments.callee);
-            disposeAllSubscriptionsToDependencies();
-        };
-        ko.utils.domNodeDisposal.addDisposeCallback(disposeWhenNodeIsRemoved, dispose);
-        var existingDisposeWhenFunction = disposeWhen;
-        disposeWhen = function () {
-            return !ko.utils.domNodeIsAttachedToDocument(disposeWhenNodeIsRemoved) || existingDisposeWhenFunction();
-        }
-    }
-
-    return dependentObservable;
-};
-
-ko.isComputed = function(instance) {
-    return ko.hasPrototype(instance, ko.dependentObservable);
-};
-
-var protoProp = ko.observable.protoProperty; // == "__ko_proto__"
-ko.dependentObservable[protoProp] = ko.observable;
-
-ko.dependentObservable['fn'] = {};
-ko.dependentObservable['fn'][protoProp] = ko.dependentObservable;
-
-ko.exportSymbol('dependentObservable', ko.dependentObservable);
-ko.exportSymbol('computed', ko.dependentObservable); // Make "ko.computed" an alias for "ko.dependentObservable"
-ko.exportSymbol('isComputed', ko.isComputed);
-
-(function() {
-    var maxNestedObservableDepth = 10; // Escape the (unlikely) pathalogical case where an observable's current value is itself (or similar reference cycle)
-
-    ko.toJS = function(rootObject) {
-        if (arguments.length == 0)
-            throw new Error("When calling ko.toJS, pass the object you want to convert.");
-
-        // We just unwrap everything at every level in the object graph
-        return mapJsObjectGraph(rootObject, function(valueToMap) {
-            // Loop because an observable's value might in turn be another observable wrapper
-            for (var i = 0; ko.isObservable(valueToMap) && (i < maxNestedObservableDepth); i++)
-                valueToMap = valueToMap();
-            return valueToMap;
-        });
-    };
-
-    ko.toJSON = function(rootObject, replacer, space) {     // replacer and space are optional
-        var plainJavaScriptObject = ko.toJS(rootObject);
-        return ko.utils.stringifyJson(plainJavaScriptObject, replacer, space);
-    };
-
-    function mapJsObjectGraph(rootObject, mapInputCallback, visitedObjects) {
-        visitedObjects = visitedObjects || new objectLookup();
-
-        rootObject = mapInputCallback(rootObject);
-        var canHaveProperties = (typeof rootObject == "object") && (rootObject !== null) && (rootObject !== undefined) && (!(rootObject instanceof Date));
-        if (!canHaveProperties)
-            return rootObject;
-
-        var outputProperties = rootObject instanceof Array ? [] : {};
-        visitedObjects.save(rootObject, outputProperties);
-
-        visitPropertiesOrArrayEntries(rootObject, function(indexer) {
-            var propertyValue = mapInputCallback(rootObject[indexer]);
-
-            switch (typeof propertyValue) {
-                case "boolean":
-                case "number":
-                case "string":
-                case "function":
-                    outputProperties[indexer] = propertyValue;
-                    break;
-                case "object":
-                case "undefined":
-                    var previouslyMappedValue = visitedObjects.get(propertyValue);
-                    outputProperties[indexer] = (previouslyMappedValue !== undefined)
-                        ? previouslyMappedValue
-                        : mapJsObjectGraph(propertyValue, mapInputCallback, visitedObjects);
-                    break;
-            }
-        });
-
-        return outputProperties;
-    }
-
-    function visitPropertiesOrArrayEntries(rootObject, visitorCallback) {
-        if (rootObject instanceof Array) {
-            for (var i = 0; i < rootObject.length; i++)
-                visitorCallback(i);
-
-            // For arrays, also respect toJSON property for custom mappings (fixes #278)
-            if (typeof rootObject['toJSON'] == 'function')
-                visitorCallback('toJSON');
-        } else {
-            for (var propertyName in rootObject)
-                visitorCallback(propertyName);
-        }
-    };
-
-    function objectLookup() {
-        var keys = [];
-        var values = [];
-        this.save = function(key, value) {
-            var existingIndex = ko.utils.arrayIndexOf(keys, key);
-            if (existingIndex >= 0)
-                values[existingIndex] = value;
-            else {
-                keys.push(key);
-                values.push(value);
-            }
-        };
-        this.get = function(key) {
-            var existingIndex = ko.utils.arrayIndexOf(keys, key);
-            return (existingIndex >= 0) ? values[existingIndex] : undefined;
-        };
-    };
-})();
-
-ko.exportSymbol('toJS', ko.toJS);
-ko.exportSymbol('toJSON', ko.toJSON);
-(function () {
-    var hasDomDataExpandoProperty = '__ko__hasDomDataOptionValue__';
-
-    // Normally, SELECT elements and their OPTIONs can only take value of type 'string' (because the values
-    // are stored on DOM attributes). ko.selectExtensions provides a way for SELECTs/OPTIONs to have values
-    // that are arbitrary objects. This is very convenient when implementing things like cascading dropdowns.
-    ko.selectExtensions = {
-        readValue : function(element) {
-            switch (ko.utils.tagNameLower(element)) {
-                case 'option':
-                    if (element[hasDomDataExpandoProperty] === true)
-                        return ko.utils.domData.get(element, ko.bindingHandlers.options.optionValueDomDataKey);
-                    return ko.utils.ieVersion <= 7
-                        ? (element.getAttributeNode('value').specified ? element.value : element.text)
-                        : element.value;
-                case 'select':
-                    return element.selectedIndex >= 0 ? ko.selectExtensions.readValue(element.options[element.selectedIndex]) : undefined;
-                default:
-                    return element.value;
-            }
-        },
-
-        writeValue: function(element, value) {
-            switch (ko.utils.tagNameLower(element)) {
-                case 'option':
-                    switch(typeof value) {
-                        case "string":
-                            ko.utils.domData.set(element, ko.bindingHandlers.options.optionValueDomDataKey, undefined);
-                            if (hasDomDataExpandoProperty in element) { // IE <= 8 throws errors if you delete non-existent properties from a DOM node
-                                delete element[hasDomDataExpandoProperty];
-                            }
-                            element.value = value;
-                            break;
-                        default:
-                            // Store arbitrary object using DomData
-                            ko.utils.domData.set(element, ko.bindingHandlers.options.optionValueDomDataKey, value);
-                            element[hasDomDataExpandoProperty] = true;
-
-                            // Special treatment of numbers is just for backward compatibility. KO 1.2.1 wrote numerical values to element.value.
-                            element.value = typeof value === "number" ? value : "";
-                            break;
-                    }
-                    break;
-                case 'select':
-                    for (var i = element.options.length - 1; i >= 0; i--) {
-                        if (ko.selectExtensions.readValue(element.options[i]) == value) {
-                            element.selectedIndex = i;
-                            break;
-                        }
-                    }
-                    break;
-                default:
-                    if ((value === null) || (value === undefined))
-                        value = "";
-                    element.value = value;
-                    break;
-            }
-        }
-    };
-})();
-
-ko.exportSymbol('selectExtensions', ko.selectExtensions);
-ko.exportSymbol('selectExtensions.readValue', ko.selectExtensions.readValue);
-ko.exportSymbol('selectExtensions.writeValue', ko.selectExtensions.writeValue);
-ko.expressionRewriting = (function () {
-    var restoreCapturedTokensRegex = /\@ko_token_(\d+)\@/g;
-    var javaScriptReservedWords = ["true", "false"];
-
-    // Matches something that can be assigned to--either an isolated identifier or something ending with a property accessor
-    // This is designed to be simple and avoid false negatives, but could produce false positives (e.g., a+b.c).
-    var javaScriptAssignmentTarget = /^(?:[$_a-z][$\w]*|(.+)(\.\s*[$_a-z][$\w]*|\[.+\]))$/i;
-
-    function restoreTokens(string, tokens) {
-        var prevValue = null;
-        while (string != prevValue) { // Keep restoring tokens until it no longer makes a difference (they may be nested)
-            prevValue = string;
-            string = string.replace(restoreCapturedTokensRegex, function (match, tokenIndex) {
-                return tokens[tokenIndex];
-            });
-        }
-        return string;
-    }
-
-    function getWriteableValue(expression) {
-        if (ko.utils.arrayIndexOf(javaScriptReservedWords, ko.utils.stringTrim(expression).toLowerCase()) >= 0)
-            return false;
-        var match = expression.match(javaScriptAssignmentTarget);
-        return match === null ? false : match[1] ? ('Object(' + match[1] + ')' + match[2]) : expression;
-    }
-
-    function ensureQuoted(key) {
-        var trimmedKey = ko.utils.stringTrim(key);
-        switch (trimmedKey.length && trimmedKey.charAt(0)) {
-            case "'":
-            case '"':
-                return key;
-            default:
-                return "'" + trimmedKey + "'";
-        }
-    }
-
-    return {
-        bindingRewriteValidators: [],
-
-        parseObjectLiteral: function(objectLiteralString) {
-            // A full tokeniser+lexer would add too much weight to this library, so here's a simple parser
-            // that is sufficient just to split an object literal string into a set of top-level key-value pairs
-
-            var str = ko.utils.stringTrim(objectLiteralString);
-            if (str.length < 3)
-                return [];
-            if (str.charAt(0) === "{")// Ignore any braces surrounding the whole object literal
-                str = str.substring(1, str.length - 1);
-
-            // Pull out any string literals and regex literals
-            var tokens = [];
-            var tokenStart = null, tokenEndChar;
-            for (var position = 0; position < str.length; position++) {
-                var c = str.charAt(position);
-                if (tokenStart === null) {
-                    switch (c) {
-                        case '"':
-                        case "'":
-                        case "/":
-                            tokenStart = position;
-                            tokenEndChar = c;
-                            break;
-                    }
-                } else if ((c == tokenEndChar) && (str.charAt(position - 1) !== "\\")) {
-                    var token = str.substring(tokenStart, position + 1);
-                    tokens.push(token);
-                    var replacement = "@ko_token_" + (tokens.length - 1) + "@";
-                    str = str.substring(0, tokenStart) + replacement + str.substring(position + 1);
-                    position -= (token.length - replacement.length);
-                    tokenStart = null;
-                }
-            }
-
-            // Next pull out balanced paren, brace, and bracket blocks
-            tokenStart = null;
-            tokenEndChar = null;
-            var tokenDepth = 0, tokenStartChar = null;
-            for (var position = 0; position < str.length; position++) {
-                var c = str.charAt(position);
-                if (tokenStart === null) {
-                    switch (c) {
-                        case "{": tokenStart = position; tokenStartChar = c;
-                                  tokenEndChar = "}";
-                                  break;
-                        case "(": tokenStart = position; tokenStartChar = c;
-                                  tokenEndChar = ")";
-                                  break;
-                        case "[": tokenStart = position; tokenStartChar = c;
-                                  tokenEndChar = "]";
-                                  break;
-                    }
-                }
-
-                if (c === tokenStartChar)
-                    tokenDepth++;
-                else if (c === tokenEndChar) {
-                    tokenDepth--;
-                    if (tokenDepth === 0) {
-                        var token = str.substring(tokenStart, position + 1);
-                        tokens.push(token);
-                        var replacement = "@ko_token_" + (tokens.length - 1) + "@";
-                        str = str.substring(0, tokenStart) + replacement + str.substring(position + 1);
-                        position -= (token.length - replacement.length);
-                        tokenStart = null;
-                    }
-                }
-            }
-
-            // Now we can safely split on commas to get the key/value pairs
-            var result = [];
-            var keyValuePairs = str.split(",");
-            for (var i = 0, j = keyValuePairs.length; i < j; i++) {
-                var pair = keyValuePairs[i];
-                var colonPos = pair.indexOf(":");
-                if ((colonPos > 0) && (colonPos < pair.length - 1)) {
-                    var key = pair.substring(0, colonPos);
-                    var value = pair.substring(colonPos + 1);
-                    result.push({ 'key': restoreTokens(key, tokens), 'value': restoreTokens(value, tokens) });
-                } else {
-                    result.push({ 'unknown': restoreTokens(pair, tokens) });
-                }
-            }
-            return result;
-        },
-
-        preProcessBindings: function (objectLiteralStringOrKeyValueArray) {
-            var keyValueArray = typeof objectLiteralStringOrKeyValueArray === "string"
-                ? ko.expressionRewriting.parseObjectLiteral(objectLiteralStringOrKeyValueArray)
-                : objectLiteralStringOrKeyValueArray;
-            var resultStrings = [], propertyAccessorResultStrings = [];
-
-            var keyValueEntry;
-            for (var i = 0; keyValueEntry = keyValueArray[i]; i++) {
-                if (resultStrings.length > 0)
-                    resultStrings.push(",");
-
-                if (keyValueEntry['key']) {
-                    var quotedKey = ensureQuoted(keyValueEntry['key']), val = keyValueEntry['value'];
-                    resultStrings.push(quotedKey);
-                    resultStrings.push(":");
-                    resultStrings.push(val);
-
-                    if (val = getWriteableValue(ko.utils.stringTrim(val))) {
-                        if (propertyAccessorResultStrings.length > 0)
-                            propertyAccessorResultStrings.push(", ");
-                        propertyAccessorResultStrings.push(quotedKey + " : function(__ko_value) { " + val + " = __ko_value; }");
-                    }
-                } else if (keyValueEntry['unknown']) {
-                    resultStrings.push(keyValueEntry['unknown']);
-                }
-            }
-
-            var combinedResult = resultStrings.join("");
-            if (propertyAccessorResultStrings.length > 0) {
-                var allPropertyAccessors = propertyAccessorResultStrings.join("");
-                combinedResult = combinedResult + ", '_ko_property_writers' : { " + allPropertyAccessors + " } ";
-            }
-
-            return combinedResult;
-        },
-
-        keyValueArrayContainsKey: function(keyValueArray, key) {
-            for (var i = 0; i < keyValueArray.length; i++)
-                if (ko.utils.stringTrim(keyValueArray[i]['key']) == key)
-                    return true;
-            return false;
-        },
-
-        // Internal, private KO utility for updating model properties from within bindings
-        // property:            If the property being updated is (or might be) an observable, pass it here
-        //                      If it turns out to be a writable observable, it will be written to directly
-        // allBindingsAccessor: All bindings in the current execution context.
-        //                      This will be searched for a '_ko_property_writers' property in case you're writing to a non-observable
-        // key:                 The key identifying the property to be written. Example: for { hasFocus: myValue }, write to 'myValue' by specifying the key 'hasFocus'
-        // value:               The value to be written
-        // checkIfDifferent:    If true, and if the property being written is a writable observable, the value will only be written if
-        //                      it is !== existing value on that writable observable
-        writeValueToProperty: function(property, allBindingsAccessor, key, value, checkIfDifferent) {
-            if (!property || !ko.isWriteableObservable(property)) {
-                var propWriters = allBindingsAccessor()['_ko_property_writers'];
-                if (propWriters && propWriters[key])
-                    propWriters[key](value);
-            } else if (!checkIfDifferent || property.peek() !== value) {
-                property(value);
-            }
-        }
-    };
-})();
-
-ko.exportSymbol('expressionRewriting', ko.expressionRewriting);
-ko.exportSymbol('expressionRewriting.bindingRewriteValidators', ko.expressionRewriting.bindingRewriteValidators);
-ko.exportSymbol('expressionRewriting.parseObjectLiteral', ko.expressionRewriting.parseObjectLiteral);
-ko.exportSymbol('expressionRewriting.preProcessBindings', ko.expressionRewriting.preProcessBindings);
-
-// For backward compatibility, define the following aliases. (Previously, these function names were misleading because
-// they referred to JSON specifically, even though they actually work with arbitrary JavaScript object literal expressions.)
-ko.exportSymbol('jsonExpressionRewriting', ko.expressionRewriting);
-ko.exportSymbol('jsonExpressionRewriting.insertPropertyAccessorsIntoJson', ko.expressionRewriting.preProcessBindings);(function() {
-    // "Virtual elements" is an abstraction on top of the usual DOM API which understands the notion that comment nodes
-    // may be used to represent hierarchy (in addition to the DOM's natural hierarchy).
-    // If you call the DOM-manipulating functions on ko.virtualElements, you will be able to read and write the state
-    // of that virtual hierarchy
-    //
-    // The point of all this is to support containerless templates (e.g., <!-- ko foreach:someCollection -->blah<!-- /ko -->)
-    // without having to scatter special cases all over the binding and templating code.
-
-    // IE 9 cannot reliably read the "nodeValue" property of a comment node (see https://github.com/SteveSanderson/knockout/issues/186)
-    // but it does give them a nonstandard alternative property called "text" that it can read reliably. Other browsers don't have that property.
-    // So, use node.text where available, and node.nodeValue elsewhere
-    var commentNodesHaveTextProperty = document.createComment("test").text === "<!--test-->";
-
-    var startCommentRegex = commentNodesHaveTextProperty ? /^<!--\s*ko(?:\s+(.+\s*\:[\s\S]*))?\s*-->$/ : /^\s*ko(?:\s+(.+\s*\:[\s\S]*))?\s*$/;
-    var endCommentRegex =   commentNodesHaveTextProperty ? /^<!--\s*\/ko\s*-->$/ : /^\s*\/ko\s*$/;
-    var htmlTagsWithOptionallyClosingChildren = { 'ul': true, 'ol': true };
-
-    function isStartComment(node) {
-        return (node.nodeType == 8) && (commentNodesHaveTextProperty ? node.text : node.nodeValue).match(startCommentRegex);
-    }
-
-    function isEndComment(node) {
-        return (node.nodeType == 8) && (commentNodesHaveTextProperty ? node.text : node.nodeValue).match(endCommentRegex);
-    }
-
-    function getVirtualChildren(startComment, allowUnbalanced) {
-        var currentNode = startComment;
-        var depth = 1;
-        var children = [];
-        while (currentNode = currentNode.nextSibling) {
-            if (isEndComment(currentNode)) {
-                depth--;
-                if (depth === 0)
-                    return children;
-            }
-
-            children.push(currentNode);
-
-            if (isStartComment(currentNode))
-                depth++;
-        }
-        if (!allowUnbalanced)
-            throw new Error("Cannot find closing comment tag to match: " + startComment.nodeValue);
-        return null;
-    }
-
-    function getMatchingEndComment(startComment, allowUnbalanced) {
-        var allVirtualChildren = getVirtualChildren(startComment, allowUnbalanced);
-        if (allVirtualChildren) {
-            if (allVirtualChildren.length > 0)
-                return allVirtualChildren[allVirtualChildren.length - 1].nextSibling;
-            return startComment.nextSibling;
-        } else
-            return null; // Must have no matching end comment, and allowUnbalanced is true
-    }
-
-    function getUnbalancedChildTags(node) {
-        // e.g., from <div>OK</div><!-- ko blah --><span>Another</span>, returns: <!-- ko blah --><span>Another</span>
-        //       from <div>OK</div><!-- /ko --><!-- /ko -->,             returns: <!-- /ko --><!-- /ko -->
-        var childNode = node.firstChild, captureRemaining = null;
-        if (childNode) {
-            do {
-                if (captureRemaining)                   // We already hit an unbalanced node and are now just scooping up all subsequent nodes
-                    captureRemaining.push(childNode);
-                else if (isStartComment(childNode)) {
-                    var matchingEndComment = getMatchingEndComment(childNode, /* allowUnbalanced: */ true);
-                    if (matchingEndComment)             // It's a balanced tag, so skip immediately to the end of this virtual set
-                        childNode = matchingEndComment;
-                    else
-                        captureRemaining = [childNode]; // It's unbalanced, so start capturing from this point
-                } else if (isEndComment(childNode)) {
-                    captureRemaining = [childNode];     // It's unbalanced (if it wasn't, we'd have skipped over it already), so start capturing
-                }
-            } while (childNode = childNode.nextSibling);
-        }
-        return captureRemaining;
-    }
-
-    ko.virtualElements = {
-        allowedBindings: {},
-
-        childNodes: function(node) {
-            return isStartComment(node) ? getVirtualChildren(node) : node.childNodes;
-        },
-
-        emptyNode: function(node) {
-            if (!isStartComment(node))
-                ko.utils.emptyDomNode(node);
-            else {
-                var virtualChildren = ko.virtualElements.childNodes(node);
-                for (var i = 0, j = virtualChildren.length; i < j; i++)
-                    ko.removeNode(virtualChildren[i]);
-            }
-        },
-
-        setDomNodeChildren: function(node, childNodes) {
-            if (!isStartComment(node))
-                ko.utils.setDomNodeChildren(node, childNodes);
-            else {
-                ko.virtualElements.emptyNode(node);
-                var endCommentNode = node.nextSibling; // Must be the next sibling, as we just emptied the children
-                for (var i = 0, j = childNodes.length; i < j; i++)
-                    endCommentNode.parentNode.insertBefore(childNodes[i], endCommentNode);
-            }
-        },
-
-        prepend: function(containerNode, nodeToPrepend) {
-            if (!isStartComment(containerNode)) {
-                if (containerNode.firstChild)
-                    containerNode.insertBefore(nodeToPrepend, containerNode.firstChild);
-                else
-                    containerNode.appendChild(nodeToPrepend);
-            } else {
-                // Start comments must always have a parent and at least one following sibling (the end comment)
-                containerNode.parentNode.insertBefore(nodeToPrepend, containerNode.nextSibling);
-            }
-        },
-
-        insertAfter: function(containerNode, nodeToInsert, insertAfterNode) {
-            if (!insertAfterNode) {
-                ko.virtualElements.prepend(containerNode, nodeToInsert);
-            } else if (!isStartComment(containerNode)) {
-                // Insert after insertion point
-                if (insertAfterNode.nextSibling)
-                    containerNode.insertBefore(nodeToInsert, insertAfterNode.nextSibling);
-                else
-                    containerNode.appendChild(nodeToInsert);
-            } else {
-                // Children of start comments must always have a parent and at least one following sibling (the end comment)
-                containerNode.parentNode.insertBefore(nodeToInsert, insertAfterNode.nextSibling);
-            }
-        },
-
-        firstChild: function(node) {
-            if (!isStartComment(node))
-                return node.firstChild;
-            if (!node.nextSibling || isEndComment(node.nextSibling))
-                return null;
-            return node.nextSibling;
-        },
-
-        nextSibling: function(node) {
-            if (isStartComment(node))
-                node = getMatchingEndComment(node);
-            if (node.nextSibling && isEndComment(node.nextSibling))
-                return null;
-            return node.nextSibling;
-        },
-
-        virtualNodeBindingValue: function(node) {
-            var regexMatch = isStartComment(node);
-            return regexMatch ? regexMatch[1] : null;
-        },
-
-        normaliseVirtualElementDomStructure: function(elementVerified) {
-            // Workaround for https://github.com/SteveSanderson/knockout/issues/155
-            // (IE <= 8 or IE 9 quirks mode parses your HTML weirdly, treating closing </li> tags as if they don't exist, thereby moving comment nodes
-            // that are direct descendants of <ul> into the preceding <li>)
-            if (!htmlTagsWithOptionallyClosingChildren[ko.utils.tagNameLower(elementVerified)])
-                return;
-
-            // Scan immediate children to see if they contain unbalanced comment tags. If they do, those comment tags
-            // must be intended to appear *after* that child, so move them there.
-            var childNode = elementVerified.firstChild;
-            if (childNode) {
-                do {
-                    if (childNode.nodeType === 1) {
-                        var unbalancedTags = getUnbalancedChildTags(childNode);
-                        if (unbalancedTags) {
-                            // Fix up the DOM by moving the unbalanced tags to where they most likely were intended to be placed - *after* the child
-                            var nodeToInsertBefore = childNode.nextSibling;
-                            for (var i = 0; i < unbalancedTags.length; i++) {
-                                if (nodeToInsertBefore)
-                                    elementVerified.insertBefore(unbalancedTags[i], nodeToInsertBefore);
-                                else
-                                    elementVerified.appendChild(unbalancedTags[i]);
-                            }
-                        }
-                    }
-                } while (childNode = childNode.nextSibling);
-            }
-        }
-    };
-})();
-ko.exportSymbol('virtualElements', ko.virtualElements);
-ko.exportSymbol('virtualElements.allowedBindings', ko.virtualElements.allowedBindings);
-ko.exportSymbol('virtualElements.emptyNode', ko.virtualElements.emptyNode);
-//ko.exportSymbol('virtualElements.firstChild', ko.virtualElements.firstChild);     // firstChild is not minified
-ko.exportSymbol('virtualElements.insertAfter', ko.virtualElements.insertAfter);
-//ko.exportSymbol('virtualElements.nextSibling', ko.virtualElements.nextSibling);   // nextSibling is not minified
-ko.exportSymbol('virtualElements.prepend', ko.virtualElements.prepend);
-ko.exportSymbol('virtualElements.setDomNodeChildren', ko.virtualElements.setDomNodeChildren);
-(function() {
-    var defaultBindingAttributeName = "data-bind";
-
-    ko.bindingProvider = function() {
-        this.bindingCache = {};
-    };
-
-    ko.utils.extend(ko.bindingProvider.prototype, {
-        'nodeHasBindings': function(node) {
-            switch (node.nodeType) {
-                case 1: return node.getAttribute(defaultBindingAttributeName) != null;   // Element
-                case 8: return ko.virtualElements.virtualNodeBindingValue(node) != null; // Comment node
-                default: return false;
-            }
-        },
-
-        'getBindings': function(node, bindingContext) {
-            var bindingsString = this['getBindingsString'](node, bindingContext);
-            return bindingsString ? this['parseBindingsString'](bindingsString, bindingContext, node) : null;
-        },
-
-        // The following function is only used internally by this default provider.
-        // It's not part of the interface definition for a general binding provider.
-        'getBindingsString': function(node, bindingContext) {
-            switch (node.nodeType) {
-                case 1: return node.getAttribute(defaultBindingAttributeName);   // Element
-                case 8: return ko.virtualElements.virtualNodeBindingValue(node); // Comment node
-                default: return null;
-            }
-        },
-
-        // The following function is only used internally by this default provider.
-        // It's not part of the interface definition for a general binding provider.
-        'parseBindingsString': function(bindingsString, bindingContext, node) {
-            try {
-                var bindingFunction = createBindingsStringEvaluatorViaCache(bindingsString, this.bindingCache);
-                return bindingFunction(bindingContext, node);
-            } catch (ex) {
-                throw new Error("Unable to parse bindings.\nMessage: " + ex + ";\nBindings value: " + bindingsString);
-            }
-        }
-    });
-
-    ko.bindingProvider['instance'] = new ko.bindingProvider();
-
-    function createBindingsStringEvaluatorViaCache(bindingsString, cache) {
-        var cacheKey = bindingsString;
-        return cache[cacheKey]
-            || (cache[cacheKey] = createBindingsStringEvaluator(bindingsString));
-    }
-
-    function createBindingsStringEvaluator(bindingsString) {
-        // Build the source for a function that evaluates "expression"
-        // For each scope variable, add an extra level of "with" nesting
-        // Example result: with(sc1) { with(sc0) { return (expression) } }
-        var rewrittenBindings = ko.expressionRewriting.preProcessBindings(bindingsString),
-            functionBody = "with($context){with($data||{}){return{" + rewrittenBindings + "}}}";
-        return new Function("$context", "$element", functionBody);
-    }
-})();
-
-ko.exportSymbol('bindingProvider', ko.bindingProvider);
-(function () {
-    ko.bindingHandlers = {};
-
-    ko.bindingContext = function(dataItem, parentBindingContext, dataItemAlias) {
-        if (parentBindingContext) {
-            ko.utils.extend(this, parentBindingContext); // Inherit $root and any custom properties
-            this['$parentContext'] = parentBindingContext;
-            this['$parent'] = parentBindingContext['$data'];
-            this['$parents'] = (parentBindingContext['$parents'] || []).slice(0);
-            this['$parents'].unshift(this['$parent']);
-        } else {
-            this['$parents'] = [];
-            this['$root'] = dataItem;
-            // Export 'ko' in the binding context so it will be available in bindings and templates
-            // even if 'ko' isn't exported as a global, such as when using an AMD loader.
-            // See https://github.com/SteveSanderson/knockout/issues/490
-            this['ko'] = ko;
-        }
-        this['$data'] = dataItem;
-        if (dataItemAlias)
-            this[dataItemAlias] = dataItem;
-    }
-    ko.bindingContext.prototype['createChildContext'] = function (dataItem, dataItemAlias) {
-        return new ko.bindingContext(dataItem, this, dataItemAlias);
-    };
-    ko.bindingContext.prototype['extend'] = function(properties) {
-        var clone = ko.utils.extend(new ko.bindingContext(), this);
-        return ko.utils.extend(clone, properties);
-    };
-
-    function validateThatBindingIsAllowedForVirtualElements(bindingName) {
-        var validator = ko.virtualElements.allowedBindings[bindingName];
-        if (!validator)
-            throw new Error("The binding '" + bindingName + "' cannot be used with virtual elements")
-    }
-
-    function applyBindingsToDescendantsInternal (viewModel, elementOrVirtualElement, bindingContextsMayDifferFromDomParentElement) {
-        var currentChild, nextInQueue = ko.virtualElements.firstChild(elementOrVirtualElement);
-        while (currentChild = nextInQueue) {
-            // Keep a record of the next child *before* applying bindings, in case the binding removes the current child from its position
-            nextInQueue = ko.virtualElements.nextSibling(currentChild);
-            applyBindingsToNodeAndDescendantsInternal(viewModel, currentChild, bindingContextsMayDifferFromDomParentElement);
-        }
-    }
-
-    function applyBindingsToNodeAndDescendantsInternal (viewModel, nodeVerified, bindingContextMayDifferFromDomParentElement) {
-        var shouldBindDescendants = true;
-
-        // Perf optimisation: Apply bindings only if...
-        // (1) We need to store the binding context on this node (because it may differ from the DOM parent node's binding context)
-        //     Note that we can't store binding contexts on non-elements (e.g., text nodes), as IE doesn't allow expando properties for those
-        // (2) It might have bindings (e.g., it has a data-bind attribute, or it's a marker for a containerless template)
-        var isElement = (nodeVerified.nodeType === 1);
-        if (isElement) // Workaround IE <= 8 HTML parsing weirdness
-            ko.virtualElements.normaliseVirtualElementDomStructure(nodeVerified);
-
-        var shouldApplyBindings = (isElement && bindingContextMayDifferFromDomParentElement)             // Case (1)
-                               || ko.bindingProvider['instance']['nodeHasBindings'](nodeVerified);       // Case (2)
-        if (shouldApplyBindings)
-            shouldBindDescendants = applyBindingsToNodeInternal(nodeVerified, null, viewModel, bindingContextMayDifferFromDomParentElement).shouldBindDescendants;
-
-        if (shouldBindDescendants) {
-            // We're recursing automatically into (real or virtual) child nodes without changing binding contexts. So,
-            //  * For children of a *real* element, the binding context is certainly the same as on their DOM .parentNode,
-            //    hence bindingContextsMayDifferFromDomParentElement is false
-            //  * For children of a *virtual* element, we can't be sure. Evaluating .parentNode on those children may
-            //    skip over any number of intermediate virtual elements, any of which might define a custom binding context,
-            //    hence bindingContextsMayDifferFromDomParentElement is true
-            applyBindingsToDescendantsInternal(viewModel, nodeVerified, /* bindingContextsMayDifferFromDomParentElement: */ !isElement);
-        }
-    }
-
-    function applyBindingsToNodeInternal (node, bindings, viewModelOrBindingContext, bindingContextMayDifferFromDomParentElement) {
-        // Need to be sure that inits are only run once, and updates never run until all the inits have been run
-        var initPhase = 0; // 0 = before all inits, 1 = during inits, 2 = after all inits
-
-        // Each time the dependentObservable is evaluated (after data changes),
-        // the binding attribute is reparsed so that it can pick out the correct
-        // model properties in the context of the changed data.
-        // DOM event callbacks need to be able to access this changed data,
-        // so we need a single parsedBindings variable (shared by all callbacks
-        // associated with this node's bindings) that all the closures can access.
-        var parsedBindings;
-        function makeValueAccessor(bindingKey) {
-            return function () { return parsedBindings[bindingKey] }
-        }
-        function parsedBindingsAccessor() {
-            return parsedBindings;
-        }
-
-        var bindingHandlerThatControlsDescendantBindings;
-        ko.dependentObservable(
-            function () {
-                // Ensure we have a nonnull binding context to work with
-                var bindingContextInstance = viewModelOrBindingContext && (viewModelOrBindingContext instanceof ko.bindingContext)
-                    ? viewModelOrBindingContext
-                    : new ko.bindingContext(ko.utils.unwrapObservable(viewModelOrBindingContext));
-                var viewModel = bindingContextInstance['$data'];
-
-                // Optimization: Don't store the binding context on this node if it's definitely the same as on node.parentNode, because
-                // we can easily recover it just by scanning up the node's ancestors in the DOM
-                // (note: here, parent node means "real DOM parent" not "virtual parent", as there's no O(1) way to find the virtual parent)
-                if (bindingContextMayDifferFromDomParentElement)
-                    ko.storedBindingContextForNode(node, bindingContextInstance);
-
-                // Use evaluatedBindings if given, otherwise fall back on asking the bindings provider to give us some bindings
-                var evaluatedBindings = (typeof bindings == "function") ? bindings(bindingContextInstance, node) : bindings;
-                parsedBindings = evaluatedBindings || ko.bindingProvider['instance']['getBindings'](node, bindingContextInstance);
-
-                if (parsedBindings) {
-                    // First run all the inits, so bindings can register for notification on changes
-                    if (initPhase === 0) {
-                        initPhase = 1;
-                        for (var bindingKey in parsedBindings) {
-                            var binding = ko.bindingHandlers[bindingKey];
-                            if (binding && node.nodeType === 8)
-                                validateThatBindingIsAllowedForVirtualElements(bindingKey);
-
-                            if (binding && typeof binding["init"] == "function") {
-                                var handlerInitFn = binding["init"];
-                                var initResult = handlerInitFn(node, makeValueAccessor(bindingKey), parsedBindingsAccessor, viewModel, bindingContextInstance);
-
-                                // If this binding handler claims to control descendant bindings, make a note of this
-                                if (initResult && initResult['controlsDescendantBindings']) {
-                                    if (bindingHandlerThatControlsDescendantBindings !== undefined)
-                                        throw new Error("Multiple bindings (" + bindingHandlerThatControlsDescendantBindings + " and " + bindingKey + ") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.");
-                                    bindingHandlerThatControlsDescendantBindings = bindingKey;
-                                }
-                            }
-                        }
-                        initPhase = 2;
-                    }
-
-                    // ... then run all the updates, which might trigger changes even on the first evaluation
-                    if (initPhase === 2) {
-                        for (var bindingKey in parsedBindings) {
-                            var binding = ko.bindingHandlers[bindingKey];
-                            if (binding && typeof binding["update"] == "function") {
-                                var handlerUpdateFn = binding["update"];
-                                handlerUpdateFn(node, makeValueAccessor(bindingKey), parsedBindingsAccessor, viewModel, bindingContextInstance);
-                            }
-                        }
-                    }
-                }
-            },
-            null,
-            { disposeWhenNodeIsRemoved : node }
-        );
-
-        return {
-            shouldBindDescendants: bindingHandlerThatControlsDescendantBindings === undefined
-        };
-    };
-
-    var storedBindingContextDomDataKey = "__ko_bindingContext__";
-    ko.storedBindingContextForNode = function (node, bindingContext) {
-        if (arguments.length == 2)
-            ko.utils.domData.set(node, storedBindingContextDomDataKey, bindingContext);
-        else
-            return ko.utils.domData.get(node, storedBindingContextDomDataKey);
-    }
-
-    ko.applyBindingsToNode = function (node, bindings, viewModel) {
-        if (node.nodeType === 1) // If it's an element, workaround IE <= 8 HTML parsing weirdness
-            ko.virtualElements.normaliseVirtualElementDomStructure(node);
-        return applyBindingsToNodeInternal(node, bindings, viewModel, true);
-    };
-
-    ko.applyBindingsToDescendants = function(viewModel, rootNode) {
-        if (rootNode.nodeType === 1 || rootNode.nodeType === 8)
-            applyBindingsToDescendantsInternal(viewModel, rootNode, true);
-    };
-
-    ko.applyBindings = function (viewModel, rootNode) {
-        if (rootNode && (rootNode.nodeType !== 1) && (rootNode.nodeType !== 8))
-            throw new Error("ko.applyBindings: first parameter should be your view model; second parameter should be a DOM node");
-        rootNode = rootNode || window.document.body; // Make "rootNode" parameter optional
-
-        applyBindingsToNodeAndDescendantsInternal(viewModel, rootNode, true);
-    };
-
-    // Retrieving binding context from arbitrary nodes
-    ko.contextFor = function(node) {
-        // We can only do something meaningful for elements and comment nodes (in particular, not text nodes, as IE can't store domdata for them)
-        switch (node.nodeType) {
-            case 1:
-            case 8:
-                var context = ko.storedBindingContextForNode(node);
-                if (context) return context;
-                if (node.parentNode) return ko.contextFor(node.parentNode);
-                break;
-        }
-        return undefined;
-    };
-    ko.dataFor = function(node) {
-        var context = ko.contextFor(node);
-        return context ? context['$data'] : undefined;
-    };
-
-    ko.exportSymbol('bindingHandlers', ko.bindingHandlers);
-    ko.exportSymbol('applyBindings', ko.applyBindings);
-    ko.exportSymbol('applyBindingsToDescendants', ko.applyBindingsToDescendants);
-    ko.exportSymbol('applyBindingsToNode', ko.applyBindingsToNode);
-    ko.exportSymbol('contextFor', ko.contextFor);
-    ko.exportSymbol('dataFor', ko.dataFor);
-})();
-var attrHtmlToJavascriptMap = { 'class': 'className', 'for': 'htmlFor' };
-ko.bindingHandlers['attr'] = {
-    'update': function(element, valueAccessor, allBindingsAccessor) {
-        var value = ko.utils.unwrapObservable(valueAccessor()) || {};
-        for (var attrName in value) {
-            if (typeof attrName == "string") {
-                var attrValue = ko.utils.unwrapObservable(value[attrName]);
-
-                // To cover cases like "attr: { checked:someProp }", we want to remove the attribute entirely
-                // when someProp is a "no value"-like value (strictly null, false, or undefined)
-                // (because the absence of the "checked" attr is how to mark an element as not checked, etc.)
-                var toRemove = (attrValue === false) || (attrValue === null) || (attrValue === undefined);
-                if (toRemove)
-                    element.removeAttribute(attrName);
-
-                // In IE <= 7 and IE8 Quirks Mode, you have to use the Javascript property name instead of the
-                // HTML attribute name for certain attributes. IE8 Standards Mode supports the correct behavior,
-                // but instead of figuring out the mode, we'll just set the attribute through the Javascript
-                // property for IE <= 8.
-                if (ko.utils.ieVersion <= 8 && attrName in attrHtmlToJavascriptMap) {
-                    attrName = attrHtmlToJavascriptMap[attrName];
-                    if (toRemove)
-                        element.removeAttribute(attrName);
-                    else
-                        element[attrName] = attrValue;
-                } else if (!toRemove) {
-                    try {
-                        element.setAttribute(attrName, attrValue.toString());
-                    } catch (err) {
-                        // ignore for now
-                        if (console) {
-                            console.log("Can't set attribute " + attrName + " to " + attrValue + " error: " + err);
-                        }
-                    }
-                }
-
-                // Treat "name" specially - although you can think of it as an attribute, it also needs
-                // special handling on older versions of IE (https://github.com/SteveSanderson/knockout/pull/333)
-                // Deliberately being case-sensitive here because XHTML would regard "Name" as a different thing
-                // entirely, and there's no strong reason to allow for such casing in HTML.
-                if (attrName === "name") {
-                    ko.utils.setElementName(element, toRemove ? "" : attrValue.toString());
-                }
-            }
-        }
-    }
-};
-ko.bindingHandlers['checked'] = {
-    'init': function (element, valueAccessor, allBindingsAccessor) {
-        var updateHandler = function() {
-            var valueToWrite;
-            if (element.type == "checkbox") {
-                valueToWrite = element.checked;
-            } else if ((element.type == "radio") && (element.checked)) {
-                valueToWrite = element.value;
-            } else {
-                return; // "checked" binding only responds to checkboxes and selected radio buttons
-            }
-
-            var modelValue = valueAccessor(), unwrappedValue = ko.utils.unwrapObservable(modelValue);
-            if ((element.type == "checkbox") && (unwrappedValue instanceof Array)) {
-                // For checkboxes bound to an array, we add/remove the checkbox value to that array
-                // This works for both observable and non-observable arrays
-                var existingEntryIndex = ko.utils.arrayIndexOf(unwrappedValue, element.value);
-                if (element.checked && (existingEntryIndex < 0))
-                    modelValue.push(element.value);
-                else if ((!element.checked) && (existingEntryIndex >= 0))
-                    modelValue.splice(existingEntryIndex, 1);
-            } else {
-                ko.expressionRewriting.writeValueToProperty(modelValue, allBindingsAccessor, 'checked', valueToWrite, true);
-            }
-        };
-        ko.utils.registerEventHandler(element, "click", updateHandler);
-
-        // IE 6 won't allow radio buttons to be selected unless they have a name
-        if ((element.type == "radio") && !element.name)
-            ko.bindingHandlers['uniqueName']['init'](element, function() { return true });
-    },
-    'update': function (element, valueAccessor) {
-        var value = ko.utils.unwrapObservable(valueAccessor());
-
-        if (element.type == "checkbox") {
-            if (value instanceof Array) {
-                // When bound to an array, the checkbox being checked represents its value being present in that array
-                element.checked = ko.utils.arrayIndexOf(value, element.value) >= 0;
-            } else {
-                // When bound to anything other value (not an array), the checkbox being checked represents the value being trueish
-                element.checked = value;
-            }
-        } else if (element.type == "radio") {
-            element.checked = (element.value == value);
-        }
-    }
-};
-var classesWrittenByBindingKey = '__ko__cssValue';
-ko.bindingHandlers['css'] = {
-    'update': function (element, valueAccessor) {
-        var value = ko.utils.unwrapObservable(valueAccessor());
-        if (typeof value == "object") {
-            for (var className in value) {
-                var shouldHaveClass = ko.utils.unwrapObservable(value[className]);
-                ko.utils.toggleDomNodeCssClass(element, className, shouldHaveClass);
-            }
-        } else {
-            value = String(value || ''); // Make sure we don't try to store or set a non-string value
-            ko.utils.toggleDomNodeCssClass(element, element[classesWrittenByBindingKey], false);
-            element[classesWrittenByBindingKey] = value;
-            ko.utils.toggleDomNodeCssClass(element, value, true);
-        }
-    }
-};
-ko.bindingHandlers['enable'] = {
-    'update': function (element, valueAccessor) {
-        var value = ko.utils.unwrapObservable(valueAccessor());
-        if (value && element.disabled)
-            element.removeAttribute("disabled");
-        else if ((!value) && (!element.disabled))
-            element.disabled = true;
-    }
-};
-
-ko.bindingHandlers['disable'] = {
-    'update': function (element, valueAccessor) {
-        ko.bindingHandlers['enable']['update'](element, function() { return !ko.utils.unwrapObservable(valueAccessor()) });
-    }
-};
-// For certain common events (currently just 'click'), allow a simplified data-binding syntax
-// e.g. click:handler instead of the usual full-length event:{click:handler}
-function makeEventHandlerShortcut(eventName) {
-    ko.bindingHandlers[eventName] = {
-        'init': function(element, valueAccessor, allBindingsAccessor, viewModel) {
-            var newValueAccessor = function () {
-                var result = {};
-                result[eventName] = valueAccessor();
-                return result;
-            };
-            return ko.bindingHandlers['event']['init'].call(this, element, newValueAccessor, allBindingsAccessor, viewModel);
-        }
-    }
-}
-
-ko.bindingHandlers['event'] = {
-    'init' : function (element, valueAccessor, allBindingsAccessor, viewModel) {
-        var eventsToHandle = valueAccessor() || {};
-        for(var eventNameOutsideClosure in eventsToHandle) {
-            (function() {
-                var eventName = eventNameOutsideClosure; // Separate variable to be captured by event handler closure
-                if (typeof eventName == "string") {
-                    ko.utils.registerEventHandler(element, eventName, function (event) {
-                        var handlerReturnValue;
-                        var handlerFunction = valueAccessor()[eventName];
-                        if (!handlerFunction)
-                            return;
-                        var allBindings = allBindingsAccessor();
-
-                        try {
-                            // Take all the event args, and prefix with the viewmodel
-                            var argsForHandler = ko.utils.makeArray(arguments);
-                            argsForHandler.unshift(viewModel);
-                            handlerReturnValue = handlerFunction.apply(viewModel, argsForHandler);
-                        } finally {
-                            if (handlerReturnValue !== true) { // Normally we want to prevent default action. Developer can override this be explicitly returning true.
-                                if (event.preventDefault)
-                                    event.preventDefault();
-                                else
-                                    event.returnValue = false;
-                            }
-                        }
-
-                        var bubble = allBindings[eventName + 'Bubble'] !== false;
-                        if (!bubble) {
-                            event.cancelBubble = true;
-                            if (event.stopPropagation)
-                                event.stopPropagation();
-                        }
-                    });
-                }
-            })();
-        }
-    }
-};
-// "foreach: someExpression" is equivalent to "template: { foreach: someExpression }"
-// "foreach: { data: someExpression, afterAdd: myfn }" is equivalent to "template: { foreach: someExpression, afterAdd: myfn }"
-ko.bindingHandlers['foreach'] = {
-    makeTemplateValueAccessor: function(valueAccessor) {
-        return function() {
-            var modelValue = valueAccessor(),
-                unwrappedValue = ko.utils.peekObservable(modelValue);    // Unwrap without setting a dependency here
-
-            // If unwrappedValue is the array, pass in the wrapped value on its own
-            // The value will be unwrapped and tracked within the template binding
-            // (See https://github.com/SteveSanderson/knockout/issues/523)
-            if ((!unwrappedValue) || typeof unwrappedValue.length == "number")
-                return { 'foreach': modelValue, 'templateEngine': ko.nativeTemplateEngine.instance };
-
-            // If unwrappedValue.data is the array, preserve all relevant options and unwrap again value so we get updates
-            ko.utils.unwrapObservable(modelValue);
-            return {
-                'foreach': unwrappedValue['data'],
-                'as': unwrappedValue['as'],
-                'includeDestroyed': unwrappedValue['includeDestroyed'],
-                'afterAdd': unwrappedValue['afterAdd'],
-                'beforeRemove': unwrappedValue['beforeRemove'],
-                'afterRender': unwrappedValue['afterRender'],
-                'beforeMove': unwrappedValue['beforeMove'],
-                'afterMove': unwrappedValue['afterMove'],
-                'templateEngine': ko.nativeTemplateEngine.instance
-            };
-        };
-    },
-    'init': function(element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
-        return ko.bindingHandlers['template']['init'](element, ko.bindingHandlers['foreach'].makeTemplateValueAccessor(valueAccessor));
-    },
-    'update': function(element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
-        return ko.bindingHandlers['template']['update'](element, ko.bindingHandlers['foreach'].makeTemplateValueAccessor(valueAccessor), allBindingsAccessor, viewModel, bindingContext);
-    }
-};
-ko.expressionRewriting.bindingRewriteValidators['foreach'] = false; // Can't rewrite control flow bindings
-ko.virtualElements.allowedBindings['foreach'] = true;
-var hasfocusUpdatingProperty = '__ko_hasfocusUpdating';
-ko.bindingHandlers['hasfocus'] = {
-    'init': function(element, valueAccessor, allBindingsAccessor) {
-        var handleElementFocusChange = function(isFocused) {
-            // Where possible, ignore which event was raised and determine focus state using activeElement,
-            // as this avoids phantom focus/blur events raised when changing tabs in modern browsers.
-            // However, not all KO-targeted browsers (Firefox 2) support activeElement. For those browsers,
-            // prevent a loss of focus when changing tabs/windows by setting a flag that prevents hasfocus
-            // from calling 'blur()' on the element when it loses focus.
-            // Discussion at https://github.com/SteveSanderson/knockout/pull/352
-            element[hasfocusUpdatingProperty] = true;
-            var ownerDoc = element.ownerDocument;
-            if ("activeElement" in ownerDoc) {
-                isFocused = (ownerDoc.activeElement === element);
-            }
-            var modelValue = valueAccessor();
-            ko.expressionRewriting.writeValueToProperty(modelValue, allBindingsAccessor, 'hasfocus', isFocused, true);
-            element[hasfocusUpdatingProperty] = false;
-        };
-        var handleElementFocusIn = handleElementFocusChange.bind(null, true);
-        var handleElementFocusOut = handleElementFocusChange.bind(null, false);
-
-        ko.utils.registerEventHandler(element, "focus", handleElementFocusIn);
-        ko.utils.registerEventHandler(element, "focusin", handleElementFocusIn); // For IE
-        ko.utils.registerEventHandler(element, "blur",  handleElementFocusOut);
-        ko.utils.registerEventHandler(element, "focusout",  handleElementFocusOut); // For IE
-    },
-    'update': function(element, valueAccessor) {
-        var value = ko.utils.unwrapObservable(valueAccessor());
-        if (!element[hasfocusUpdatingProperty]) {
-            value ? element.focus() : element.blur();
-            ko.dependencyDetection.ignore(ko.utils.triggerEvent, null, [element, value ? "focusin" : "focusout"]); // For IE, which doesn't reliably fire "focus" or "blur" events synchronously
-        }
-    }
-};
-ko.bindingHandlers['html'] = {
-    'init': function() {
-        // Prevent binding on the dynamically-injected HTML (as developers are unlikely to expect that, and it has security implications)
-        return { 'controlsDescendantBindings': true };
-    },
-    'update': function (element, valueAccessor) {
-        // setHtml will unwrap the value if needed
-        ko.utils.setHtml(element, valueAccessor());
-    }
-};
-var withIfDomDataKey = '__ko_withIfBindingData';
-// Makes a binding like with or if
-function makeWithIfBinding(bindingKey, isWith, isNot, makeContextCallback) {
-    ko.bindingHandlers[bindingKey] = {
-        'init': function(element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
-            ko.utils.domData.set(element, withIfDomDataKey, {});
-            return { 'controlsDescendantBindings': true };
-        },
-        'update': function(element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
-            var withIfData = ko.utils.domData.get(element, withIfDomDataKey),
-                dataValue = ko.utils.unwrapObservable(valueAccessor()),
-                shouldDisplay = !isNot !== !dataValue, // equivalent to isNot ? !dataValue : !!dataValue
-                isFirstRender = !withIfData.savedNodes,
-                needsRefresh = isFirstRender || isWith || (shouldDisplay !== withIfData.didDisplayOnLastUpdate);
-
-            if (needsRefresh) {
-                if (isFirstRender) {
-                    withIfData.savedNodes = ko.utils.cloneNodes(ko.virtualElements.childNodes(element), true /* shouldCleanNodes */);
-                }
-
-                if (shouldDisplay) {
-                    if (!isFirstRender) {
-                        ko.virtualElements.setDomNodeChildren(element, ko.utils.cloneNodes(withIfData.savedNodes));
-                    }
-                    ko.applyBindingsToDescendants(makeContextCallback ? makeContextCallback(bindingContext, dataValue) : bindingContext, element);
-                } else {
-                    ko.virtualElements.emptyNode(element);
-                }
-
-                withIfData.didDisplayOnLastUpdate = shouldDisplay;
-            }
-        }
-    };
-    ko.expressionRewriting.bindingRewriteValidators[bindingKey] = false; // Can't rewrite control flow bindings
-    ko.virtualElements.allowedBindings[bindingKey] = true;
-}
-
-// Construct the actual binding handlers
-makeWithIfBinding('if');
-makeWithIfBinding('ifnot', false /* isWith */, true /* isNot */);
-makeWithIfBinding('with', true /* isWith */, false /* isNot */,
-    function(bindingContext, dataValue) {
-        return bindingContext['createChildContext'](dataValue);
-    }
-);
-function ensureDropdownSelectionIsConsistentWithModelValue(element, modelValue, preferModelValue) {
-    if (preferModelValue) {
-        if (modelValue !== ko.selectExtensions.readValue(element))
-            ko.selectExtensions.writeValue(element, modelValue);
-    }
-
-    // No matter which direction we're syncing in, we want the end result to be equality between dropdown value and model value.
-    // If they aren't equal, either we prefer the dropdown value, or the model value couldn't be represented, so either way,
-    // change the model value to match the dropdown.
-    if (modelValue !== ko.selectExtensions.readValue(element))
-        ko.dependencyDetection.ignore(ko.utils.triggerEvent, null, [element, "change"]);
-};
-
-ko.bindingHandlers['options'] = {
-    'update': function (element, valueAccessor, allBindingsAccessor) {
-        if (ko.utils.tagNameLower(element) !== "select")
-            throw new Error("options binding applies only to SELECT elements");
-
-        var selectWasPreviouslyEmpty = element.length == 0;
-        var previousSelectedValues = ko.utils.arrayMap(ko.utils.arrayFilter(element.childNodes, function (node) {
-            return node.tagName && (ko.utils.tagNameLower(node) === "option") && node.selected;
-        }), function (node) {
-            return ko.selectExtensions.readValue(node) || node.innerText || node.textContent;
-        });
-        var previousScrollTop = element.scrollTop;
-
-        var value = ko.utils.unwrapObservable(valueAccessor());
-        var selectedValue = element.value;
-
-        // Remove all existing <option>s.
-        // Need to use .remove() rather than .removeChild() for <option>s otherwise IE behaves oddly (https://github.com/SteveSanderson/knockout/issues/134)
-        while (element.length > 0) {
-            ko.cleanNode(element.options[0]);
-            element.remove(0);
-        }
-
-        if (value) {
-            var allBindings = allBindingsAccessor(),
-                includeDestroyed = allBindings['optionsIncludeDestroyed'];
-
-            if (typeof value.length != "number")
-                value = [value];
-            if (allBindings['optionsCaption']) {
-                var option = document.createElement("option");
-                ko.utils.setHtml(option, allBindings['optionsCaption']);
-                ko.selectExtensions.writeValue(option, undefined);
-                element.appendChild(option);
-            }
-
-            for (var i = 0, j = value.length; i < j; i++) {
-                // Skip destroyed items
-                var arrayEntry = value[i];
-                if (arrayEntry && arrayEntry['_destroy'] && !includeDestroyed)
-                    continue;
-
-                var option = document.createElement("option");
-
-                function applyToObject(object, predicate, defaultValue) {
-                    var predicateType = typeof predicate;
-                    if (predicateType == "function")    // Given a function; run it against the data value
-                        return predicate(object);
-                    else if (predicateType == "string") // Given a string; treat it as a property name on the data value
-                        return object[predicate];
-                    else                                // Given no optionsText arg; use the data value itself
-                        return defaultValue;
-                }
-
-                // Apply a value to the option element
-                var optionValue = applyToObject(arrayEntry, allBindings['optionsValue'], arrayEntry);
-                ko.selectExtensions.writeValue(option, ko.utils.unwrapObservable(optionValue));
-
-                // Apply some text to the option element
-                var optionText = applyToObject(arrayEntry, allBindings['optionsText'], optionValue);
-                ko.utils.setTextContent(option, optionText);
-
-                element.appendChild(option);
-            }
-
-            // IE6 doesn't like us to assign selection to OPTION nodes before they're added to the document.
-            // That's why we first added them without selection. Now it's time to set the selection.
-            var newOptions = element.getElementsByTagName("option");
-            var countSelectionsRetained = 0;
-            for (var i = 0, j = newOptions.length; i < j; i++) {
-                if (ko.utils.arrayIndexOf(previousSelectedValues, ko.selectExtensions.readValue(newOptions[i])) >= 0) {
-                    ko.utils.setOptionNodeSelectionState(newOptions[i], true);
-                    countSelectionsRetained++;
-                }
-            }
-
-            element.scrollTop = previousScrollTop;
-
-            if (selectWasPreviouslyEmpty && ('value' in allBindings)) {
-                // Ensure consistency between model value and selected option.
-                // If the dropdown is being populated for the first time here (or was otherwise previously empty),
-                // the dropdown selection state is meaningless, so we preserve the model value.
-                ensureDropdownSelectionIsConsistentWithModelValue(element, ko.utils.peekObservable(allBindings['value']), /* preferModelValue */ true);
-            }
-
-            // Workaround for IE9 bug
-            ko.utils.ensureSelectElementIsRenderedCorrectly(element);
-        }
-    }
-};
-ko.bindingHandlers['options'].optionValueDomDataKey = '__ko.optionValueDomData__';
-ko.bindingHandlers['selectedOptions'] = {
-    'init': function (element, valueAccessor, allBindingsAccessor) {
-        ko.utils.registerEventHandler(element, "change", function () {
-            var value = valueAccessor(), valueToWrite = [];
-            ko.utils.arrayForEach(element.getElementsByTagName("option"), function(node) {
-                if (node.selected)
-                    valueToWrite.push(ko.selectExtensions.readValue(node));
-            });
-            ko.expressionRewriting.writeValueToProperty(value, allBindingsAccessor, 'value', valueToWrite);
-        });
-    },
-    'update': function (element, valueAccessor) {
-        if (ko.utils.tagNameLower(element) != "select")
-            throw new Error("values binding applies only to SELECT elements");
-
-        var newValue = ko.utils.unwrapObservable(valueAccessor());
-        if (newValue && typeof newValue.length == "number") {
-            ko.utils.arrayForEach(element.getElementsByTagName("option"), function(node) {
-                var isSelected = ko.utils.arrayIndexOf(newValue, ko.selectExtensions.readValue(node)) >= 0;
-                ko.utils.setOptionNodeSelectionState(node, isSelected);
-            });
-        }
-    }
-};
-ko.bindingHandlers['style'] = {
-    'update': function (element, valueAccessor) {
-        var value = ko.utils.unwrapObservable(valueAccessor() || {});
-        for (var styleName in value) {
-            if (typeof styleName == "string") {
-                var styleValue = ko.utils.unwrapObservable(value[styleName]);
-                element.style[styleName] = styleValue || ""; // Empty string removes the value, whereas null/undefined have no effect
-            }
-        }
-    }
-};
-ko.bindingHandlers['submit'] = {
-    'init': function (element, valueAccessor, allBindingsAccessor, viewModel) {
-        if (typeof valueAccessor() != "function")
-            throw new Error("The value for a submit binding must be a function");
-        ko.utils.registerEventHandler(element, "submit", function (event) {
-            var handlerReturnValue;
-            var value = valueAccessor();
-            try { handlerReturnValue = value.call(viewModel, element); }
-            finally {
-                if (handlerReturnValue !== true) { // Normally we want to prevent default action. Developer can override this be explicitly returning true.
-                    if (event.preventDefault)
-                        event.preventDefault();
-                    else
-                        event.returnValue = false;
-                }
-            }
-        });
-    }
-};
-ko.bindingHandlers['text'] = {
-    'update': function (element, valueAccessor) {
-        ko.utils.setTextContent(element, valueAccessor());
-    }
-};
-ko.virtualElements.allowedBindings['text'] = true;
-ko.bindingHandlers['uniqueName'] = {
-    'init': function (element, valueAccessor) {
-        if (valueAccessor()) {
-            var name = "ko_unique_" + (++ko.bindingHandlers['uniqueName'].currentIndex);
-            ko.utils.setElementName(element, name);
-        }
-    }
-};
-ko.bindingHandlers['uniqueName'].currentIndex = 0;
-ko.bindingHandlers['value'] = {
-    'init': function (element, valueAccessor, allBindingsAccessor) {
-        // Always catch "change" event; possibly other events too if asked
-        var eventsToCatch = ["change"];
-        var requestedEventsToCatch = allBindingsAccessor()["valueUpdate"];
-        var propertyChangedFired = false;
-        if (requestedEventsToCatch) {
-            if (typeof requestedEventsToCatch == "string") // Allow both individual event names, and arrays of event names
-                requestedEventsToCatch = [requestedEventsToCatch];
-            ko.utils.arrayPushAll(eventsToCatch, requestedEventsToCatch);
-            eventsToCatch = ko.utils.arrayGetDistinctValues(eventsToCatch);
-        }
-
-        var valueUpdateHandler = function() {
-            propertyChangedFired = false;
-            var modelValue = valueAccessor();
-            var elementValue = ko.selectExtensions.readValue(element);
-            ko.expressionRewriting.writeValueToProperty(modelValue, allBindingsAccessor, 'value', elementValue);
-        }
-
-        // Workaround for https://github.com/SteveSanderson/knockout/issues/122
-        // IE doesn't fire "change" events on textboxes if the user selects a value from its autocomplete list
-        var ieAutoCompleteHackNeeded = ko.utils.ieVersion && element.tagName.toLowerCase() == "input" && element.type == "text"
-                                       && element.autocomplete != "off" && (!element.form || element.form.autocomplete != "off");
-        if (ieAutoCompleteHackNeeded && ko.utils.arrayIndexOf(eventsToCatch, "propertychange") == -1) {
-            ko.utils.registerEventHandler(element, "propertychange", function () { propertyChangedFired = true });
-            ko.utils.registerEventHandler(element, "blur", function() {
-                if (propertyChangedFired) {
-                    valueUpdateHandler();
-                }
-            });
-        }
-
-        ko.utils.arrayForEach(eventsToCatch, function(eventName) {
-            // The syntax "after<eventname>" means "run the handler asynchronously after the event"
-            // This is useful, for example, to catch "keydown" events after the browser has updated the control
-            // (otherwise, ko.selectExtensions.readValue(this) will receive the control's value *before* the key event)
-            var handler = valueUpdateHandler;
-            if (ko.utils.stringStartsWith(eventName, "after")) {
-                handler = function() { setTimeout(valueUpdateHandler, 0) };
-                eventName = eventName.substring("after".length);
-            }
-            ko.utils.registerEventHandler(element, eventName, handler);
-        });
-    },
-    'update': function (element, valueAccessor) {
-        var valueIsSelectOption = ko.utils.tagNameLower(element) === "select";
-        var newValue = ko.utils.unwrapObservable(valueAccessor());
-        var elementValue = ko.selectExtensions.readValue(element);
-        var valueHasChanged = (newValue != elementValue);
-
-        // JavaScript's 0 == "" behavious is unfortunate here as it prevents writing 0 to an empty text box (loose equality suggests the values are the same).
-        // We don't want to do a strict equality comparison as that is more confusing for developers in certain cases, so we specifically special case 0 != "" here.
-        if ((newValue === 0) && (elementValue !== 0) && (elementValue !== "0"))
-            valueHasChanged = true;
-
-        if (valueHasChanged) {
-            var applyValueAction = function () { ko.selectExtensions.writeValue(element, newValue); };
-            applyValueAction();
-
-            // Workaround for IE6 bug: It won't reliably apply values to SELECT nodes during the same execution thread
-            // right after you've changed the set of OPTION nodes on it. So for that node type, we'll schedule a second thread
-            // to apply the value as well.
-            var alsoApplyAsynchronously = valueIsSelectOption;
-            if (alsoApplyAsynchronously)
-                setTimeout(applyValueAction, 0);
-        }
-
-        // If you try to set a model value that can't be represented in an already-populated dropdown, reject that change,
-        // because you're not allowed to have a model value that disagrees with a visible UI selection.
-        if (valueIsSelectOption && (element.length > 0))
-            ensureDropdownSelectionIsConsistentWithModelValue(element, newValue, /* preferModelValue */ false);
-    }
-};
-ko.bindingHandlers['visible'] = {
-    'update': function (element, valueAccessor) {
-        var value = ko.utils.unwrapObservable(valueAccessor());
-        var isCurrentlyVisible = !(element.style.display == "none");
-        if (value && !isCurrentlyVisible)
-            element.style.display = "";
-        else if ((!value) && isCurrentlyVisible)
-            element.style.display = "none";
-    }
-};
-// 'click' is just a shorthand for the usual full-length event:{click:handler}
-makeEventHandlerShortcut('click');
-// If you want to make a custom template engine,
-//
-// [1] Inherit from this class (like ko.nativeTemplateEngine does)
-// [2] Override 'renderTemplateSource', supplying a function with this signature:
-//
-//        function (templateSource, bindingContext, options) {
-//            // - templateSource.text() is the text of the template you should render
-//            // - bindingContext.$data is the data you should pass into the template
-//            //   - you might also want to make bindingContext.$parent, bindingContext.$parents,
-//            //     and bindingContext.$root available in the template too
-//            // - options gives you access to any other properties set on "data-bind: { template: options }"
-//            //
-//            // Return value: an array of DOM nodes
-//        }
-//
-// [3] Override 'createJavaScriptEvaluatorBlock', supplying a function with this signature:
-//
-//        function (script) {
-//            // Return value: Whatever syntax means "Evaluate the JavaScript statement 'script' and output the result"
-//            //               For example, the jquery.tmpl template engine converts 'someScript' to '${ someScript }'
-//        }
-//
-//     This is only necessary if you want to allow data-bind attributes to reference arbitrary template variables.
-//     If you don't want to allow that, you can set the property 'allowTemplateRewriting' to false (like ko.nativeTemplateEngine does)
-//     and then you don't need to override 'createJavaScriptEvaluatorBlock'.
-
-ko.templateEngine = function () { };
-
-ko.templateEngine.prototype['renderTemplateSource'] = function (templateSource, bindingContext, options) {
-    throw new Error("Override renderTemplateSource");
-};
-
-ko.templateEngine.prototype['createJavaScriptEvaluatorBlock'] = function (script) {
-    throw new Error("Override createJavaScriptEvaluatorBlock");
-};
-
-ko.templateEngine.prototype['makeTemplateSource'] = function(template, templateDocument) {
-    // Named template
-    if (typeof template == "string") {
-        templateDocument = templateDocument || document;
-        var elem = templateDocument.getElementById(template);
-        if (!elem)
-            throw new Error("Cannot find template with ID " + template);
-        return new ko.templateSources.domElement(elem);
-    } else if ((template.nodeType == 1) || (template.nodeType == 8)) {
-        // Anonymous template
-        return new ko.templateSources.anonymousTemplate(template);
-    } else
-        throw new Error("Unknown template type: " + template);
-};
-
-ko.templateEngine.prototype['renderTemplate'] = function (template, bindingContext, options, templateDocument) {
-    var templateSource = this['makeTemplateSource'](template, templateDocument);
-    return this['renderTemplateSource'](templateSource, bindingContext, options);
-};
-
-ko.templateEngine.prototype['isTemplateRewritten'] = function (template, templateDocument) {
-    // Skip rewriting if requested
-    if (this['allowTemplateRewriting'] === false)
-        return true;
-    return this['makeTemplateSource'](template, templateDocument)['data']("isRewritten");
-};
-
-ko.templateEngine.prototype['rewriteTemplate'] = function (template, rewriterCallback, templateDocument) {
-    var templateSource = this['makeTemplateSource'](template, templateDocument);
-    var rewritten = rewriterCallback(templateSource['text']());
-    templateSource['text'](rewritten);
-    templateSource['data']("isRewritten", true);
-};
-
-ko.exportSymbol('templateEngine', ko.templateEngine);
-
-ko.templateRewriting = (function () {
-    var memoizeDataBindingAttributeSyntaxRegex = /(<[a-z]+\d*(\s+(?!data-bind=)[a-z0-9\-]+(=(\"[^\"]*\"|\'[^\']*\'))?)*\s+)data-bind=(["'])([\s\S]*?)\5/gi;
-    var memoizeVirtualContainerBindingSyntaxRegex = /<!--\s*ko\b\s*([\s\S]*?)\s*-->/g;
-
-    function validateDataBindValuesForRewriting(keyValueArray) {
-        var allValidators = ko.expressionRewriting.bindingRewriteValidators;
-        for (var i = 0; i < keyValueArray.length; i++) {
-            var key = keyValueArray[i]['key'];
-            if (allValidators.hasOwnProperty(key)) {
-                var validator = allValidators[key];
-
-                if (typeof validator === "function") {
-                    var possibleErrorMessage = validator(keyValueArray[i]['value']);
-                    if (possibleErrorMessage)
-                        throw new Error(possibleErrorMessage);
-                } else if (!validator) {
-                    throw new Error("This template engine does not support the '" + key + "' binding within its templates");
-                }
-            }
-        }
-    }
-
-    function constructMemoizedTagReplacement(dataBindAttributeValue, tagToRetain, templateEngine) {
-        var dataBindKeyValueArray = ko.expressionRewriting.parseObjectLiteral(dataBindAttributeValue);
-        validateDataBindValuesForRewriting(dataBindKeyValueArray);
-        var rewrittenDataBindAttributeValue = ko.expressionRewriting.preProcessBindings(dataBindKeyValueArray);
-
-        // For no obvious reason, Opera fails to evaluate rewrittenDataBindAttributeValue unless it's wrapped in an additional
-        // anonymous function, even though Opera's built-in debugger can evaluate it anyway. No other browser requires this
-        // extra indirection.
-        var applyBindingsToNextSiblingScript =
-            "ko.__tr_ambtns(function($context,$element){return(function(){return{ " + rewrittenDataBindAttributeValue + " } })()})";
-        return templateEngine['createJavaScriptEvaluatorBlock'](applyBindingsToNextSiblingScript) + tagToRetain;
-    }
-
-    return {
-        ensureTemplateIsRewritten: function (template, templateEngine, templateDocument) {
-            if (!templateEngine['isTemplateRewritten'](template, templateDocument))
-                templateEngine['rewriteTemplate'](template, function (htmlString) {
-                    return ko.templateRewriting.memoizeBindingAttributeSyntax(htmlString, templateEngine);
-                }, templateDocument);
-        },
-
-        memoizeBindingAttributeSyntax: function (htmlString, templateEngine) {
-            return htmlString.replace(memoizeDataBindingAttributeSyntaxRegex, function () {
-                return constructMemoizedTagReplacement(/* dataBindAttributeValue: */ arguments[6], /* tagToRetain: */ arguments[1], templateEngine);
-            }).replace(memoizeVirtualContainerBindingSyntaxRegex, function() {
-                return constructMemoizedTagReplacement(/* dataBindAttributeValue: */ arguments[1], /* tagToRetain: */ "<!-- ko -->", templateEngine);
-            });
-        },
-
-        applyMemoizedBindingsToNextSibling: function (bindings) {
-            return ko.memoization.memoize(function (domNode, bindingContext) {
-                if (domNode.nextSibling)
-                    ko.applyBindingsToNode(domNode.nextSibling, bindings, bindingContext);
-            });
-        }
-    }
-})();
-
-
-// Exported only because it has to be referenced by string lookup from within rewritten template
-ko.exportSymbol('__tr_ambtns', ko.templateRewriting.applyMemoizedBindingsToNextSibling);
-(function() {
-    // A template source represents a read/write way of accessing a template. This is to eliminate the need for template loading/saving
-    // logic to be duplicated in every template engine (and means they can all work with anonymous templates, etc.)
-    //
-    // Two are provided by default:
-    //  1. ko.templateSources.domElement       - reads/writes the text content of an arbitrary DOM element
-    //  2. ko.templateSources.anonymousElement - uses ko.utils.domData to read/write text *associated* with the DOM element, but
-    //                                           without reading/writing the actual element text content, since it will be overwritten
-    //                                           with the rendered template output.
-    // You can implement your own template source if you want to fetch/store templates somewhere other than in DOM elements.
-    // Template sources need to have the following functions:
-    //   text() 			- returns the template text from your storage location
-    //   text(value)		- writes the supplied template text to your storage location
-    //   data(key)			- reads values stored using data(key, value) - see below
-    //   data(key, value)	- associates "value" with this template and the key "key". Is used to store information like "isRewritten".
-    //
-    // Optionally, template sources can also have the following functions:
-    //   nodes()            - returns a DOM element containing the nodes of this template, where available
-    //   nodes(value)       - writes the given DOM element to your storage location
-    // If a DOM element is available for a given template source, template engines are encouraged to use it in preference over text()
-    // for improved speed. However, all templateSources must supply text() even if they don't supply nodes().
-    //
-    // Once you've implemented a templateSource, make your template engine use it by subclassing whatever template engine you were
-    // using and overriding "makeTemplateSource" to return an instance of your custom template source.
-
-    ko.templateSources = {};
-
-    // ---- ko.templateSources.domElement -----
-
-    ko.templateSources.domElement = function(element) {
-        this.domElement = element;
-    }
-
-    ko.templateSources.domElement.prototype['text'] = function(/* valueToWrite */) {
-        var tagNameLower = ko.utils.tagNameLower(this.domElement),
-            elemContentsProperty = tagNameLower === "script" ? "text"
-                                 : tagNameLower === "textarea" ? "value"
-                                 : "innerHTML";
-
-        if (arguments.length == 0) {
-            return this.domElement[elemContentsProperty];
-        } else {
-            var valueToWrite = arguments[0];
-            if (elemContentsProperty === "innerHTML")
-                ko.utils.setHtml(this.domElement, valueToWrite);
-            else
-                this.domElement[elemContentsProperty] = valueToWrite;
-        }
-    };
-
-    ko.templateSources.domElement.prototype['data'] = function(key /*, valueToWrite */) {
-        if (arguments.length === 1) {
-            return ko.utils.domData.get(this.domElement, "templateSourceData_" + key);
-        } else {
-            ko.utils.domData.set(this.domElement, "templateSourceData_" + key, arguments[1]);
-        }
-    };
-
-    // ---- ko.templateSources.anonymousTemplate -----
-    // Anonymous templates are normally saved/retrieved as DOM nodes through "nodes".
-    // For compatibility, you can also read "text"; it will be serialized from the nodes on demand.
-    // Writing to "text" is still supported, but then the template data will not be available as DOM nodes.
-
-    var anonymousTemplatesDomDataKey = "__ko_anon_template__";
-    ko.templateSources.anonymousTemplate = function(element) {
-        this.domElement = element;
-    }
-    ko.templateSources.anonymousTemplate.prototype = new ko.templateSources.domElement();
-    ko.templateSources.anonymousTemplate.prototype['text'] = function(/* valueToWrite */) {
-        if (arguments.length == 0) {
-            var templateData = ko.utils.domData.get(this.domElement, anonymousTemplatesDomDataKey) || {};
-            if (templateData.textData === undefined && templateData.containerData)
-                templateData.textData = templateData.containerData.innerHTML;
-            return templateData.textData;
-        } else {
-            var valueToWrite = arguments[0];
-            ko.utils.domData.set(this.domElement, anonymousTemplatesDomDataKey, {textData: valueToWrite});
-        }
-    };
-    ko.templateSources.domElement.prototype['nodes'] = function(/* valueToWrite */) {
-        if (arguments.length == 0) {
-            var templateData = ko.utils.domData.get(this.domElement, anonymousTemplatesDomDataKey) || {};
-            return templateData.containerData;
-        } else {
-            var valueToWrite = arguments[0];
-            ko.utils.domData.set(this.domElement, anonymousTemplatesDomDataKey, {containerData: valueToWrite});
-        }
-    };
-
-    ko.exportSymbol('templateSources', ko.templateSources);
-    ko.exportSymbol('templateSources.domElement', ko.templateSources.domElement);
-    ko.exportSymbol('templateSources.anonymousTemplate', ko.templateSources.anonymousTemplate);
-})();
-(function () {
-    var _templateEngine;
-    ko.setTemplateEngine = function (templateEngine) {
-        if ((templateEngine != undefined) && !(templateEngine instanceof ko.templateEngine))
-            throw new Error("templateEngine must inherit from ko.templateEngine");
-        _templateEngine = templateEngine;
-    }
-
-    function invokeForEachNodeOrCommentInContinuousRange(firstNode, lastNode, action) {
-        var node, nextInQueue = firstNode, firstOutOfRangeNode = ko.virtualElements.nextSibling(lastNode);
-        while (nextInQueue && ((node = nextInQueue) !== firstOutOfRangeNode)) {
-            nextInQueue = ko.virtualElements.nextSibling(node);
-            if (node.nodeType === 1 || node.nodeType === 8)
-                action(node);
-        }
-    }
-
-    function activateBindingsOnContinuousNodeArray(continuousNodeArray, bindingContext) {
-        // To be used on any nodes that have been rendered by a template and have been inserted into some parent element
-        // Walks through continuousNodeArray (which *must* be continuous, i.e., an uninterrupted sequence of sibling nodes, because
-        // the algorithm for walking them relies on this), and for each top-level item in the virtual-element sense,
-        // (1) Does a regular "applyBindings" to associate bindingContext with this node and to activate any non-memoized bindings
-        // (2) Unmemoizes any memos in the DOM subtree (e.g., to activate bindings that had been memoized during template rewriting)
-
-        if (continuousNodeArray.length) {
-            var firstNode = continuousNodeArray[0], lastNode = continuousNodeArray[continuousNodeArray.length - 1];
-
-            // Need to applyBindings *before* unmemoziation, because unmemoization might introduce extra nodes (that we don't want to re-bind)
-            // whereas a regular applyBindings won't introduce new memoized nodes
-            invokeForEachNodeOrCommentInContinuousRange(firstNode, lastNode, function(node) {
-                ko.applyBindings(bindingContext, node);
-            });
-            invokeForEachNodeOrCommentInContinuousRange(firstNode, lastNode, function(node) {
-                ko.memoization.unmemoizeDomNodeAndDescendants(node, [bindingContext]);
-            });
-        }
-    }
-
-    function getFirstNodeFromPossibleArray(nodeOrNodeArray) {
-        return nodeOrNodeArray.nodeType ? nodeOrNodeArray
-                                        : nodeOrNodeArray.length > 0 ? nodeOrNodeArray[0]
-                                        : null;
-    }
-
-    function executeTemplate(targetNodeOrNodeArray, renderMode, template, bindingContext, options) {
-        options = options || {};
-        var firstTargetNode = targetNodeOrNodeArray && getFirstNodeFromPossibleArray(targetNodeOrNodeArray);
-        var templateDocument = firstTargetNode && firstTargetNode.ownerDocument;
-        var templateEngineToUse = (options['templateEngine'] || _templateEngine);
-        ko.templateRewriting.ensureTemplateIsRewritten(template, templateEngineToUse, templateDocument);
-        var renderedNodesArray = templateEngineToUse['renderTemplate'](template, bindingContext, options, templateDocument);
-
-        // Loosely check result is an array of DOM nodes
-        if ((typeof renderedNodesArray.length != "number") || (renderedNodesArray.length > 0 && typeof renderedNodesArray[0].nodeType != "number"))
-            throw new Error("Template engine must return an array of DOM nodes");
-
-        var haveAddedNodesToParent = false;
-        switch (renderMode) {
-            case "replaceChildren":
-                ko.virtualElements.setDomNodeChildren(targetNodeOrNodeArray, renderedNodesArray);
-                haveAddedNodesToParent = true;
-                break;
-            case "replaceNode":
-                ko.utils.replaceDomNodes(targetNodeOrNodeArray, renderedNodesArray);
-                haveAddedNodesToParent = true;
-                break;
-            case "ignoreTargetNode": break;
-            default:
-                throw new Error("Unknown renderMode: " + renderMode);
-        }
-
-        if (haveAddedNodesToParent) {
-            activateBindingsOnContinuousNodeArray(renderedNodesArray, bindingContext);
-            if (options['afterRender'])
-                ko.dependencyDetection.ignore(options['afterRender'], null, [renderedNodesArray, bindingContext['$data']]);
-        }
-
-        return renderedNodesArray;
-    }
-
-    ko.renderTemplate = function (template, dataOrBindingContext, options, targetNodeOrNodeArray, renderMode) {
-        options = options || {};
-        if ((options['templateEngine'] || _templateEngine) == undefined)
-            throw new Error("Set a template engine before calling renderTemplate");
-        renderMode = renderMode || "replaceChildren";
-
-        if (targetNodeOrNodeArray) {
-            var firstTargetNode = getFirstNodeFromPossibleArray(targetNodeOrNodeArray);
-
-            var whenToDispose = function () { return (!firstTargetNode) || !ko.utils.domNodeIsAttachedToDocument(firstTargetNode); }; // Passive disposal (on next evaluation)
-            var activelyDisposeWhenNodeIsRemoved = (firstTargetNode && renderMode == "replaceNode") ? firstTargetNode.parentNode : firstTargetNode;
-
-            return ko.dependentObservable( // So the DOM is automatically updated when any dependency changes
-                function () {
-                    // Ensure we've got a proper binding context to work with
-                    var bindingContext = (dataOrBindingContext && (dataOrBindingContext instanceof ko.bindingContext))
-                        ? dataOrBindingContext
-                        : new ko.bindingContext(ko.utils.unwrapObservable(dataOrBindingContext));
-
-                    // Support selecting template as a function of the data being rendered
-                    var templateName = typeof(template) == 'function' ? template(bindingContext['$data'], bindingContext) : template;
-
-                    var renderedNodesArray = executeTemplate(targetNodeOrNodeArray, renderMode, templateName, bindingContext, options);
-                    if (renderMode == "replaceNode") {
-                        targetNodeOrNodeArray = renderedNodesArray;
-                        firstTargetNode = getFirstNodeFromPossibleArray(targetNodeOrNodeArray);
-                    }
-                },
-                null,
-                { disposeWhen: whenToDispose, disposeWhenNodeIsRemoved: activelyDisposeWhenNodeIsRemoved }
-            );
-        } else {
-            // We don't yet have a DOM node to evaluate, so use a memo and render the template later when there is a DOM node
-            return ko.memoization.memoize(function (domNode) {
-                ko.renderTemplate(template, dataOrBindingContext, options, domNode, "replaceNode");
-            });
-        }
-    };
-
-    ko.renderTemplateForEach = function (template, arrayOrObservableArray, options, targetNode, parentBindingContext) {
-        // Since setDomNodeChildrenFromArrayMapping always calls executeTemplateForArrayItem and then
-        // activateBindingsCallback for added items, we can store the binding context in the former to use in the latter.
-        var arrayItemContext;
-
-        // This will be called by setDomNodeChildrenFromArrayMapping to get the nodes to add to targetNode
-        var executeTemplateForArrayItem = function (arrayValue, index) {
-            // Support selecting template as a function of the data being rendered
-            arrayItemContext = parentBindingContext['createChildContext'](ko.utils.unwrapObservable(arrayValue), options['as']);
-            arrayItemContext['$index'] = index;
-            var templateName = typeof(template) == 'function' ? template(arrayValue, arrayItemContext) : template;
-            return executeTemplate(null, "ignoreTargetNode", templateName, arrayItemContext, options);
-        }
-
-        // This will be called whenever setDomNodeChildrenFromArrayMapping has added nodes to targetNode
-        var activateBindingsCallback = function(arrayValue, addedNodesArray, index) {
-            activateBindingsOnContinuousNodeArray(addedNodesArray, arrayItemContext);
-            if (options['afterRender'])
-                options['afterRender'](addedNodesArray, arrayValue);
-        };
-
-        return ko.dependentObservable(function () {
-            var unwrappedArray = ko.utils.unwrapObservable(arrayOrObservableArray) || [];
-            if (typeof unwrappedArray.length == "undefined") // Coerce single value into array
-                unwrappedArray = [unwrappedArray];
-
-            // Filter out any entries marked as destroyed
-            var filteredArray = ko.utils.arrayFilter(unwrappedArray, function(item) {
-                return options['includeDestroyed'] || item === undefined || item === null || !ko.utils.unwrapObservable(item['_destroy']);
-            });
-
-            // Call setDomNodeChildrenFromArrayMapping, ignoring any observables unwrapped within (most likely from a callback function).
-            // If the array items are observables, though, they will be unwrapped in executeTemplateForArrayItem and managed within setDomNodeChildrenFromArrayMapping.
-            ko.dependencyDetection.ignore(ko.utils.setDomNodeChildrenFromArrayMapping, null, [targetNode, filteredArray, executeTemplateForArrayItem, options, activateBindingsCallback]);
-
-        }, null, { disposeWhenNodeIsRemoved: targetNode });
-    };
-
-    var templateComputedDomDataKey = '__ko__templateComputedDomDataKey__';
-    function disposeOldComputedAndStoreNewOne(element, newComputed) {
-        var oldComputed = ko.utils.domData.get(element, templateComputedDomDataKey);
-        if (oldComputed && (typeof(oldComputed.dispose) == 'function'))
-            oldComputed.dispose();
-        ko.utils.domData.set(element, templateComputedDomDataKey, (newComputed && newComputed.isActive()) ? newComputed : undefined);
-    }
-
-    ko.bindingHandlers['template'] = {
-        'init': function(element, valueAccessor) {
-            // Support anonymous templates
-            var bindingValue = ko.utils.unwrapObservable(valueAccessor());
-            if ((typeof bindingValue != "string") && (!bindingValue['name']) && (element.nodeType == 1 || element.nodeType == 8)) {
-                // It's an anonymous template - store the element contents, then clear the element
-                var templateNodes = element.nodeType == 1 ? element.childNodes : ko.virtualElements.childNodes(element),
-                    container = ko.utils.moveCleanedNodesToContainerElement(templateNodes); // This also removes the nodes from their current parent
-                new ko.templateSources.anonymousTemplate(element)['nodes'](container);
-            }
-            return { 'controlsDescendantBindings': true };
-        },
-        'update': function (element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
-            var templateName = ko.utils.unwrapObservable(valueAccessor()),
-                options = {},
-                shouldDisplay = true,
-                dataValue,
-                templateComputed = null;
-
-            if (typeof templateName != "string") {
-                options = templateName;
-                templateName = options['name'];
-
-                // Support "if"/"ifnot" conditions
-                if ('if' in options)
-                    shouldDisplay = ko.utils.unwrapObservable(options['if']);
-                if (shouldDisplay && 'ifnot' in options)
-                    shouldDisplay = !ko.utils.unwrapObservable(options['ifnot']);
-
-                dataValue = ko.utils.unwrapObservable(options['data']);
-            }
-
-            if ('foreach' in options) {
-                // Render once for each data point (treating data set as empty if shouldDisplay==false)
-                var dataArray = (shouldDisplay && options['foreach']) || [];
-                templateComputed = ko.renderTemplateForEach(templateName || element, dataArray, options, element, bindingContext);
-            } else if (!shouldDisplay) {
-                ko.virtualElements.emptyNode(element);
-            } else {
-                // Render once for this single data point (or use the viewModel if no data was provided)
-                var innerBindingContext = ('data' in options) ?
-                    bindingContext['createChildContext'](dataValue, options['as']) :  // Given an explitit 'data' value, we create a child binding context for it
-                    bindingContext;                                                        // Given no explicit 'data' value, we retain the same binding context
-                templateComputed = ko.renderTemplate(templateName || element, innerBindingContext, options, element);
-            }
-
-            // It only makes sense to have a single template computed per element (otherwise which one should have its output displayed?)
-            disposeOldComputedAndStoreNewOne(element, templateComputed);
-        }
-    };
-
-    // Anonymous templates can't be rewritten. Give a nice error message if you try to do it.
-    ko.expressionRewriting.bindingRewriteValidators['template'] = function(bindingValue) {
-        var parsedBindingValue = ko.expressionRewriting.parseObjectLiteral(bindingValue);
-
-        if ((parsedBindingValue.length == 1) && parsedBindingValue[0]['unknown'])
-            return null; // It looks like a string literal, not an object literal, so treat it as a named template (which is allowed for rewriting)
-
-        if (ko.expressionRewriting.keyValueArrayContainsKey(parsedBindingValue, "name"))
-            return null; // Named templates can be rewritten, so return "no error"
-        return "This template engine does not support anonymous templates nested within its templates";
-    };
-
-    ko.virtualElements.allowedBindings['template'] = true;
-})();
-
-ko.exportSymbol('setTemplateEngine', ko.setTemplateEngine);
-ko.exportSymbol('renderTemplate', ko.renderTemplate);
-
-ko.utils.compareArrays = (function () {
-    var statusNotInOld = 'added', statusNotInNew = 'deleted';
-
-    // Simple calculation based on Levenshtein distance.
-    function compareArrays(oldArray, newArray, dontLimitMoves) {
-        oldArray = oldArray || [];
-        newArray = newArray || [];
-
-        if (oldArray.length <= newArray.length)
-            return compareSmallArrayToBigArray(oldArray, newArray, statusNotInOld, statusNotInNew, dontLimitMoves);
-        else
-            return compareSmallArrayToBigArray(newArray, oldArray, statusNotInNew, statusNotInOld, dontLimitMoves);
-    }
-
-    function compareSmallArrayToBigArray(smlArray, bigArray, statusNotInSml, statusNotInBig, dontLimitMoves) {
-        var myMin = Math.min,
-            myMax = Math.max,
-            editDistanceMatrix = [],
-            smlIndex, smlIndexMax = smlArray.length,
-            bigIndex, bigIndexMax = bigArray.length,
-            compareRange = (bigIndexMax - smlIndexMax) || 1,
-            maxDistance = smlIndexMax + bigIndexMax + 1,
-            thisRow, lastRow,
-            bigIndexMaxForRow, bigIndexMinForRow;
-
-        for (smlIndex = 0; smlIndex <= smlIndexMax; smlIndex++) {
-            lastRow = thisRow;
-            editDistanceMatrix.push(thisRow = []);
-            bigIndexMaxForRow = myMin(bigIndexMax, smlIndex + compareRange);
-            bigIndexMinForRow = myMax(0, smlIndex - 1);
-            for (bigIndex = bigIndexMinForRow; bigIndex <= bigIndexMaxForRow; bigIndex++) {
-                if (!bigIndex)
-                    thisRow[bigIndex] = smlIndex + 1;
-                else if (!smlIndex)  // Top row - transform empty array into new array via additions
-                    thisRow[bigIndex] = bigIndex + 1;
-                else if (smlArray[smlIndex - 1] === bigArray[bigIndex - 1])
-                    thisRow[bigIndex] = lastRow[bigIndex - 1];                  // copy value (no edit)
-                else {
-                    var northDistance = lastRow[bigIndex] || maxDistance;       // not in big (deletion)
-                    var westDistance = thisRow[bigIndex - 1] || maxDistance;    // not in small (addition)
-                    thisRow[bigIndex] = myMin(northDistance, westDistance) + 1;
-                }
-            }
-        }
-
-        var editScript = [], meMinusOne, notInSml = [], notInBig = [];
-        for (smlIndex = smlIndexMax, bigIndex = bigIndexMax; smlIndex || bigIndex;) {
-            meMinusOne = editDistanceMatrix[smlIndex][bigIndex] - 1;
-            if (bigIndex && meMinusOne === editDistanceMatrix[smlIndex][bigIndex-1]) {
-                notInSml.push(editScript[editScript.length] = {     // added
-                    'status': statusNotInSml,
-                    'value': bigArray[--bigIndex],
-                    'index': bigIndex });
-            } else if (smlIndex && meMinusOne === editDistanceMatrix[smlIndex - 1][bigIndex]) {
-                notInBig.push(editScript[editScript.length] = {     // deleted
-                    'status': statusNotInBig,
-                    'value': smlArray[--smlIndex],
-                    'index': smlIndex });
-            } else {
-                editScript.push({
-                    'status': "retained",
-                    'value': bigArray[--bigIndex] });
-                --smlIndex;
-            }
-        }
-
-        if (notInSml.length && notInBig.length) {
-            // Set a limit on the number of consecutive non-matching comparisons; having it a multiple of
-            // smlIndexMax keeps the time complexity of this algorithm linear.
-            var limitFailedCompares = smlIndexMax * 10, failedCompares,
-                a, d, notInSmlItem, notInBigItem;
-            // Go through the items that have been added and deleted and try to find matches between them.
-            for (failedCompares = a = 0; (dontLimitMoves || failedCompares < limitFailedCompares) && (notInSmlItem = notInSml[a]); a++) {
-                for (d = 0; notInBigItem = notInBig[d]; d++) {
-                    if (notInSmlItem['value'] === notInBigItem['value']) {
-                        notInSmlItem['moved'] = notInBigItem['index'];
-                        notInBigItem['moved'] = notInSmlItem['index'];
-                        notInBig.splice(d,1);       // This item is marked as moved; so remove it from notInBig list
-                        failedCompares = d = 0;     // Reset failed compares count because we're checking for consecutive failures
-                        break;
-                    }
-                }
-                failedCompares += d;
-            }
-        }
-        return editScript.reverse();
-    }
-
-    return compareArrays;
-})();
-
-ko.exportSymbol('utils.compareArrays', ko.utils.compareArrays);
-
-(function () {
-    // Objective:
-    // * Given an input array, a container DOM node, and a function from array elements to arrays of DOM nodes,
-    //   map the array elements to arrays of DOM nodes, concatenate together all these arrays, and use them to populate the container DOM node
-    // * Next time we're given the same combination of things (with the array possibly having mutated), update the container DOM node
-    //   so that its children is again the concatenation of the mappings of the array elements, but don't re-map any array elements that we
-    //   previously mapped - retain those nodes, and just insert/delete other ones
-
-    // "callbackAfterAddingNodes" will be invoked after any "mapping"-generated nodes are inserted into the container node
-    // You can use this, for example, to activate bindings on those nodes.
-
-    function fixUpNodesToBeMovedOrRemoved(contiguousNodeArray) {
-        // Before moving, deleting, or replacing a set of nodes that were previously outputted by the "map" function, we have to reconcile
-        // them against what is in the DOM right now. It may be that some of the nodes have already been removed from the document,
-        // or that new nodes might have been inserted in the middle, for example by a binding. Also, there may previously have been
-        // leading comment nodes (created by rewritten string-based templates) that have since been removed during binding.
-        // So, this function translates the old "map" output array into its best guess of what set of current DOM nodes should be removed.
-        //
-        // Rules:
-        //   [A] Any leading nodes that aren't in the document any more should be ignored
-        //       These most likely correspond to memoization nodes that were already removed during binding
-        //       See https://github.com/SteveSanderson/knockout/pull/440
-        //   [B] We want to output a contiguous series of nodes that are still in the document. So, ignore any nodes that
-        //       have already been removed, and include any nodes that have been inserted among the previous collection
-
-        // Rule [A]
-        while (contiguousNodeArray.length && !ko.utils.domNodeIsAttachedToDocument(contiguousNodeArray[0]))
-            contiguousNodeArray.splice(0, 1);
-
-        // Rule [B]
-        if (contiguousNodeArray.length > 1) {
-            // Build up the actual new contiguous node set
-            var current = contiguousNodeArray[0], last = contiguousNodeArray[contiguousNodeArray.length - 1], newContiguousSet = [current];
-            while (current !== last) {
-                current = current.nextSibling;
-                if (!current) // Won't happen, except if the developer has manually removed some DOM elements (then we're in an undefined scenario)
-                    return;
-                newContiguousSet.push(current);
-            }
-
-            // ... then mutate the input array to match this.
-            // (The following line replaces the contents of contiguousNodeArray with newContiguousSet)
-            Array.prototype.splice.apply(contiguousNodeArray, [0, contiguousNodeArray.length].concat(newContiguousSet));
-        }
-        return contiguousNodeArray;
-    }
-
-    function mapNodeAndRefreshWhenChanged(containerNode, mapping, valueToMap, callbackAfterAddingNodes, index) {
-        // Map this array value inside a dependentObservable so we re-map when any dependency changes
-        var mappedNodes = [];
-        var dependentObservable = ko.dependentObservable(function() {
-            var newMappedNodes = mapping(valueToMap, index) || [];
-
-            // On subsequent evaluations, just replace the previously-inserted DOM nodes
-            if (mappedNodes.length > 0) {
-                ko.utils.replaceDomNodes(fixUpNodesToBeMovedOrRemoved(mappedNodes), newMappedNodes);
-                if (callbackAfterAddingNodes)
-                    ko.dependencyDetection.ignore(callbackAfterAddingNodes, null, [valueToMap, newMappedNodes, index]);
-            }
-
-            // Replace the contents of the mappedNodes array, thereby updating the record
-            // of which nodes would be deleted if valueToMap was itself later removed
-            mappedNodes.splice(0, mappedNodes.length);
-            ko.utils.arrayPushAll(mappedNodes, newMappedNodes);
-        }, null, { disposeWhenNodeIsRemoved: containerNode, disposeWhen: function() { return (mappedNodes.length == 0) || !ko.utils.domNodeIsAttachedToDocument(mappedNodes[0]) } });
-        return { mappedNodes : mappedNodes, dependentObservable : (dependentObservable.isActive() ? dependentObservable : undefined) };
-    }
-
-    var lastMappingResultDomDataKey = "setDomNodeChildrenFromArrayMapping_lastMappingResult";
-
-    ko.utils.setDomNodeChildrenFromArrayMapping = function (domNode, array, mapping, options, callbackAfterAddingNodes) {
-        // Compare the provided array against the previous one
-        array = array || [];
-        options = options || {};
-        var isFirstExecution = ko.utils.domData.get(domNode, lastMappingResultDomDataKey) === undefined;
-        var lastMappingResult = ko.utils.domData.get(domNode, lastMappingResultDomDataKey) || [];
-        var lastArray = ko.utils.arrayMap(lastMappingResult, function (x) { return x.arrayEntry; });
-        var editScript = ko.utils.compareArrays(lastArray, array);
-
-        // Build the new mapping result
-        var newMappingResult = [];
-        var lastMappingResultIndex = 0;
-        var newMappingResultIndex = 0;
-
-        var nodesToDelete = [];
-        var itemsToProcess = [];
-        var itemsForBeforeRemoveCallbacks = [];
-        var itemsForMoveCallbacks = [];
-        var itemsForAfterAddCallbacks = [];
-        var mapData;
-
-        function itemMovedOrRetained(editScriptIndex, oldPosition) {
-            mapData = lastMappingResult[oldPosition];
-            if (newMappingResultIndex !== oldPosition)
-                itemsForMoveCallbacks[editScriptIndex] = mapData;
-            // Since updating the index might change the nodes, do so before calling fixUpNodesToBeMovedOrRemoved
-            mapData.indexObservable(newMappingResultIndex++);
-            fixUpNodesToBeMovedOrRemoved(mapData.mappedNodes);
-            newMappingResult.push(mapData);
-            itemsToProcess.push(mapData);
-        }
-
-        function callCallback(callback, items) {
-            if (callback) {
-                for (var i = 0, n = items.length; i < n; i++) {
-                    if (items[i]) {
-                        ko.utils.arrayForEach(items[i].mappedNodes, function(node) {
-                            callback(node, i, items[i].arrayEntry);
-                        });
-                    }
-                }
-            }
-        }
-
-        for (var i = 0, editScriptItem, movedIndex; editScriptItem = editScript[i]; i++) {
-            movedIndex = editScriptItem['moved'];
-            switch (editScriptItem['status']) {
-                case "deleted":
-                    if (movedIndex === undefined) {
-                        mapData = lastMappingResult[lastMappingResultIndex];
-
-                        // Stop tracking changes to the mapping for these nodes
-                        if (mapData.dependentObservable)
-                            mapData.dependentObservable.dispose();
-
-                        // Queue these nodes for later removal
-                        nodesToDelete.push.apply(nodesToDelete, fixUpNodesToBeMovedOrRemoved(mapData.mappedNodes));
-                        if (options['beforeRemove']) {
-                            itemsForBeforeRemoveCallbacks[i] = mapData;
-                            itemsToProcess.push(mapData);
-                        }
-                    }
-                    lastMappingResultIndex++;
-                    break;
-
-                case "retained":
-                    itemMovedOrRetained(i, lastMappingResultIndex++);
-                    break;
-
-                case "added":
-                    if (movedIndex !== undefined) {
-                        itemMovedOrRetained(i, movedIndex);
-                    } else {
-                        mapData = { arrayEntry: editScriptItem['value'], indexObservable: ko.observable(newMappingResultIndex++) };
-                        newMappingResult.push(mapData);
-                        itemsToProcess.push(mapData);
-                        if (!isFirstExecution)
-                            itemsForAfterAddCallbacks[i] = mapData;
-                    }
-                    break;
-            }
-        }
-
-        // Call beforeMove first before any changes have been made to the DOM
-        callCallback(options['beforeMove'], itemsForMoveCallbacks);
-
-        // Next remove nodes for deleted items (or just clean if there's a beforeRemove callback)
-        ko.utils.arrayForEach(nodesToDelete, options['beforeRemove'] ? ko.cleanNode : ko.removeNode);
-
-        // Next add/reorder the remaining items (will include deleted items if there's a beforeRemove callback)
-        for (var i = 0, nextNode = ko.virtualElements.firstChild(domNode), lastNode, node; mapData = itemsToProcess[i]; i++) {
-            // Get nodes for newly added items
-            if (!mapData.mappedNodes)
-                ko.utils.extend(mapData, mapNodeAndRefreshWhenChanged(domNode, mapping, mapData.arrayEntry, callbackAfterAddingNodes, mapData.indexObservable));
-
-            // Put nodes in the right place if they aren't there already
-            for (var j = 0; node = mapData.mappedNodes[j]; nextNode = node.nextSibling, lastNode = node, j++) {
-                if (node !== nextNode)
-                    ko.virtualElements.insertAfter(domNode, node, lastNode);
-            }
-
-            // Run the callbacks for newly added nodes (for example, to apply bindings, etc.)
-            if (!mapData.initialized && callbackAfterAddingNodes) {
-                callbackAfterAddingNodes(mapData.arrayEntry, mapData.mappedNodes, mapData.indexObservable);
-                mapData.initialized = true;
-            }
-        }
-
-        // If there's a beforeRemove callback, call it after reordering.
-        // Note that we assume that the beforeRemove callback will usually be used to remove the nodes using
-        // some sort of animation, which is why we first reorder the nodes that will be removed. If the
-        // callback instead removes the nodes right away, it would be more efficient to skip reordering them.
-        // Perhaps we'll make that change in the future if this scenario becomes more common.
-        callCallback(options['beforeRemove'], itemsForBeforeRemoveCallbacks);
-
-        // Finally call afterMove and afterAdd callbacks
-        callCallback(options['afterMove'], itemsForMoveCallbacks);
-        callCallback(options['afterAdd'], itemsForAfterAddCallbacks);
-
-        // Store a copy of the array items we just considered so we can difference it next time
-        ko.utils.domData.set(domNode, lastMappingResultDomDataKey, newMappingResult);
-    }
-})();
-
-ko.exportSymbol('utils.setDomNodeChildrenFromArrayMapping', ko.utils.setDomNodeChildrenFromArrayMapping);
-ko.nativeTemplateEngine = function () {
-    this['allowTemplateRewriting'] = false;
-}
-
-ko.nativeTemplateEngine.prototype = new ko.templateEngine();
-ko.nativeTemplateEngine.prototype['renderTemplateSource'] = function (templateSource, bindingContext, options) {
-    var useNodesIfAvailable = !(ko.utils.ieVersion < 9), // IE<9 cloneNode doesn't work properly
-        templateNodesFunc = useNodesIfAvailable ? templateSource['nodes'] : null,
-        templateNodes = templateNodesFunc ? templateSource['nodes']() : null;
-
-    if (templateNodes) {
-        return ko.utils.makeArray(templateNodes.cloneNode(true).childNodes);
-    } else {
-        var templateText = templateSource['text']();
-        return ko.utils.parseHtmlFragment(templateText);
-    }
-};
-
-ko.nativeTemplateEngine.instance = new ko.nativeTemplateEngine();
-ko.setTemplateEngine(ko.nativeTemplateEngine.instance);
-
-ko.exportSymbol('nativeTemplateEngine', ko.nativeTemplateEngine);
-(function() {
-    ko.jqueryTmplTemplateEngine = function () {
-        // Detect which version of jquery-tmpl you're using. Unfortunately jquery-tmpl
-        // doesn't expose a version number, so we have to infer it.
-        // Note that as of Knockout 1.3, we only support jQuery.tmpl 1.0.0pre and later,
-        // which KO internally refers to as version "2", so older versions are no longer detected.
-        var jQueryTmplVersion = this.jQueryTmplVersion = (function() {
-            if ((typeof(jQuery) == "undefined") || !(jQuery['tmpl']))
-                return 0;
-            // Since it exposes no official version number, we use our own numbering system. To be updated as jquery-tmpl evolves.
-            try {
-                if (jQuery['tmpl']['tag']['tmpl']['open'].toString().indexOf('__') >= 0) {
-                    // Since 1.0.0pre, custom tags should append markup to an array called "__"
-                    return 2; // Final version of jquery.tmpl
-                }
-            } catch(ex) { /* Apparently not the version we were looking for */ }
-
-            return 1; // Any older version that we don't support
-        })();
-
-        function ensureHasReferencedJQueryTemplates() {
-            if (jQueryTmplVersion < 2)
-                throw new Error("Your version of jQuery.tmpl is too old. Please upgrade to jQuery.tmpl 1.0.0pre or later.");
-        }
-
-        function executeTemplate(compiledTemplate, data, jQueryTemplateOptions) {
-            return jQuery['tmpl'](compiledTemplate, data, jQueryTemplateOptions);
-        }
-
-        this['renderTemplateSource'] = function(templateSource, bindingContext, options) {
-            options = options || {};
-            ensureHasReferencedJQueryTemplates();
-
-            // Ensure we have stored a precompiled version of this template (don't want to reparse on every render)
-            var precompiled = templateSource['data']('precompiled');
-            if (!precompiled) {
-                var templateText = templateSource['text']() || "";
-                // Wrap in "with($whatever.koBindingContext) { ... }"
-                templateText = "{{ko_with $item.koBindingContext}}" + templateText + "{{/ko_with}}";
-
-                precompiled = jQuery['template'](null, templateText);
-                templateSource['data']('precompiled', precompiled);
-            }
-
-            var data = [bindingContext['$data']]; // Prewrap the data in an array to stop jquery.tmpl from trying to unwrap any arrays
-            var jQueryTemplateOptions = jQuery['extend']({ 'koBindingContext': bindingContext }, options['templateOptions']);
-
-            var resultNodes = executeTemplate(precompiled, data, jQueryTemplateOptions);
-            resultNodes['appendTo'](document.createElement("div")); // Using "appendTo" forces jQuery/jQuery.tmpl to perform necessary cleanup work
-
-            jQuery['fragments'] = {}; // Clear jQuery's fragment cache to avoid a memory leak after a large number of template renders
-            return resultNodes;
-        };
-
-        this['createJavaScriptEvaluatorBlock'] = function(script) {
-            return "{{ko_code ((function() { return " + script + " })()) }}";
-        };
-
-        this['addTemplate'] = function(templateName, templateMarkup) {
-            document.write("<script type='text/html' id='" + templateName + "'>" + templateMarkup + "</script>");
-        };
-
-        if (jQueryTmplVersion > 0) {
-            jQuery['tmpl']['tag']['ko_code'] = {
-                open: "__.push($1 || '');"
-            };
-            jQuery['tmpl']['tag']['ko_with'] = {
-                open: "with($1) {",
-                close: "} "
-            };
-        }
-    };
-
-    ko.jqueryTmplTemplateEngine.prototype = new ko.templateEngine();
-
-    // Use this one by default *only if jquery.tmpl is referenced*
-    var jqueryTmplTemplateEngineInstance = new ko.jqueryTmplTemplateEngine();
-    if (jqueryTmplTemplateEngineInstance.jQueryTmplVersion > 0)
-        ko.setTemplateEngine(jqueryTmplTemplateEngineInstance);
-
-    ko.exportSymbol('jqueryTmplTemplateEngine', ko.jqueryTmplTemplateEngine);
-})();
-});
-})(window,document,navigator,window["jQuery"]);
-})();
\ No newline at end of file
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/main/resources/org/netbeans/html/kofx/knockout-2.2.1.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-fx/src/main/resources/org/netbeans/html/kofx/knockout-2.2.1.js	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,3594 @@
+// Knockout JavaScript library v2.2.1
+// (c) Steven Sanderson - http://knockoutjs.com/
+// License: MIT (http://www.opensource.org/licenses/mit-license.php)
+
+(function(){
+var DEBUG=true;
+(function(window,document,navigator,jQuery,undefined){
+!function(factory) {
+    // Support three module loading scenarios
+    if (typeof require === 'function' && typeof exports === 'object' && typeof module === 'object') {
+        // [1] CommonJS/Node.js
+        var target = module['exports'] || exports; // module.exports is for Node.js
+        factory(target);
+    } else if (typeof define === 'function' && define['amd']) {
+        // [2] AMD anonymous module
+        define(['exports'], factory);
+    } else {
+        // [3] No module loader (plain <script> tag) - put directly in global namespace
+        factory(window['ko'] = {});
+    }
+}(function(koExports){
+// Internally, all KO objects are attached to koExports (even the non-exported ones whose names will be minified by the closure compiler).
+// In the future, the following "ko" variable may be made distinct from "koExports" so that private objects are not externally reachable.
+var ko = typeof koExports !== 'undefined' ? koExports : {};
+// Google Closure Compiler helpers (used only to make the minified file smaller)
+ko.exportSymbol = function(koPath, object) {
+	var tokens = koPath.split(".");
+
+	// In the future, "ko" may become distinct from "koExports" (so that non-exported objects are not reachable)
+	// At that point, "target" would be set to: (typeof koExports !== "undefined" ? koExports : ko)
+	var target = ko;
+
+	for (var i = 0; i < tokens.length - 1; i++)
+		target = target[tokens[i]];
+	target[tokens[tokens.length - 1]] = object;
+};
+ko.exportProperty = function(owner, publicName, object) {
+  owner[publicName] = object;
+};
+ko.version = "2.2.1";
+
+ko.exportSymbol('version', ko.version);
+ko.utils = new (function () {
+    var stringTrimRegex = /^(\s|\u00A0)+|(\s|\u00A0)+$/g;
+
+    // Represent the known event types in a compact way, then at runtime transform it into a hash with event name as key (for fast lookup)
+    var knownEvents = {}, knownEventTypesByEventName = {};
+    var keyEventTypeName = /Firefox\/2/i.test(navigator.userAgent) ? 'KeyboardEvent' : 'UIEvents';
+    knownEvents[keyEventTypeName] = ['keyup', 'keydown', 'keypress'];
+    knownEvents['MouseEvents'] = ['click', 'dblclick', 'mousedown', 'mouseup', 'mousemove', 'mouseover', 'mouseout', 'mouseenter', 'mouseleave'];
+    for (var eventType in knownEvents) {
+        var knownEventsForType = knownEvents[eventType];
+        if (knownEventsForType.length) {
+            for (var i = 0, j = knownEventsForType.length; i < j; i++)
+                knownEventTypesByEventName[knownEventsForType[i]] = eventType;
+        }
+    }
+    var eventsThatMustBeRegisteredUsingAttachEvent = { 'propertychange': true }; // Workaround for an IE9 issue - https://github.com/SteveSanderson/knockout/issues/406
+
+    // Detect IE versions for bug workarounds (uses IE conditionals, not UA string, for robustness)
+    // Note that, since IE 10 does not support conditional comments, the following logic only detects IE < 10.
+    // Currently this is by design, since IE 10+ behaves correctly when treated as a standard browser.
+    // If there is a future need to detect specific versions of IE10+, we will amend this.
+    var ieVersion = (function() {
+        var version = 3, div = document.createElement('div'), iElems = div.getElementsByTagName('i');
+
+        // Keep constructing conditional HTML blocks until we hit one that resolves to an empty fragment
+        while (
+            div.innerHTML = '<!--[if gt IE ' + (++version) + ']><i></i><![endif]-->',
+            iElems[0]
+        );
+        return version > 4 ? version : undefined;
+    }());
+    var isIe6 = ieVersion === 6,
+        isIe7 = ieVersion === 7;
+
+    function isClickOnCheckableElement(element, eventType) {
+        if ((ko.utils.tagNameLower(element) !== "input") || !element.type) return false;
+        if (eventType.toLowerCase() != "click") return false;
+        var inputType = element.type;
+        return (inputType == "checkbox") || (inputType == "radio");
+    }
+
+    return {
+        fieldsIncludedWithJsonPost: ['authenticity_token', /^__RequestVerificationToken(_.*)?$/],
+
+        arrayForEach: function (array, action) {
+            for (var i = 0, j = array.length; i < j; i++)
+                action(array[i]);
+        },
+
+        arrayIndexOf: function (array, item) {
+            if (typeof Array.prototype.indexOf == "function")
+                return Array.prototype.indexOf.call(array, item);
+            for (var i = 0, j = array.length; i < j; i++)
+                if (array[i] === item)
+                    return i;
+            return -1;
+        },
+
+        arrayFirst: function (array, predicate, predicateOwner) {
+            for (var i = 0, j = array.length; i < j; i++)
+                if (predicate.call(predicateOwner, array[i]))
+                    return array[i];
+            return null;
+        },
+
+        arrayRemoveItem: function (array, itemToRemove) {
+            var index = ko.utils.arrayIndexOf(array, itemToRemove);
+            if (index >= 0)
+                array.splice(index, 1);
+        },
+
+        arrayGetDistinctValues: function (array) {
+            array = array || [];
+            var result = [];
+            for (var i = 0, j = array.length; i < j; i++) {
+                if (ko.utils.arrayIndexOf(result, array[i]) < 0)
+                    result.push(array[i]);
+            }
+            return result;
+        },
+
+        arrayMap: function (array, mapping) {
+            array = array || [];
+            var result = [];
+            for (var i = 0, j = array.length; i < j; i++)
+                result.push(mapping(array[i]));
+            return result;
+        },
+
+        arrayFilter: function (array, predicate) {
+            array = array || [];
+            var result = [];
+            for (var i = 0, j = array.length; i < j; i++)
+                if (predicate(array[i]))
+                    result.push(array[i]);
+            return result;
+        },
+
+        arrayPushAll: function (array, valuesToPush) {
+            if (valuesToPush instanceof Array)
+                array.push.apply(array, valuesToPush);
+            else
+                for (var i = 0, j = valuesToPush.length; i < j; i++)
+                    array.push(valuesToPush[i]);
+            return array;
+        },
+
+        extend: function (target, source) {
+            if (source) {
+                for(var prop in source) {
+                    if(source.hasOwnProperty(prop)) {
+                        target[prop] = source[prop];
+                    }
+                }
+            }
+            return target;
+        },
+
+        emptyDomNode: function (domNode) {
+            while (domNode.firstChild) {
+                ko.removeNode(domNode.firstChild);
+            }
+        },
+
+        moveCleanedNodesToContainerElement: function(nodes) {
+            // Ensure it's a real array, as we're about to reparent the nodes and
+            // we don't want the underlying collection to change while we're doing that.
+            var nodesArray = ko.utils.makeArray(nodes);
+
+            var container = document.createElement('div');
+            for (var i = 0, j = nodesArray.length; i < j; i++) {
+                container.appendChild(ko.cleanNode(nodesArray[i]));
+            }
+            return container;
+        },
+
+        cloneNodes: function (nodesArray, shouldCleanNodes) {
+            for (var i = 0, j = nodesArray.length, newNodesArray = []; i < j; i++) {
+                var clonedNode = nodesArray[i].cloneNode(true);
+                newNodesArray.push(shouldCleanNodes ? ko.cleanNode(clonedNode) : clonedNode);
+            }
+            return newNodesArray;
+        },
+
+        setDomNodeChildren: function (domNode, childNodes) {
+            ko.utils.emptyDomNode(domNode);
+            if (childNodes) {
+                for (var i = 0, j = childNodes.length; i < j; i++)
+                    domNode.appendChild(childNodes[i]);
+            }
+        },
+
+        replaceDomNodes: function (nodeToReplaceOrNodeArray, newNodesArray) {
+            var nodesToReplaceArray = nodeToReplaceOrNodeArray.nodeType ? [nodeToReplaceOrNodeArray] : nodeToReplaceOrNodeArray;
+            if (nodesToReplaceArray.length > 0) {
+                var insertionPoint = nodesToReplaceArray[0];
+                var parent = insertionPoint.parentNode;
+                for (var i = 0, j = newNodesArray.length; i < j; i++)
+                    parent.insertBefore(newNodesArray[i], insertionPoint);
+                for (var i = 0, j = nodesToReplaceArray.length; i < j; i++) {
+                    ko.removeNode(nodesToReplaceArray[i]);
+                }
+            }
+        },
+
+        setOptionNodeSelectionState: function (optionNode, isSelected) {
+            // IE6 sometimes throws "unknown error" if you try to write to .selected directly, whereas Firefox struggles with setAttribute. Pick one based on browser.
+            if (ieVersion < 7)
+                optionNode.setAttribute("selected", isSelected);
+            else
+                optionNode.selected = isSelected;
+        },
+
+        stringTrim: function (string) {
+            return (string || "").replace(stringTrimRegex, "");
+        },
+
+        stringTokenize: function (string, delimiter) {
+            var result = [];
+            var tokens = (string || "").split(delimiter);
+            for (var i = 0, j = tokens.length; i < j; i++) {
+                var trimmed = ko.utils.stringTrim(tokens[i]);
+                if (trimmed !== "")
+                    result.push(trimmed);
+            }
+            return result;
+        },
+
+        stringStartsWith: function (string, startsWith) {
+            string = string || "";
+            if (startsWith.length > string.length)
+                return false;
+            return string.substring(0, startsWith.length) === startsWith;
+        },
+
+        domNodeIsContainedBy: function (node, containedByNode) {
+            if (containedByNode.compareDocumentPosition)
+                return (containedByNode.compareDocumentPosition(node) & 16) == 16;
+            while (node != null) {
+                if (node == containedByNode)
+                    return true;
+                node = node.parentNode;
+            }
+            return false;
+        },
+
+        domNodeIsAttachedToDocument: function (node) {
+            return ko.utils.domNodeIsContainedBy(node, node.ownerDocument);
+        },
+
+        tagNameLower: function(element) {
+            // For HTML elements, tagName will always be upper case; for XHTML elements, it'll be lower case.
+            // Possible future optimization: If we know it's an element from an XHTML document (not HTML),
+            // we don't need to do the .toLowerCase() as it will always be lower case anyway.
+            return element && element.tagName && element.tagName.toLowerCase();
+        },
+
+        registerEventHandler: function (element, eventType, handler) {
+            var mustUseAttachEvent = ieVersion && eventsThatMustBeRegisteredUsingAttachEvent[eventType];
+            if (!mustUseAttachEvent && typeof jQuery != "undefined") {
+                if (isClickOnCheckableElement(element, eventType)) {
+                    // For click events on checkboxes, jQuery interferes with the event handling in an awkward way:
+                    // it toggles the element checked state *after* the click event handlers run, whereas native
+                    // click events toggle the checked state *before* the event handler.
+                    // Fix this by intecepting the handler and applying the correct checkedness before it runs.
+                    var originalHandler = handler;
+                    handler = function(event, eventData) {
+                        var jQuerySuppliedCheckedState = this.checked;
+                        if (eventData)
+                            this.checked = eventData.checkedStateBeforeEvent !== true;
+                        originalHandler.call(this, event);
+                        this.checked = jQuerySuppliedCheckedState; // Restore the state jQuery applied
+                    };
+                }
+                jQuery(element)['bind'](eventType, handler);
+            } else if (!mustUseAttachEvent && typeof element.addEventListener == "function")
+                element.addEventListener(eventType, handler, false);
+            else if (typeof element.attachEvent != "undefined")
+                element.attachEvent("on" + eventType, function (event) {
+                    handler.call(element, event);
+                });
+            else
+                throw new Error("Browser doesn't support addEventListener or attachEvent");
+        },
+
+        triggerEvent: function (element, eventType) {
+            if (!(element && element.nodeType))
+                throw new Error("element must be a DOM node when calling triggerEvent");
+
+            if (typeof jQuery != "undefined") {
+                var eventData = [];
+                if (isClickOnCheckableElement(element, eventType)) {
+                    // Work around the jQuery "click events on checkboxes" issue described above by storing the original checked state before triggering the handler
+                    eventData.push({ checkedStateBeforeEvent: element.checked });
+                }
+                jQuery(element)['trigger'](eventType, eventData);
+            } else if (typeof document.createEvent == "function") {
+                if (typeof element.dispatchEvent == "function") {
+                    var eventCategory = knownEventTypesByEventName[eventType] || "HTMLEvents";
+                    var event = document.createEvent(eventCategory);
+                    event.initEvent(eventType, true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, element);
+                    element.dispatchEvent(event);
+                }
+                else
+                    throw new Error("The supplied element doesn't support dispatchEvent");
+            } else if (typeof element.fireEvent != "undefined") {
+                // Unlike other browsers, IE doesn't change the checked state of checkboxes/radiobuttons when you trigger their "click" event
+                // so to make it consistent, we'll do it manually here
+                if (isClickOnCheckableElement(element, eventType))
+                    element.checked = element.checked !== true;
+                element.fireEvent("on" + eventType);
+            }
+            else
+                throw new Error("Browser doesn't support triggering events");
+        },
+
+        unwrapObservable: function (value) {
+            return ko.isObservable(value) ? value() : value;
+        },
+
+        peekObservable: function (value) {
+            return ko.isObservable(value) ? value.peek() : value;
+        },
+
+        toggleDomNodeCssClass: function (node, classNames, shouldHaveClass) {
+            if (classNames) {
+                var cssClassNameRegex = /[\w-]+/g,
+                    currentClassNames = node.className.match(cssClassNameRegex) || [];
+                ko.utils.arrayForEach(classNames.match(cssClassNameRegex), function(className) {
+                    var indexOfClass = ko.utils.arrayIndexOf(currentClassNames, className);
+                    if (indexOfClass >= 0) {
+                        if (!shouldHaveClass)
+                            currentClassNames.splice(indexOfClass, 1);
+                    } else {
+                        if (shouldHaveClass)
+                            currentClassNames.push(className);
+                    }
+                });
+                node.className = currentClassNames.join(" ");
+            }
+        },
+
+        setTextContent: function(element, textContent) {
+            var value = ko.utils.unwrapObservable(textContent);
+            if ((value === null) || (value === undefined))
+                value = "";
+
+            if (element.nodeType === 3) {
+                element.data = value;
+            } else {
+                // We need there to be exactly one child: a text node.
+                // If there are no children, more than one, or if it's not a text node,
+                // we'll clear everything and create a single text node.
+                var innerTextNode = ko.virtualElements.firstChild(element);
+                if (!innerTextNode || innerTextNode.nodeType != 3 || ko.virtualElements.nextSibling(innerTextNode)) {
+                    ko.virtualElements.setDomNodeChildren(element, [document.createTextNode(value)]);
+                } else {
+                    innerTextNode.data = value;
+                }
+
+                ko.utils.forceRefresh(element);
+            }
+        },
+
+        setElementName: function(element, name) {
+            element.name = name;
+
+            // Workaround IE 6/7 issue
+            // - https://github.com/SteveSanderson/knockout/issues/197
+            // - http://www.matts411.com/post/setting_the_name_attribute_in_ie_dom/
+            if (ieVersion <= 7) {
+                try {
+                    element.mergeAttributes(document.createElement("<input name='" + element.name + "'/>"), false);
+                }
+                catch(e) {} // For IE9 with doc mode "IE9 Standards" and browser mode "IE9 Compatibility View"
+            }
+        },
+
+        forceRefresh: function(node) {
+            // Workaround for an IE9 rendering bug - https://github.com/SteveSanderson/knockout/issues/209
+            if (ieVersion >= 9) {
+                // For text nodes and comment nodes (most likely virtual elements), we will have to refresh the container
+                var elem = node.nodeType == 1 ? node : node.parentNode;
+                if (elem.style)
+                    elem.style.zoom = elem.style.zoom;
+            }
+        },
+
+        ensureSelectElementIsRenderedCorrectly: function(selectElement) {
+            // Workaround for IE9 rendering bug - it doesn't reliably display all the text in dynamically-added select boxes unless you force it to re-render by updating the width.
+            // (See https://github.com/SteveSanderson/knockout/issues/312, http://stackoverflow.com/questions/5908494/select-only-shows-first-char-of-selected-option)
+            if (ieVersion >= 9) {
+                var originalWidth = selectElement.style.width;
+                selectElement.style.width = 0;
+                selectElement.style.width = originalWidth;
+            }
+        },
+
+        range: function (min, max) {
+            min = ko.utils.unwrapObservable(min);
+            max = ko.utils.unwrapObservable(max);
+            var result = [];
+            for (var i = min; i <= max; i++)
+                result.push(i);
+            return result;
+        },
+
+        makeArray: function(arrayLikeObject) {
+            var result = [];
+            for (var i = 0, j = arrayLikeObject.length; i < j; i++) {
+                result.push(arrayLikeObject[i]);
+            };
+            return result;
+        },
+
+        isIe6 : isIe6,
+        isIe7 : isIe7,
+        ieVersion : ieVersion,
+
+        getFormFields: function(form, fieldName) {
+            var fields = ko.utils.makeArray(form.getElementsByTagName("input")).concat(ko.utils.makeArray(form.getElementsByTagName("textarea")));
+            var isMatchingField = (typeof fieldName == 'string')
+                ? function(field) { return field.name === fieldName }
+                : function(field) { return fieldName.test(field.name) }; // Treat fieldName as regex or object containing predicate
+            var matches = [];
+            for (var i = fields.length - 1; i >= 0; i--) {
+                if (isMatchingField(fields[i]))
+                    matches.push(fields[i]);
+            };
+            return matches;
+        },
+
+        parseJson: function (jsonString) {
+            if (typeof jsonString == "string") {
+                jsonString = ko.utils.stringTrim(jsonString);
+                if (jsonString) {
+                    if (window.JSON && window.JSON.parse) // Use native parsing where available
+                        return window.JSON.parse(jsonString);
+                    return (new Function("return " + jsonString))(); // Fallback on less safe parsing for older browsers
+                }
+            }
+            return null;
+        },
+
+        stringifyJson: function (data, replacer, space) {   // replacer and space are optional
+            if ((typeof JSON == "undefined") || (typeof JSON.stringify == "undefined"))
+                throw new Error("Cannot find JSON.stringify(). Some browsers (e.g., IE < 8) don't support it natively, but you can overcome this by adding a script reference to json2.js, downloadable from http://www.json.org/json2.js");
+            return JSON.stringify(ko.utils.unwrapObservable(data), replacer, space);
+        },
+
+        postJson: function (urlOrForm, data, options) {
+            options = options || {};
+            var params = options['params'] || {};
+            var includeFields = options['includeFields'] || this.fieldsIncludedWithJsonPost;
+            var url = urlOrForm;
+
+            // If we were given a form, use its 'action' URL and pick out any requested field values
+            if((typeof urlOrForm == 'object') && (ko.utils.tagNameLower(urlOrForm) === "form")) {
+                var originalForm = urlOrForm;
+                url = originalForm.action;
+                for (var i = includeFields.length - 1; i >= 0; i--) {
+                    var fields = ko.utils.getFormFields(originalForm, includeFields[i]);
+                    for (var j = fields.length - 1; j >= 0; j--)
+                        params[fields[j].name] = fields[j].value;
+                }
+            }
+
+            data = ko.utils.unwrapObservable(data);
+            var form = document.createElement("form");
+            form.style.display = "none";
+            form.action = url;
+            form.method = "post";
+            for (var key in data) {
+                var input = document.createElement("input");
+                input.name = key;
+                input.value = ko.utils.stringifyJson(ko.utils.unwrapObservable(data[key]));
+                form.appendChild(input);
+            }
+            for (var key in params) {
+                var input = document.createElement("input");
+                input.name = key;
+                input.value = params[key];
+                form.appendChild(input);
+            }
+            document.body.appendChild(form);
+            options['submitter'] ? options['submitter'](form) : form.submit();
+            setTimeout(function () { form.parentNode.removeChild(form); }, 0);
+        }
+    }
+})();
+
+ko.exportSymbol('utils', ko.utils);
+ko.exportSymbol('utils.arrayForEach', ko.utils.arrayForEach);
+ko.exportSymbol('utils.arrayFirst', ko.utils.arrayFirst);
+ko.exportSymbol('utils.arrayFilter', ko.utils.arrayFilter);
+ko.exportSymbol('utils.arrayGetDistinctValues', ko.utils.arrayGetDistinctValues);
+ko.exportSymbol('utils.arrayIndexOf', ko.utils.arrayIndexOf);
+ko.exportSymbol('utils.arrayMap', ko.utils.arrayMap);
+ko.exportSymbol('utils.arrayPushAll', ko.utils.arrayPushAll);
+ko.exportSymbol('utils.arrayRemoveItem', ko.utils.arrayRemoveItem);
+ko.exportSymbol('utils.extend', ko.utils.extend);
+ko.exportSymbol('utils.fieldsIncludedWithJsonPost', ko.utils.fieldsIncludedWithJsonPost);
+ko.exportSymbol('utils.getFormFields', ko.utils.getFormFields);
+ko.exportSymbol('utils.peekObservable', ko.utils.peekObservable);
+ko.exportSymbol('utils.postJson', ko.utils.postJson);
+ko.exportSymbol('utils.parseJson', ko.utils.parseJson);
+ko.exportSymbol('utils.registerEventHandler', ko.utils.registerEventHandler);
+ko.exportSymbol('utils.stringifyJson', ko.utils.stringifyJson);
+ko.exportSymbol('utils.range', ko.utils.range);
+ko.exportSymbol('utils.toggleDomNodeCssClass', ko.utils.toggleDomNodeCssClass);
+ko.exportSymbol('utils.triggerEvent', ko.utils.triggerEvent);
+ko.exportSymbol('utils.unwrapObservable', ko.utils.unwrapObservable);
+
+if (!Function.prototype['bind']) {
+    // Function.prototype.bind is a standard part of ECMAScript 5th Edition (December 2009, http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-262.pdf)
+    // In case the browser doesn't implement it natively, provide a JavaScript implementation. This implementation is based on the one in prototype.js
+    Function.prototype['bind'] = function (object) {
+        var originalFunction = this, args = Array.prototype.slice.call(arguments), object = args.shift();
+        return function () {
+            return originalFunction.apply(object, args.concat(Array.prototype.slice.call(arguments)));
+        };
+    };
+}
+
+ko.utils.domData = new (function () {
+    var uniqueId = 0;
+    var dataStoreKeyExpandoPropertyName = "__ko__" + (new Date).getTime();
+    var dataStore = {};
+    return {
+        get: function (node, key) {
+            var allDataForNode = ko.utils.domData.getAll(node, false);
+            return allDataForNode === undefined ? undefined : allDataForNode[key];
+        },
+        set: function (node, key, value) {
+            if (value === undefined) {
+                // Make sure we don't actually create a new domData key if we are actually deleting a value
+                if (ko.utils.domData.getAll(node, false) === undefined)
+                    return;
+            }
+            var allDataForNode = ko.utils.domData.getAll(node, true);
+            allDataForNode[key] = value;
+        },
+        getAll: function (node, createIfNotFound) {
+            var dataStoreKey = node[dataStoreKeyExpandoPropertyName];
+            var hasExistingDataStore = dataStoreKey && (dataStoreKey !== "null") && dataStore[dataStoreKey];
+            if (!hasExistingDataStore) {
+                if (!createIfNotFound)
+                    return undefined;
+                dataStoreKey = node[dataStoreKeyExpandoPropertyName] = "ko" + uniqueId++;
+                dataStore[dataStoreKey] = {};
+            }
+            return dataStore[dataStoreKey];
+        },
+        clear: function (node) {
+            var dataStoreKey = node[dataStoreKeyExpandoPropertyName];
+            if (dataStoreKey) {
+                delete dataStore[dataStoreKey];
+                node[dataStoreKeyExpandoPropertyName] = null;
+                return true; // Exposing "did clean" flag purely so specs can infer whether things have been cleaned up as intended
+            }
+            return false;
+        }
+    }
+})();
+
+ko.exportSymbol('utils.domData', ko.utils.domData);
+ko.exportSymbol('utils.domData.clear', ko.utils.domData.clear); // Exporting only so specs can clear up after themselves fully
+
+ko.utils.domNodeDisposal = new (function () {
+    var domDataKey = "__ko_domNodeDisposal__" + (new Date).getTime();
+    var cleanableNodeTypes = { 1: true, 8: true, 9: true };       // Element, Comment, Document
+    var cleanableNodeTypesWithDescendants = { 1: true, 9: true }; // Element, Document
+
+    function getDisposeCallbacksCollection(node, createIfNotFound) {
+        var allDisposeCallbacks = ko.utils.domData.get(node, domDataKey);
+        if ((allDisposeCallbacks === undefined) && createIfNotFound) {
+            allDisposeCallbacks = [];
+            ko.utils.domData.set(node, domDataKey, allDisposeCallbacks);
+        }
+        return allDisposeCallbacks;
+    }
+    function destroyCallbacksCollection(node) {
+        ko.utils.domData.set(node, domDataKey, undefined);
+    }
+
+    function cleanSingleNode(node) {
+        // Run all the dispose callbacks
+        var callbacks = getDisposeCallbacksCollection(node, false);
+        if (callbacks) {
+            callbacks = callbacks.slice(0); // Clone, as the array may be modified during iteration (typically, callbacks will remove themselves)
+            for (var i = 0; i < callbacks.length; i++)
+                callbacks[i](node);
+        }
+
+        // Also erase the DOM data
+        ko.utils.domData.clear(node);
+
+        // Special support for jQuery here because it's so commonly used.
+        // Many jQuery plugins (including jquery.tmpl) store data using jQuery's equivalent of domData
+        // so notify it to tear down any resources associated with the node & descendants here.
+        if ((typeof jQuery == "function") && (typeof jQuery['cleanData'] == "function"))
+            jQuery['cleanData']([node]);
+
+        // Also clear any immediate-child comment nodes, as these wouldn't have been found by
+        // node.getElementsByTagName("*") in cleanNode() (comment nodes aren't elements)
+        if (cleanableNodeTypesWithDescendants[node.nodeType])
+            cleanImmediateCommentTypeChildren(node);
+    }
+
+    function cleanImmediateCommentTypeChildren(nodeWithChildren) {
+        var child, nextChild = nodeWithChildren.firstChild;
+        while (child = nextChild) {
+            nextChild = child.nextSibling;
+            if (child.nodeType === 8)
+                cleanSingleNode(child);
+        }
+    }
+
+    return {
+        addDisposeCallback : function(node, callback) {
+            if (typeof callback != "function")
+                throw new Error("Callback must be a function");
+            getDisposeCallbacksCollection(node, true).push(callback);
+        },
+
+        removeDisposeCallback : function(node, callback) {
+            var callbacksCollection = getDisposeCallbacksCollection(node, false);
+            if (callbacksCollection) {
+                ko.utils.arrayRemoveItem(callbacksCollection, callback);
+                if (callbacksCollection.length == 0)
+                    destroyCallbacksCollection(node);
+            }
+        },
+
+        cleanNode : function(node) {
+            // First clean this node, where applicable
+            if (cleanableNodeTypes[node.nodeType]) {
+                cleanSingleNode(node);
+
+                // ... then its descendants, where applicable
+                if (cleanableNodeTypesWithDescendants[node.nodeType]) {
+                    // Clone the descendants list in case it changes during iteration
+                    var descendants = [];
+                    ko.utils.arrayPushAll(descendants, node.getElementsByTagName("*"));
+                    for (var i = 0, j = descendants.length; i < j; i++)
+                        cleanSingleNode(descendants[i]);
+                }
+            }
+            return node;
+        },
+
+        removeNode : function(node) {
+            ko.cleanNode(node);
+            if (node.parentNode)
+                node.parentNode.removeChild(node);
+        }
+    }
+})();
+ko.cleanNode = ko.utils.domNodeDisposal.cleanNode; // Shorthand name for convenience
+ko.removeNode = ko.utils.domNodeDisposal.removeNode; // Shorthand name for convenience
+ko.exportSymbol('cleanNode', ko.cleanNode);
+ko.exportSymbol('removeNode', ko.removeNode);
+ko.exportSymbol('utils.domNodeDisposal', ko.utils.domNodeDisposal);
+ko.exportSymbol('utils.domNodeDisposal.addDisposeCallback', ko.utils.domNodeDisposal.addDisposeCallback);
+ko.exportSymbol('utils.domNodeDisposal.removeDisposeCallback', ko.utils.domNodeDisposal.removeDisposeCallback);
+(function () {
+    var leadingCommentRegex = /^(\s*)<!--(.*?)-->/;
+
+    function simpleHtmlParse(html) {
+        // Based on jQuery's "clean" function, but only accounting for table-related elements.
+        // If you have referenced jQuery, this won't be used anyway - KO will use jQuery's "clean" function directly
+
+        // Note that there's still an issue in IE < 9 whereby it will discard comment nodes that are the first child of
+        // a descendant node. For example: "<div><!-- mycomment -->abc</div>" will get parsed as "<div>abc</div>"
+        // This won't affect anyone who has referenced jQuery, and there's always the workaround of inserting a dummy node
+        // (possibly a text node) in front of the comment. So, KO does not attempt to workaround this IE issue automatically at present.
+
+        // Trim whitespace, otherwise indexOf won't work as expected
+        var tags = ko.utils.stringTrim(html).toLowerCase(), div = document.createElement("div");
+
+        // Finds the first match from the left column, and returns the corresponding "wrap" data from the right column
+        var wrap = tags.match(/^<(thead|tbody|tfoot)/)              && [1, "<table>", "</table>"] ||
+                   !tags.indexOf("<tr")                             && [2, "<table><tbody>", "</tbody></table>"] ||
+                   (!tags.indexOf("<td") || !tags.indexOf("<th"))   && [3, "<table><tbody><tr>", "</tr></tbody></table>"] ||
+                   /* anything else */                                 [0, "", ""];
+
+        // Go to html and back, then peel off extra wrappers
+        // Note that we always prefix with some dummy text, because otherwise, IE<9 will strip out leading comment nodes in descendants. Total madness.
+        var markup = "ignored<div>" + wrap[1] + html + wrap[2] + "</div>";
+        if (typeof window['innerShiv'] == "function") {
+            div.appendChild(window['innerShiv'](markup));
+        } else {
+            div.innerHTML = markup;
+        }
+
+        // Move to the right depth
+        while (wrap[0]--)
+            div = div.lastChild;
+
+        return ko.utils.makeArray(div.lastChild.childNodes);
+    }
+
+    function jQueryHtmlParse(html) {
+        // jQuery's "parseHTML" function was introduced in jQuery 1.8.0 and is a documented public API.
+        if (jQuery['parseHTML']) {
+            return jQuery['parseHTML'](html);
+        } else {
+            // For jQuery < 1.8.0, we fall back on the undocumented internal "clean" function.
+            var elems = jQuery['clean']([html]);
+
+            // As of jQuery 1.7.1, jQuery parses the HTML by appending it to some dummy parent nodes held in an in-memory document fragment.
+            // Unfortunately, it never clears the dummy parent nodes from the document fragment, so it leaks memory over time.
+            // Fix this by finding the top-most dummy parent element, and detaching it from its owner fragment.
+            if (elems && elems[0]) {
+                // Find the top-most parent element that's a direct child of a document fragment
+                var elem = elems[0];
+                while (elem.parentNode && elem.parentNode.nodeType !== 11 /* i.e., DocumentFragment */)
+                    elem = elem.parentNode;
+                // ... then detach it
+                if (elem.parentNode)
+                    elem.parentNode.removeChild(elem);
+            }
+
+            return elems;
+        }
+    }
+
+    ko.utils.parseHtmlFragment = function(html) {
+        return typeof jQuery != 'undefined' ? jQueryHtmlParse(html)   // As below, benefit from jQuery's optimisations where possible
+                                            : simpleHtmlParse(html);  // ... otherwise, this simple logic will do in most common cases.
+    };
+
+    ko.utils.setHtml = function(node, html) {
+        ko.utils.emptyDomNode(node);
+
+        // There's no legitimate reason to display a stringified observable without unwrapping it, so we'll unwrap it
+        html = ko.utils.unwrapObservable(html);
+
+        if ((html !== null) && (html !== undefined)) {
+            if (typeof html != 'string')
+                html = html.toString();
+
+            // jQuery contains a lot of sophisticated code to parse arbitrary HTML fragments,
+            // for example <tr> elements which are not normally allowed to exist on their own.
+            // If you've referenced jQuery we'll use that rather than duplicating its code.
+            if (typeof jQuery != 'undefined') {
+                jQuery(node)['html'](html);
+            } else {
+                // ... otherwise, use KO's own parsing logic.
+                var parsedNodes = ko.utils.parseHtmlFragment(html);
+                for (var i = 0; i < parsedNodes.length; i++)
+                    node.appendChild(parsedNodes[i]);
+            }
+        }
+    };
+})();
+
+ko.exportSymbol('utils.parseHtmlFragment', ko.utils.parseHtmlFragment);
+ko.exportSymbol('utils.setHtml', ko.utils.setHtml);
+
+ko.memoization = (function () {
+    var memos = {};
+
+    function randomMax8HexChars() {
+        return (((1 + Math.random()) * 0x100000000) | 0).toString(16).substring(1);
+    }
+    function generateRandomId() {
+        return randomMax8HexChars() + randomMax8HexChars();
+    }
+    function findMemoNodes(rootNode, appendToArray) {
+        if (!rootNode)
+            return;
+        if (rootNode.nodeType == 8) {
+            var memoId = ko.memoization.parseMemoText(rootNode.nodeValue);
+            if (memoId != null)
+                appendToArray.push({ domNode: rootNode, memoId: memoId });
+        } else if (rootNode.nodeType == 1) {
+            for (var i = 0, childNodes = rootNode.childNodes, j = childNodes.length; i < j; i++)
+                findMemoNodes(childNodes[i], appendToArray);
+        }
+    }
+
+    return {
+        memoize: function (callback) {
+            if (typeof callback != "function")
+                throw new Error("You can only pass a function to ko.memoization.memoize()");
+            var memoId = generateRandomId();
+            memos[memoId] = callback;
+            return "<!--[ko_memo:" + memoId + "]-->";
+        },
+
+        unmemoize: function (memoId, callbackParams) {
+            var callback = memos[memoId];
+            if (callback === undefined)
+                throw new Error("Couldn't find any memo with ID " + memoId + ". Perhaps it's already been unmemoized.");
+            try {
+                callback.apply(null, callbackParams || []);
+                return true;
+            }
+            finally { delete memos[memoId]; }
+        },
+
+        unmemoizeDomNodeAndDescendants: function (domNode, extraCallbackParamsArray) {
+            var memos = [];
+            findMemoNodes(domNode, memos);
+            for (var i = 0, j = memos.length; i < j; i++) {
+                var node = memos[i].domNode;
+                var combinedParams = [node];
+                if (extraCallbackParamsArray)
+                    ko.utils.arrayPushAll(combinedParams, extraCallbackParamsArray);
+                ko.memoization.unmemoize(memos[i].memoId, combinedParams);
+                node.nodeValue = ""; // Neuter this node so we don't try to unmemoize it again
+                if (node.parentNode)
+                    node.parentNode.removeChild(node); // If possible, erase it totally (not always possible - someone else might just hold a reference to it then call unmemoizeDomNodeAndDescendants again)
+            }
+        },
+
+        parseMemoText: function (memoText) {
+            var match = memoText.match(/^\[ko_memo\:(.*?)\]$/);
+            return match ? match[1] : null;
+        }
+    };
+})();
+
+ko.exportSymbol('memoization', ko.memoization);
+ko.exportSymbol('memoization.memoize', ko.memoization.memoize);
+ko.exportSymbol('memoization.unmemoize', ko.memoization.unmemoize);
+ko.exportSymbol('memoization.parseMemoText', ko.memoization.parseMemoText);
+ko.exportSymbol('memoization.unmemoizeDomNodeAndDescendants', ko.memoization.unmemoizeDomNodeAndDescendants);
+ko.extenders = {
+    'throttle': function(target, timeout) {
+        // Throttling means two things:
+
+        // (1) For dependent observables, we throttle *evaluations* so that, no matter how fast its dependencies
+        //     notify updates, the target doesn't re-evaluate (and hence doesn't notify) faster than a certain rate
+        target['throttleEvaluation'] = timeout;
+
+        // (2) For writable targets (observables, or writable dependent observables), we throttle *writes*
+        //     so the target cannot change value synchronously or faster than a certain rate
+        var writeTimeoutInstance = null;
+        return ko.dependentObservable({
+            'read': target,
+            'write': function(value) {
+                clearTimeout(writeTimeoutInstance);
+                writeTimeoutInstance = setTimeout(function() {
+                    target(value);
+                }, timeout);
+            }
+        });
+    },
+
+    'notify': function(target, notifyWhen) {
+        target["equalityComparer"] = notifyWhen == "always"
+            ? function() { return false } // Treat all values as not equal
+            : ko.observable["fn"]["equalityComparer"];
+        return target;
+    }
+};
+
+function applyExtenders(requestedExtenders) {
+    var target = this;
+    if (requestedExtenders) {
+        for (var key in requestedExtenders) {
+            var extenderHandler = ko.extenders[key];
+            if (typeof extenderHandler == 'function') {
+                target = extenderHandler(target, requestedExtenders[key]);
+            }
+        }
+    }
+    return target;
+}
+
+ko.exportSymbol('extenders', ko.extenders);
+
+ko.subscription = function (target, callback, disposeCallback) {
+    this.target = target;
+    this.callback = callback;
+    this.disposeCallback = disposeCallback;
+    ko.exportProperty(this, 'dispose', this.dispose);
+};
+ko.subscription.prototype.dispose = function () {
+    this.isDisposed = true;
+    this.disposeCallback();
+};
+
+ko.subscribable = function () {
+    this._subscriptions = {};
+
+    ko.utils.extend(this, ko.subscribable['fn']);
+    ko.exportProperty(this, 'subscribe', this.subscribe);
+    ko.exportProperty(this, 'extend', this.extend);
+    ko.exportProperty(this, 'getSubscriptionsCount', this.getSubscriptionsCount);
+}
+
+var defaultEvent = "change";
+
+ko.subscribable['fn'] = {
+    subscribe: function (callback, callbackTarget, event) {
+        event = event || defaultEvent;
+        var boundCallback = callbackTarget ? callback.bind(callbackTarget) : callback;
+
+        var subscription = new ko.subscription(this, boundCallback, function () {
+            ko.utils.arrayRemoveItem(this._subscriptions[event], subscription);
+        }.bind(this));
+
+        if (!this._subscriptions[event])
+            this._subscriptions[event] = [];
+        this._subscriptions[event].push(subscription);
+        return subscription;
+    },
+
+    "notifySubscribers": function (valueToNotify, event) {
+        event = event || defaultEvent;
+        if (this._subscriptions[event]) {
+            ko.dependencyDetection.ignore(function() {
+                ko.utils.arrayForEach(this._subscriptions[event].slice(0), function (subscription) {
+                    // In case a subscription was disposed during the arrayForEach cycle, check
+                    // for isDisposed on each subscription before invoking its callback
+                    if (subscription && (subscription.isDisposed !== true))
+                        subscription.callback(valueToNotify);
+                });
+            }, this);
+        }
+    },
+
+    getSubscriptionsCount: function () {
+        var total = 0;
+        for (var eventName in this._subscriptions) {
+            if (this._subscriptions.hasOwnProperty(eventName))
+                total += this._subscriptions[eventName].length;
+        }
+        return total;
+    },
+
+    extend: applyExtenders
+};
+
+
+ko.isSubscribable = function (instance) {
+    return typeof instance.subscribe == "function" && typeof instance["notifySubscribers"] == "function";
+};
+
+ko.exportSymbol('subscribable', ko.subscribable);
+ko.exportSymbol('isSubscribable', ko.isSubscribable);
+
+ko.dependencyDetection = (function () {
+    var _frames = [];
+
+    return {
+        begin: function (callback) {
+            _frames.push({ callback: callback, distinctDependencies:[] });
+        },
+
+        end: function () {
+            _frames.pop();
+        },
+
+        registerDependency: function (subscribable) {
+            if (!ko.isSubscribable(subscribable))
+                throw new Error("Only subscribable things can act as dependencies");
+            if (_frames.length > 0) {
+                var topFrame = _frames[_frames.length - 1];
+                if (!topFrame || ko.utils.arrayIndexOf(topFrame.distinctDependencies, subscribable) >= 0)
+                    return;
+                topFrame.distinctDependencies.push(subscribable);
+                topFrame.callback(subscribable);
+            }
+        },
+
+        ignore: function(callback, callbackTarget, callbackArgs) {
+            try {
+                _frames.push(null);
+                return callback.apply(callbackTarget, callbackArgs || []);
+            } finally {
+                _frames.pop();
+            }
+        }
+    };
+})();
+var primitiveTypes = { 'undefined':true, 'boolean':true, 'number':true, 'string':true };
+
+ko.observable = function (initialValue) {
+    var _latestValue = initialValue;
+
+    function observable() {
+        if (arguments.length > 0) {
+            // Write
+
+            // Ignore writes if the value hasn't changed
+            if ((!observable['equalityComparer']) || !observable['equalityComparer'](_latestValue, arguments[0])) {
+                observable.valueWillMutate();
+                _latestValue = arguments[0];
+                if (DEBUG) observable._latestValue = _latestValue;
+                observable.valueHasMutated();
+            }
+            return this; // Permits chained assignments
+        }
+        else {
+            // Read
+            ko.dependencyDetection.registerDependency(observable); // The caller only needs to be notified of changes if they did a "read" operation
+            return _latestValue;
+        }
+    }
+    if (DEBUG) observable._latestValue = _latestValue;
+    ko.subscribable.call(observable);
+    observable.peek = function() { return _latestValue };
+    observable.valueHasMutated = function () { observable["notifySubscribers"](_latestValue); }
+    observable.valueWillMutate = function () { observable["notifySubscribers"](_latestValue, "beforeChange"); }
+    ko.utils.extend(observable, ko.observable['fn']);
+
+    ko.exportProperty(observable, 'peek', observable.peek);
+    ko.exportProperty(observable, "valueHasMutated", observable.valueHasMutated);
+    ko.exportProperty(observable, "valueWillMutate", observable.valueWillMutate);
+
+    return observable;
+}
+
+ko.observable['fn'] = {
+    "equalityComparer": function valuesArePrimitiveAndEqual(a, b) {
+        var oldValueIsPrimitive = (a === null) || (typeof(a) in primitiveTypes);
+        return oldValueIsPrimitive ? (a === b) : false;
+    }
+};
+
+var protoProperty = ko.observable.protoProperty = "__ko_proto__";
+ko.observable['fn'][protoProperty] = ko.observable;
+
+ko.hasPrototype = function(instance, prototype) {
+    if ((instance === null) || (instance === undefined) || (instance[protoProperty] === undefined)) return false;
+    if (instance[protoProperty] === prototype) return true;
+    return ko.hasPrototype(instance[protoProperty], prototype); // Walk the prototype chain
+};
+
+ko.isObservable = function (instance) {
+    return ko.hasPrototype(instance, ko.observable);
+}
+ko.isWriteableObservable = function (instance) {
+    // Observable
+    if ((typeof instance == "function") && instance[protoProperty] === ko.observable)
+        return true;
+    // Writeable dependent observable
+    if ((typeof instance == "function") && (instance[protoProperty] === ko.dependentObservable) && (instance.hasWriteFunction))
+        return true;
+    // Anything else
+    return false;
+}
+
+
+ko.exportSymbol('observable', ko.observable);
+ko.exportSymbol('isObservable', ko.isObservable);
+ko.exportSymbol('isWriteableObservable', ko.isWriteableObservable);
+ko.observableArray = function (initialValues) {
+    if (arguments.length == 0) {
+        // Zero-parameter constructor initializes to empty array
+        initialValues = [];
+    }
+    if ((initialValues !== null) && (initialValues !== undefined) && !('length' in initialValues))
+        throw new Error("The argument passed when initializing an observable array must be an array, or null, or undefined.");
+
+    var result = ko.observable(initialValues);
+    ko.utils.extend(result, ko.observableArray['fn']);
+    return result;
+}
+
+ko.observableArray['fn'] = {
+    'remove': function (valueOrPredicate) {
+        var underlyingArray = this.peek();
+        var removedValues = [];
+        var predicate = typeof valueOrPredicate == "function" ? valueOrPredicate : function (value) { return value === valueOrPredicate; };
+        for (var i = 0; i < underlyingArray.length; i++) {
+            var value = underlyingArray[i];
+            if (predicate(value)) {
+                if (removedValues.length === 0) {
+                    this.valueWillMutate();
+                }
+                removedValues.push(value);
+                underlyingArray.splice(i, 1);
+                i--;
+            }
+        }
+        if (removedValues.length) {
+            this.valueHasMutated();
+        }
+        return removedValues;
+    },
+
+    'removeAll': function (arrayOfValues) {
+        // If you passed zero args, we remove everything
+        if (arrayOfValues === undefined) {
+            var underlyingArray = this.peek();
+            var allValues = underlyingArray.slice(0);
+            this.valueWillMutate();
+            underlyingArray.splice(0, underlyingArray.length);
+            this.valueHasMutated();
+            return allValues;
+        }
+        // If you passed an arg, we interpret it as an array of entries to remove
+        if (!arrayOfValues)
+            return [];
+        return this['remove'](function (value) {
+            return ko.utils.arrayIndexOf(arrayOfValues, value) >= 0;
+        });
+    },
+
+    'destroy': function (valueOrPredicate) {
+        var underlyingArray = this.peek();
+        var predicate = typeof valueOrPredicate == "function" ? valueOrPredicate : function (value) { return value === valueOrPredicate; };
+        this.valueWillMutate();
+        for (var i = underlyingArray.length - 1; i >= 0; i--) {
+            var value = underlyingArray[i];
+            if (predicate(value))
+                underlyingArray[i]["_destroy"] = true;
+        }
+        this.valueHasMutated();
+    },
+
+    'destroyAll': function (arrayOfValues) {
+        // If you passed zero args, we destroy everything
+        if (arrayOfValues === undefined)
+            return this['destroy'](function() { return true });
+
+        // If you passed an arg, we interpret it as an array of entries to destroy
+        if (!arrayOfValues)
+            return [];
+        return this['destroy'](function (value) {
+            return ko.utils.arrayIndexOf(arrayOfValues, value) >= 0;
+        });
+    },
+
+    'indexOf': function (item) {
+        var underlyingArray = this();
+        return ko.utils.arrayIndexOf(underlyingArray, item);
+    },
+
+    'replace': function(oldItem, newItem) {
+        var index = this['indexOf'](oldItem);
+        if (index >= 0) {
+            this.valueWillMutate();
+            this.peek()[index] = newItem;
+            this.valueHasMutated();
+        }
+    }
+}
+
+// Populate ko.observableArray.fn with read/write functions from native arrays
+// Important: Do not add any additional functions here that may reasonably be used to *read* data from the array
+// because we'll eval them without causing subscriptions, so ko.computed output could end up getting stale
+ko.utils.arrayForEach(["pop", "push", "reverse", "shift", "sort", "splice", "unshift"], function (methodName) {
+    ko.observableArray['fn'][methodName] = function () {
+        // Use "peek" to avoid creating a subscription in any computed that we're executing in the context of
+        // (for consistency with mutating regular observables)
+        var underlyingArray = this.peek();
+        this.valueWillMutate();
+        var methodCallResult = underlyingArray[methodName].apply(underlyingArray, arguments);
+        this.valueHasMutated();
+        return methodCallResult;
+    };
+});
+
+// Populate ko.observableArray.fn with read-only functions from native arrays
+ko.utils.arrayForEach(["slice"], function (methodName) {
+    ko.observableArray['fn'][methodName] = function () {
+        var underlyingArray = this();
+        return underlyingArray[methodName].apply(underlyingArray, arguments);
+    };
+});
+
+ko.exportSymbol('observableArray', ko.observableArray);
+ko.dependentObservable = function (evaluatorFunctionOrOptions, evaluatorFunctionTarget, options) {
+    var _latestValue,
+        _hasBeenEvaluated = false,
+        _isBeingEvaluated = false,
+        readFunction = evaluatorFunctionOrOptions;
+
+    if (readFunction && typeof readFunction == "object") {
+        // Single-parameter syntax - everything is on this "options" param
+        options = readFunction;
+        readFunction = options["read"];
+    } else {
+        // Multi-parameter syntax - construct the options according to the params passed
+        options = options || {};
+        if (!readFunction)
+            readFunction = options["read"];
+    }
+    if (typeof readFunction != "function")
+        throw new Error("Pass a function that returns the value of the ko.computed");
+
+    function addSubscriptionToDependency(subscribable) {
+        _subscriptionsToDependencies.push(subscribable.subscribe(evaluatePossiblyAsync));
+    }
+
+    function disposeAllSubscriptionsToDependencies() {
+        ko.utils.arrayForEach(_subscriptionsToDependencies, function (subscription) {
+            subscription.dispose();
+        });
+        _subscriptionsToDependencies = [];
+    }
+
+    function evaluatePossiblyAsync() {
+        var throttleEvaluationTimeout = dependentObservable['throttleEvaluation'];
+        if (throttleEvaluationTimeout && throttleEvaluationTimeout >= 0) {
+            clearTimeout(evaluationTimeoutInstance);
+            evaluationTimeoutInstance = setTimeout(evaluateImmediate, throttleEvaluationTimeout);
+        } else
+            evaluateImmediate();
+    }
+
+    function evaluateImmediate() {
+        if (_isBeingEvaluated) {
+            // If the evaluation of a ko.computed causes side effects, it's possible that it will trigger its own re-evaluation.
+            // This is not desirable (it's hard for a developer to realise a chain of dependencies might cause this, and they almost
+            // certainly didn't intend infinite re-evaluations). So, for predictability, we simply prevent ko.computeds from causing
+            // their own re-evaluation. Further discussion at https://github.com/SteveSanderson/knockout/pull/387
+            return;
+        }
+
+        // Don't dispose on first evaluation, because the "disposeWhen" callback might
+        // e.g., dispose when the associated DOM element isn't in the doc, and it's not
+        // going to be in the doc until *after* the first evaluation
+        if (_hasBeenEvaluated && disposeWhen()) {
+            dispose();
+            return;
+        }
+
+        _isBeingEvaluated = true;
+        try {
+            // Initially, we assume that none of the subscriptions are still being used (i.e., all are candidates for disposal).
+            // Then, during evaluation, we cross off any that are in fact still being used.
+            var disposalCandidates = ko.utils.arrayMap(_subscriptionsToDependencies, function(item) {return item.target;});
+
+            ko.dependencyDetection.begin(function(subscribable) {
+                var inOld;
+                if ((inOld = ko.utils.arrayIndexOf(disposalCandidates, subscribable)) >= 0)
+                    disposalCandidates[inOld] = undefined; // Don't want to dispose this subscription, as it's still being used
+                else
+                    addSubscriptionToDependency(subscribable); // Brand new subscription - add it
+            });
+
+            var newValue = readFunction.call(evaluatorFunctionTarget);
+
+            // For each subscription no longer being used, remove it from the active subscriptions list and dispose it
+            for (var i = disposalCandidates.length - 1; i >= 0; i--) {
+                if (disposalCandidates[i])
+                    _subscriptionsToDependencies.splice(i, 1)[0].dispose();
+            }
+            _hasBeenEvaluated = true;
+
+            dependentObservable["notifySubscribers"](_latestValue, "beforeChange");
+            _latestValue = newValue;
+            if (DEBUG) dependentObservable._latestValue = _latestValue;
+        } finally {
+            ko.dependencyDetection.end();
+        }
+
+        dependentObservable["notifySubscribers"](_latestValue);
+        _isBeingEvaluated = false;
+        if (!_subscriptionsToDependencies.length)
+            dispose();
+    }
+
+    function dependentObservable() {
+        if (arguments.length > 0) {
+            if (typeof writeFunction === "function") {
+                // Writing a value
+                writeFunction.apply(evaluatorFunctionTarget, arguments);
+            } else {
+                throw new Error("Cannot write a value to a ko.computed unless you specify a 'write' option. If you wish to read the current value, don't pass any parameters.");
+            }
+            return this; // Permits chained assignments
+        } else {
+            // Reading the value
+            if (!_hasBeenEvaluated)
+                evaluateImmediate();
+            ko.dependencyDetection.registerDependency(dependentObservable);
+            return _latestValue;
+        }
+    }
+
+    function peek() {
+        if (!_hasBeenEvaluated)
+            evaluateImmediate();
+        return _latestValue;
+    }
+
+    function isActive() {
+        return !_hasBeenEvaluated || _subscriptionsToDependencies.length > 0;
+    }
+
+    // By here, "options" is always non-null
+    var writeFunction = options["write"],
+        disposeWhenNodeIsRemoved = options["disposeWhenNodeIsRemoved"] || options.disposeWhenNodeIsRemoved || null,
+        disposeWhen = options["disposeWhen"] || options.disposeWhen || function() { return false; },
+        dispose = disposeAllSubscriptionsToDependencies,
+        _subscriptionsToDependencies = [],
+        evaluationTimeoutInstance = null;
+
+    if (!evaluatorFunctionTarget)
+        evaluatorFunctionTarget = options["owner"];
+
+    dependentObservable.peek = peek;
+    dependentObservable.getDependenciesCount = function () { return _subscriptionsToDependencies.length; };
+    dependentObservable.hasWriteFunction = typeof options["write"] === "function";
+    dependentObservable.dispose = function () { dispose(); };
+    dependentObservable.isActive = isActive;
+    dependentObservable.valueHasMutated = function() {
+        _hasBeenEvaluated = false;
+        evaluateImmediate();
+    };
+
+    ko.subscribable.call(dependentObservable);
+    ko.utils.extend(dependentObservable, ko.dependentObservable['fn']);
+
+    ko.exportProperty(dependentObservable, 'peek', dependentObservable.peek);
+    ko.exportProperty(dependentObservable, 'dispose', dependentObservable.dispose);
+    ko.exportProperty(dependentObservable, 'isActive', dependentObservable.isActive);
+    ko.exportProperty(dependentObservable, 'getDependenciesCount', dependentObservable.getDependenciesCount);
+
+    // Evaluate, unless deferEvaluation is true
+    if (options['deferEvaluation'] !== true)
+        evaluateImmediate();
+
+    // Build "disposeWhenNodeIsRemoved" and "disposeWhenNodeIsRemovedCallback" option values.
+    // But skip if isActive is false (there will never be any dependencies to dispose).
+    // (Note: "disposeWhenNodeIsRemoved" option both proactively disposes as soon as the node is removed using ko.removeNode(),
+    // plus adds a "disposeWhen" callback that, on each evaluation, disposes if the node was removed by some other means.)
+    if (disposeWhenNodeIsRemoved && isActive()) {
+        dispose = function() {
+            ko.utils.domNodeDisposal.removeDisposeCallback(disposeWhenNodeIsRemoved, arguments.callee);
+            disposeAllSubscriptionsToDependencies();
+        };
+        ko.utils.domNodeDisposal.addDisposeCallback(disposeWhenNodeIsRemoved, dispose);
+        var existingDisposeWhenFunction = disposeWhen;
+        disposeWhen = function () {
+            return !ko.utils.domNodeIsAttachedToDocument(disposeWhenNodeIsRemoved) || existingDisposeWhenFunction();
+        }
+    }
+
+    return dependentObservable;
+};
+
+ko.isComputed = function(instance) {
+    return ko.hasPrototype(instance, ko.dependentObservable);
+};
+
+var protoProp = ko.observable.protoProperty; // == "__ko_proto__"
+ko.dependentObservable[protoProp] = ko.observable;
+
+ko.dependentObservable['fn'] = {};
+ko.dependentObservable['fn'][protoProp] = ko.dependentObservable;
+
+ko.exportSymbol('dependentObservable', ko.dependentObservable);
+ko.exportSymbol('computed', ko.dependentObservable); // Make "ko.computed" an alias for "ko.dependentObservable"
+ko.exportSymbol('isComputed', ko.isComputed);
+
+(function() {
+    var maxNestedObservableDepth = 10; // Escape the (unlikely) pathalogical case where an observable's current value is itself (or similar reference cycle)
+
+    ko.toJS = function(rootObject) {
+        if (arguments.length == 0)
+            throw new Error("When calling ko.toJS, pass the object you want to convert.");
+
+        // We just unwrap everything at every level in the object graph
+        return mapJsObjectGraph(rootObject, function(valueToMap) {
+            // Loop because an observable's value might in turn be another observable wrapper
+            for (var i = 0; ko.isObservable(valueToMap) && (i < maxNestedObservableDepth); i++)
+                valueToMap = valueToMap();
+            return valueToMap;
+        });
+    };
+
+    ko.toJSON = function(rootObject, replacer, space) {     // replacer and space are optional
+        var plainJavaScriptObject = ko.toJS(rootObject);
+        return ko.utils.stringifyJson(plainJavaScriptObject, replacer, space);
+    };
+
+    function mapJsObjectGraph(rootObject, mapInputCallback, visitedObjects) {
+        visitedObjects = visitedObjects || new objectLookup();
+
+        rootObject = mapInputCallback(rootObject);
+        var canHaveProperties = (typeof rootObject == "object") && (rootObject !== null) && (rootObject !== undefined) && (!(rootObject instanceof Date));
+        if (!canHaveProperties)
+            return rootObject;
+
+        var outputProperties = rootObject instanceof Array ? [] : {};
+        visitedObjects.save(rootObject, outputProperties);
+
+        visitPropertiesOrArrayEntries(rootObject, function(indexer) {
+            var propertyValue = mapInputCallback(rootObject[indexer]);
+
+            switch (typeof propertyValue) {
+                case "boolean":
+                case "number":
+                case "string":
+                case "function":
+                    outputProperties[indexer] = propertyValue;
+                    break;
+                case "object":
+                case "undefined":
+                    var previouslyMappedValue = visitedObjects.get(propertyValue);
+                    outputProperties[indexer] = (previouslyMappedValue !== undefined)
+                        ? previouslyMappedValue
+                        : mapJsObjectGraph(propertyValue, mapInputCallback, visitedObjects);
+                    break;
+            }
+        });
+
+        return outputProperties;
+    }
+
+    function visitPropertiesOrArrayEntries(rootObject, visitorCallback) {
+        if (rootObject instanceof Array) {
+            for (var i = 0; i < rootObject.length; i++)
+                visitorCallback(i);
+
+            // For arrays, also respect toJSON property for custom mappings (fixes #278)
+            if (typeof rootObject['toJSON'] == 'function')
+                visitorCallback('toJSON');
+        } else {
+            for (var propertyName in rootObject)
+                visitorCallback(propertyName);
+        }
+    };
+
+    function objectLookup() {
+        var keys = [];
+        var values = [];
+        this.save = function(key, value) {
+            var existingIndex = ko.utils.arrayIndexOf(keys, key);
+            if (existingIndex >= 0)
+                values[existingIndex] = value;
+            else {
+                keys.push(key);
+                values.push(value);
+            }
+        };
+        this.get = function(key) {
+            var existingIndex = ko.utils.arrayIndexOf(keys, key);
+            return (existingIndex >= 0) ? values[existingIndex] : undefined;
+        };
+    };
+})();
+
+ko.exportSymbol('toJS', ko.toJS);
+ko.exportSymbol('toJSON', ko.toJSON);
+(function () {
+    var hasDomDataExpandoProperty = '__ko__hasDomDataOptionValue__';
+
+    // Normally, SELECT elements and their OPTIONs can only take value of type 'string' (because the values
+    // are stored on DOM attributes). ko.selectExtensions provides a way for SELECTs/OPTIONs to have values
+    // that are arbitrary objects. This is very convenient when implementing things like cascading dropdowns.
+    ko.selectExtensions = {
+        readValue : function(element) {
+            switch (ko.utils.tagNameLower(element)) {
+                case 'option':
+                    if (element[hasDomDataExpandoProperty] === true)
+                        return ko.utils.domData.get(element, ko.bindingHandlers.options.optionValueDomDataKey);
+                    return ko.utils.ieVersion <= 7
+                        ? (element.getAttributeNode('value').specified ? element.value : element.text)
+                        : element.value;
+                case 'select':
+                    return element.selectedIndex >= 0 ? ko.selectExtensions.readValue(element.options[element.selectedIndex]) : undefined;
+                default:
+                    return element.value;
+            }
+        },
+
+        writeValue: function(element, value) {
+            switch (ko.utils.tagNameLower(element)) {
+                case 'option':
+                    switch(typeof value) {
+                        case "string":
+                            ko.utils.domData.set(element, ko.bindingHandlers.options.optionValueDomDataKey, undefined);
+                            if (hasDomDataExpandoProperty in element) { // IE <= 8 throws errors if you delete non-existent properties from a DOM node
+                                delete element[hasDomDataExpandoProperty];
+                            }
+                            element.value = value;
+                            break;
+                        default:
+                            // Store arbitrary object using DomData
+                            ko.utils.domData.set(element, ko.bindingHandlers.options.optionValueDomDataKey, value);
+                            element[hasDomDataExpandoProperty] = true;
+
+                            // Special treatment of numbers is just for backward compatibility. KO 1.2.1 wrote numerical values to element.value.
+                            element.value = typeof value === "number" ? value : "";
+                            break;
+                    }
+                    break;
+                case 'select':
+                    for (var i = element.options.length - 1; i >= 0; i--) {
+                        if (ko.selectExtensions.readValue(element.options[i]) == value) {
+                            element.selectedIndex = i;
+                            break;
+                        }
+                    }
+                    break;
+                default:
+                    if ((value === null) || (value === undefined))
+                        value = "";
+                    element.value = value;
+                    break;
+            }
+        }
+    };
+})();
+
+ko.exportSymbol('selectExtensions', ko.selectExtensions);
+ko.exportSymbol('selectExtensions.readValue', ko.selectExtensions.readValue);
+ko.exportSymbol('selectExtensions.writeValue', ko.selectExtensions.writeValue);
+ko.expressionRewriting = (function () {
+    var restoreCapturedTokensRegex = /\@ko_token_(\d+)\@/g;
+    var javaScriptReservedWords = ["true", "false"];
+
+    // Matches something that can be assigned to--either an isolated identifier or something ending with a property accessor
+    // This is designed to be simple and avoid false negatives, but could produce false positives (e.g., a+b.c).
+    var javaScriptAssignmentTarget = /^(?:[$_a-z][$\w]*|(.+)(\.\s*[$_a-z][$\w]*|\[.+\]))$/i;
+
+    function restoreTokens(string, tokens) {
+        var prevValue = null;
+        while (string != prevValue) { // Keep restoring tokens until it no longer makes a difference (they may be nested)
+            prevValue = string;
+            string = string.replace(restoreCapturedTokensRegex, function (match, tokenIndex) {
+                return tokens[tokenIndex];
+            });
+        }
+        return string;
+    }
+
+    function getWriteableValue(expression) {
+        if (ko.utils.arrayIndexOf(javaScriptReservedWords, ko.utils.stringTrim(expression).toLowerCase()) >= 0)
+            return false;
+        var match = expression.match(javaScriptAssignmentTarget);
+        return match === null ? false : match[1] ? ('Object(' + match[1] + ')' + match[2]) : expression;
+    }
+
+    function ensureQuoted(key) {
+        var trimmedKey = ko.utils.stringTrim(key);
+        switch (trimmedKey.length && trimmedKey.charAt(0)) {
+            case "'":
+            case '"':
+                return key;
+            default:
+                return "'" + trimmedKey + "'";
+        }
+    }
+
+    return {
+        bindingRewriteValidators: [],
+
+        parseObjectLiteral: function(objectLiteralString) {
+            // A full tokeniser+lexer would add too much weight to this library, so here's a simple parser
+            // that is sufficient just to split an object literal string into a set of top-level key-value pairs
+
+            var str = ko.utils.stringTrim(objectLiteralString);
+            if (str.length < 3)
+                return [];
+            if (str.charAt(0) === "{")// Ignore any braces surrounding the whole object literal
+                str = str.substring(1, str.length - 1);
+
+            // Pull out any string literals and regex literals
+            var tokens = [];
+            var tokenStart = null, tokenEndChar;
+            for (var position = 0; position < str.length; position++) {
+                var c = str.charAt(position);
+                if (tokenStart === null) {
+                    switch (c) {
+                        case '"':
+                        case "'":
+                        case "/":
+                            tokenStart = position;
+                            tokenEndChar = c;
+                            break;
+                    }
+                } else if ((c == tokenEndChar) && (str.charAt(position - 1) !== "\\")) {
+                    var token = str.substring(tokenStart, position + 1);
+                    tokens.push(token);
+                    var replacement = "@ko_token_" + (tokens.length - 1) + "@";
+                    str = str.substring(0, tokenStart) + replacement + str.substring(position + 1);
+                    position -= (token.length - replacement.length);
+                    tokenStart = null;
+                }
+            }
+
+            // Next pull out balanced paren, brace, and bracket blocks
+            tokenStart = null;
+            tokenEndChar = null;
+            var tokenDepth = 0, tokenStartChar = null;
+            for (var position = 0; position < str.length; position++) {
+                var c = str.charAt(position);
+                if (tokenStart === null) {
+                    switch (c) {
+                        case "{": tokenStart = position; tokenStartChar = c;
+                                  tokenEndChar = "}";
+                                  break;
+                        case "(": tokenStart = position; tokenStartChar = c;
+                                  tokenEndChar = ")";
+                                  break;
+                        case "[": tokenStart = position; tokenStartChar = c;
+                                  tokenEndChar = "]";
+                                  break;
+                    }
+                }
+
+                if (c === tokenStartChar)
+                    tokenDepth++;
+                else if (c === tokenEndChar) {
+                    tokenDepth--;
+                    if (tokenDepth === 0) {
+                        var token = str.substring(tokenStart, position + 1);
+                        tokens.push(token);
+                        var replacement = "@ko_token_" + (tokens.length - 1) + "@";
+                        str = str.substring(0, tokenStart) + replacement + str.substring(position + 1);
+                        position -= (token.length - replacement.length);
+                        tokenStart = null;
+                    }
+                }
+            }
+
+            // Now we can safely split on commas to get the key/value pairs
+            var result = [];
+            var keyValuePairs = str.split(",");
+            for (var i = 0, j = keyValuePairs.length; i < j; i++) {
+                var pair = keyValuePairs[i];
+                var colonPos = pair.indexOf(":");
+                if ((colonPos > 0) && (colonPos < pair.length - 1)) {
+                    var key = pair.substring(0, colonPos);
+                    var value = pair.substring(colonPos + 1);
+                    result.push({ 'key': restoreTokens(key, tokens), 'value': restoreTokens(value, tokens) });
+                } else {
+                    result.push({ 'unknown': restoreTokens(pair, tokens) });
+                }
+            }
+            return result;
+        },
+
+        preProcessBindings: function (objectLiteralStringOrKeyValueArray) {
+            var keyValueArray = typeof objectLiteralStringOrKeyValueArray === "string"
+                ? ko.expressionRewriting.parseObjectLiteral(objectLiteralStringOrKeyValueArray)
+                : objectLiteralStringOrKeyValueArray;
+            var resultStrings = [], propertyAccessorResultStrings = [];
+
+            var keyValueEntry;
+            for (var i = 0; keyValueEntry = keyValueArray[i]; i++) {
+                if (resultStrings.length > 0)
+                    resultStrings.push(",");
+
+                if (keyValueEntry['key']) {
+                    var quotedKey = ensureQuoted(keyValueEntry['key']), val = keyValueEntry['value'];
+                    resultStrings.push(quotedKey);
+                    resultStrings.push(":");
+                    resultStrings.push(val);
+
+                    if (val = getWriteableValue(ko.utils.stringTrim(val))) {
+                        if (propertyAccessorResultStrings.length > 0)
+                            propertyAccessorResultStrings.push(", ");
+                        propertyAccessorResultStrings.push(quotedKey + " : function(__ko_value) { " + val + " = __ko_value; }");
+                    }
+                } else if (keyValueEntry['unknown']) {
+                    resultStrings.push(keyValueEntry['unknown']);
+                }
+            }
+
+            var combinedResult = resultStrings.join("");
+            if (propertyAccessorResultStrings.length > 0) {
+                var allPropertyAccessors = propertyAccessorResultStrings.join("");
+                combinedResult = combinedResult + ", '_ko_property_writers' : { " + allPropertyAccessors + " } ";
+            }
+
+            return combinedResult;
+        },
+
+        keyValueArrayContainsKey: function(keyValueArray, key) {
+            for (var i = 0; i < keyValueArray.length; i++)
+                if (ko.utils.stringTrim(keyValueArray[i]['key']) == key)
+                    return true;
+            return false;
+        },
+
+        // Internal, private KO utility for updating model properties from within bindings
+        // property:            If the property being updated is (or might be) an observable, pass it here
+        //                      If it turns out to be a writable observable, it will be written to directly
+        // allBindingsAccessor: All bindings in the current execution context.
+        //                      This will be searched for a '_ko_property_writers' property in case you're writing to a non-observable
+        // key:                 The key identifying the property to be written. Example: for { hasFocus: myValue }, write to 'myValue' by specifying the key 'hasFocus'
+        // value:               The value to be written
+        // checkIfDifferent:    If true, and if the property being written is a writable observable, the value will only be written if
+        //                      it is !== existing value on that writable observable
+        writeValueToProperty: function(property, allBindingsAccessor, key, value, checkIfDifferent) {
+            if (!property || !ko.isWriteableObservable(property)) {
+                var propWriters = allBindingsAccessor()['_ko_property_writers'];
+                if (propWriters && propWriters[key])
+                    propWriters[key](value);
+            } else if (!checkIfDifferent || property.peek() !== value) {
+                property(value);
+            }
+        }
+    };
+})();
+
+ko.exportSymbol('expressionRewriting', ko.expressionRewriting);
+ko.exportSymbol('expressionRewriting.bindingRewriteValidators', ko.expressionRewriting.bindingRewriteValidators);
+ko.exportSymbol('expressionRewriting.parseObjectLiteral', ko.expressionRewriting.parseObjectLiteral);
+ko.exportSymbol('expressionRewriting.preProcessBindings', ko.expressionRewriting.preProcessBindings);
+
+// For backward compatibility, define the following aliases. (Previously, these function names were misleading because
+// they referred to JSON specifically, even though they actually work with arbitrary JavaScript object literal expressions.)
+ko.exportSymbol('jsonExpressionRewriting', ko.expressionRewriting);
+ko.exportSymbol('jsonExpressionRewriting.insertPropertyAccessorsIntoJson', ko.expressionRewriting.preProcessBindings);(function() {
+    // "Virtual elements" is an abstraction on top of the usual DOM API which understands the notion that comment nodes
+    // may be used to represent hierarchy (in addition to the DOM's natural hierarchy).
+    // If you call the DOM-manipulating functions on ko.virtualElements, you will be able to read and write the state
+    // of that virtual hierarchy
+    //
+    // The point of all this is to support containerless templates (e.g., <!-- ko foreach:someCollection -->blah<!-- /ko -->)
+    // without having to scatter special cases all over the binding and templating code.
+
+    // IE 9 cannot reliably read the "nodeValue" property of a comment node (see https://github.com/SteveSanderson/knockout/issues/186)
+    // but it does give them a nonstandard alternative property called "text" that it can read reliably. Other browsers don't have that property.
+    // So, use node.text where available, and node.nodeValue elsewhere
+    var commentNodesHaveTextProperty = document.createComment("test").text === "<!--test-->";
+
+    var startCommentRegex = commentNodesHaveTextProperty ? /^<!--\s*ko(?:\s+(.+\s*\:[\s\S]*))?\s*-->$/ : /^\s*ko(?:\s+(.+\s*\:[\s\S]*))?\s*$/;
+    var endCommentRegex =   commentNodesHaveTextProperty ? /^<!--\s*\/ko\s*-->$/ : /^\s*\/ko\s*$/;
+    var htmlTagsWithOptionallyClosingChildren = { 'ul': true, 'ol': true };
+
+    function isStartComment(node) {
+        return (node.nodeType == 8) && (commentNodesHaveTextProperty ? node.text : node.nodeValue).match(startCommentRegex);
+    }
+
+    function isEndComment(node) {
+        return (node.nodeType == 8) && (commentNodesHaveTextProperty ? node.text : node.nodeValue).match(endCommentRegex);
+    }
+
+    function getVirtualChildren(startComment, allowUnbalanced) {
+        var currentNode = startComment;
+        var depth = 1;
+        var children = [];
+        while (currentNode = currentNode.nextSibling) {
+            if (isEndComment(currentNode)) {
+                depth--;
+                if (depth === 0)
+                    return children;
+            }
+
+            children.push(currentNode);
+
+            if (isStartComment(currentNode))
+                depth++;
+        }
+        if (!allowUnbalanced)
+            throw new Error("Cannot find closing comment tag to match: " + startComment.nodeValue);
+        return null;
+    }
+
+    function getMatchingEndComment(startComment, allowUnbalanced) {
+        var allVirtualChildren = getVirtualChildren(startComment, allowUnbalanced);
+        if (allVirtualChildren) {
+            if (allVirtualChildren.length > 0)
+                return allVirtualChildren[allVirtualChildren.length - 1].nextSibling;
+            return startComment.nextSibling;
+        } else
+            return null; // Must have no matching end comment, and allowUnbalanced is true
+    }
+
+    function getUnbalancedChildTags(node) {
+        // e.g., from <div>OK</div><!-- ko blah --><span>Another</span>, returns: <!-- ko blah --><span>Another</span>
+        //       from <div>OK</div><!-- /ko --><!-- /ko -->,             returns: <!-- /ko --><!-- /ko -->
+        var childNode = node.firstChild, captureRemaining = null;
+        if (childNode) {
+            do {
+                if (captureRemaining)                   // We already hit an unbalanced node and are now just scooping up all subsequent nodes
+                    captureRemaining.push(childNode);
+                else if (isStartComment(childNode)) {
+                    var matchingEndComment = getMatchingEndComment(childNode, /* allowUnbalanced: */ true);
+                    if (matchingEndComment)             // It's a balanced tag, so skip immediately to the end of this virtual set
+                        childNode = matchingEndComment;
+                    else
+                        captureRemaining = [childNode]; // It's unbalanced, so start capturing from this point
+                } else if (isEndComment(childNode)) {
+                    captureRemaining = [childNode];     // It's unbalanced (if it wasn't, we'd have skipped over it already), so start capturing
+                }
+            } while (childNode = childNode.nextSibling);
+        }
+        return captureRemaining;
+    }
+
+    ko.virtualElements = {
+        allowedBindings: {},
+
+        childNodes: function(node) {
+            return isStartComment(node) ? getVirtualChildren(node) : node.childNodes;
+        },
+
+        emptyNode: function(node) {
+            if (!isStartComment(node))
+                ko.utils.emptyDomNode(node);
+            else {
+                var virtualChildren = ko.virtualElements.childNodes(node);
+                for (var i = 0, j = virtualChildren.length; i < j; i++)
+                    ko.removeNode(virtualChildren[i]);
+            }
+        },
+
+        setDomNodeChildren: function(node, childNodes) {
+            if (!isStartComment(node))
+                ko.utils.setDomNodeChildren(node, childNodes);
+            else {
+                ko.virtualElements.emptyNode(node);
+                var endCommentNode = node.nextSibling; // Must be the next sibling, as we just emptied the children
+                for (var i = 0, j = childNodes.length; i < j; i++)
+                    endCommentNode.parentNode.insertBefore(childNodes[i], endCommentNode);
+            }
+        },
+
+        prepend: function(containerNode, nodeToPrepend) {
+            if (!isStartComment(containerNode)) {
+                if (containerNode.firstChild)
+                    containerNode.insertBefore(nodeToPrepend, containerNode.firstChild);
+                else
+                    containerNode.appendChild(nodeToPrepend);
+            } else {
+                // Start comments must always have a parent and at least one following sibling (the end comment)
+                containerNode.parentNode.insertBefore(nodeToPrepend, containerNode.nextSibling);
+            }
+        },
+
+        insertAfter: function(containerNode, nodeToInsert, insertAfterNode) {
+            if (!insertAfterNode) {
+                ko.virtualElements.prepend(containerNode, nodeToInsert);
+            } else if (!isStartComment(containerNode)) {
+                // Insert after insertion point
+                if (insertAfterNode.nextSibling)
+                    containerNode.insertBefore(nodeToInsert, insertAfterNode.nextSibling);
+                else
+                    containerNode.appendChild(nodeToInsert);
+            } else {
+                // Children of start comments must always have a parent and at least one following sibling (the end comment)
+                containerNode.parentNode.insertBefore(nodeToInsert, insertAfterNode.nextSibling);
+            }
+        },
+
+        firstChild: function(node) {
+            if (!isStartComment(node))
+                return node.firstChild;
+            if (!node.nextSibling || isEndComment(node.nextSibling))
+                return null;
+            return node.nextSibling;
+        },
+
+        nextSibling: function(node) {
+            if (isStartComment(node))
+                node = getMatchingEndComment(node);
+            if (node.nextSibling && isEndComment(node.nextSibling))
+                return null;
+            return node.nextSibling;
+        },
+
+        virtualNodeBindingValue: function(node) {
+            var regexMatch = isStartComment(node);
+            return regexMatch ? regexMatch[1] : null;
+        },
+
+        normaliseVirtualElementDomStructure: function(elementVerified) {
+            // Workaround for https://github.com/SteveSanderson/knockout/issues/155
+            // (IE <= 8 or IE 9 quirks mode parses your HTML weirdly, treating closing </li> tags as if they don't exist, thereby moving comment nodes
+            // that are direct descendants of <ul> into the preceding <li>)
+            if (!htmlTagsWithOptionallyClosingChildren[ko.utils.tagNameLower(elementVerified)])
+                return;
+
+            // Scan immediate children to see if they contain unbalanced comment tags. If they do, those comment tags
+            // must be intended to appear *after* that child, so move them there.
+            var childNode = elementVerified.firstChild;
+            if (childNode) {
+                do {
+                    if (childNode.nodeType === 1) {
+                        var unbalancedTags = getUnbalancedChildTags(childNode);
+                        if (unbalancedTags) {
+                            // Fix up the DOM by moving the unbalanced tags to where they most likely were intended to be placed - *after* the child
+                            var nodeToInsertBefore = childNode.nextSibling;
+                            for (var i = 0; i < unbalancedTags.length; i++) {
+                                if (nodeToInsertBefore)
+                                    elementVerified.insertBefore(unbalancedTags[i], nodeToInsertBefore);
+                                else
+                                    elementVerified.appendChild(unbalancedTags[i]);
+                            }
+                        }
+                    }
+                } while (childNode = childNode.nextSibling);
+            }
+        }
+    };
+})();
+ko.exportSymbol('virtualElements', ko.virtualElements);
+ko.exportSymbol('virtualElements.allowedBindings', ko.virtualElements.allowedBindings);
+ko.exportSymbol('virtualElements.emptyNode', ko.virtualElements.emptyNode);
+//ko.exportSymbol('virtualElements.firstChild', ko.virtualElements.firstChild);     // firstChild is not minified
+ko.exportSymbol('virtualElements.insertAfter', ko.virtualElements.insertAfter);
+//ko.exportSymbol('virtualElements.nextSibling', ko.virtualElements.nextSibling);   // nextSibling is not minified
+ko.exportSymbol('virtualElements.prepend', ko.virtualElements.prepend);
+ko.exportSymbol('virtualElements.setDomNodeChildren', ko.virtualElements.setDomNodeChildren);
+(function() {
+    var defaultBindingAttributeName = "data-bind";
+
+    ko.bindingProvider = function() {
+        this.bindingCache = {};
+    };
+
+    ko.utils.extend(ko.bindingProvider.prototype, {
+        'nodeHasBindings': function(node) {
+            switch (node.nodeType) {
+                case 1: return node.getAttribute(defaultBindingAttributeName) != null;   // Element
+                case 8: return ko.virtualElements.virtualNodeBindingValue(node) != null; // Comment node
+                default: return false;
+            }
+        },
+
+        'getBindings': function(node, bindingContext) {
+            var bindingsString = this['getBindingsString'](node, bindingContext);
+            return bindingsString ? this['parseBindingsString'](bindingsString, bindingContext, node) : null;
+        },
+
+        // The following function is only used internally by this default provider.
+        // It's not part of the interface definition for a general binding provider.
+        'getBindingsString': function(node, bindingContext) {
+            switch (node.nodeType) {
+                case 1: return node.getAttribute(defaultBindingAttributeName);   // Element
+                case 8: return ko.virtualElements.virtualNodeBindingValue(node); // Comment node
+                default: return null;
+            }
+        },
+
+        // The following function is only used internally by this default provider.
+        // It's not part of the interface definition for a general binding provider.
+        'parseBindingsString': function(bindingsString, bindingContext, node) {
+            try {
+                var bindingFunction = createBindingsStringEvaluatorViaCache(bindingsString, this.bindingCache);
+                return bindingFunction(bindingContext, node);
+            } catch (ex) {
+                throw new Error("Unable to parse bindings.\nMessage: " + ex + ";\nBindings value: " + bindingsString);
+            }
+        }
+    });
+
+    ko.bindingProvider['instance'] = new ko.bindingProvider();
+
+    function createBindingsStringEvaluatorViaCache(bindingsString, cache) {
+        var cacheKey = bindingsString;
+        return cache[cacheKey]
+            || (cache[cacheKey] = createBindingsStringEvaluator(bindingsString));
+    }
+
+    function createBindingsStringEvaluator(bindingsString) {
+        // Build the source for a function that evaluates "expression"
+        // For each scope variable, add an extra level of "with" nesting
+        // Example result: with(sc1) { with(sc0) { return (expression) } }
+        var rewrittenBindings = ko.expressionRewriting.preProcessBindings(bindingsString),
+            functionBody = "with($context){with($data||{}){return{" + rewrittenBindings + "}}}";
+        return new Function("$context", "$element", functionBody);
+    }
+})();
+
+ko.exportSymbol('bindingProvider', ko.bindingProvider);
+(function () {
+    ko.bindingHandlers = {};
+
+    ko.bindingContext = function(dataItem, parentBindingContext, dataItemAlias) {
+        if (parentBindingContext) {
+            ko.utils.extend(this, parentBindingContext); // Inherit $root and any custom properties
+            this['$parentContext'] = parentBindingContext;
+            this['$parent'] = parentBindingContext['$data'];
+            this['$parents'] = (parentBindingContext['$parents'] || []).slice(0);
+            this['$parents'].unshift(this['$parent']);
+        } else {
+            this['$parents'] = [];
+            this['$root'] = dataItem;
+            // Export 'ko' in the binding context so it will be available in bindings and templates
+            // even if 'ko' isn't exported as a global, such as when using an AMD loader.
+            // See https://github.com/SteveSanderson/knockout/issues/490
+            this['ko'] = ko;
+        }
+        this['$data'] = dataItem;
+        if (dataItemAlias)
+            this[dataItemAlias] = dataItem;
+    }
+    ko.bindingContext.prototype['createChildContext'] = function (dataItem, dataItemAlias) {
+        return new ko.bindingContext(dataItem, this, dataItemAlias);
+    };
+    ko.bindingContext.prototype['extend'] = function(properties) {
+        var clone = ko.utils.extend(new ko.bindingContext(), this);
+        return ko.utils.extend(clone, properties);
+    };
+
+    function validateThatBindingIsAllowedForVirtualElements(bindingName) {
+        var validator = ko.virtualElements.allowedBindings[bindingName];
+        if (!validator)
+            throw new Error("The binding '" + bindingName + "' cannot be used with virtual elements")
+    }
+
+    function applyBindingsToDescendantsInternal (viewModel, elementOrVirtualElement, bindingContextsMayDifferFromDomParentElement) {
+        var currentChild, nextInQueue = ko.virtualElements.firstChild(elementOrVirtualElement);
+        while (currentChild = nextInQueue) {
+            // Keep a record of the next child *before* applying bindings, in case the binding removes the current child from its position
+            nextInQueue = ko.virtualElements.nextSibling(currentChild);
+            applyBindingsToNodeAndDescendantsInternal(viewModel, currentChild, bindingContextsMayDifferFromDomParentElement);
+        }
+    }
+
+    function applyBindingsToNodeAndDescendantsInternal (viewModel, nodeVerified, bindingContextMayDifferFromDomParentElement) {
+        var shouldBindDescendants = true;
+
+        // Perf optimisation: Apply bindings only if...
+        // (1) We need to store the binding context on this node (because it may differ from the DOM parent node's binding context)
+        //     Note that we can't store binding contexts on non-elements (e.g., text nodes), as IE doesn't allow expando properties for those
+        // (2) It might have bindings (e.g., it has a data-bind attribute, or it's a marker for a containerless template)
+        var isElement = (nodeVerified.nodeType === 1);
+        if (isElement) // Workaround IE <= 8 HTML parsing weirdness
+            ko.virtualElements.normaliseVirtualElementDomStructure(nodeVerified);
+
+        var shouldApplyBindings = (isElement && bindingContextMayDifferFromDomParentElement)             // Case (1)
+                               || ko.bindingProvider['instance']['nodeHasBindings'](nodeVerified);       // Case (2)
+        if (shouldApplyBindings)
+            shouldBindDescendants = applyBindingsToNodeInternal(nodeVerified, null, viewModel, bindingContextMayDifferFromDomParentElement).shouldBindDescendants;
+
+        if (shouldBindDescendants) {
+            // We're recursing automatically into (real or virtual) child nodes without changing binding contexts. So,
+            //  * For children of a *real* element, the binding context is certainly the same as on their DOM .parentNode,
+            //    hence bindingContextsMayDifferFromDomParentElement is false
+            //  * For children of a *virtual* element, we can't be sure. Evaluating .parentNode on those children may
+            //    skip over any number of intermediate virtual elements, any of which might define a custom binding context,
+            //    hence bindingContextsMayDifferFromDomParentElement is true
+            applyBindingsToDescendantsInternal(viewModel, nodeVerified, /* bindingContextsMayDifferFromDomParentElement: */ !isElement);
+        }
+    }
+
+    function applyBindingsToNodeInternal (node, bindings, viewModelOrBindingContext, bindingContextMayDifferFromDomParentElement) {
+        // Need to be sure that inits are only run once, and updates never run until all the inits have been run
+        var initPhase = 0; // 0 = before all inits, 1 = during inits, 2 = after all inits
+
+        // Each time the dependentObservable is evaluated (after data changes),
+        // the binding attribute is reparsed so that it can pick out the correct
+        // model properties in the context of the changed data.
+        // DOM event callbacks need to be able to access this changed data,
+        // so we need a single parsedBindings variable (shared by all callbacks
+        // associated with this node's bindings) that all the closures can access.
+        var parsedBindings;
+        function makeValueAccessor(bindingKey) {
+            return function () { return parsedBindings[bindingKey] }
+        }
+        function parsedBindingsAccessor() {
+            return parsedBindings;
+        }
+
+        var bindingHandlerThatControlsDescendantBindings;
+        ko.dependentObservable(
+            function () {
+                // Ensure we have a nonnull binding context to work with
+                var bindingContextInstance = viewModelOrBindingContext && (viewModelOrBindingContext instanceof ko.bindingContext)
+                    ? viewModelOrBindingContext
+                    : new ko.bindingContext(ko.utils.unwrapObservable(viewModelOrBindingContext));
+                var viewModel = bindingContextInstance['$data'];
+
+                // Optimization: Don't store the binding context on this node if it's definitely the same as on node.parentNode, because
+                // we can easily recover it just by scanning up the node's ancestors in the DOM
+                // (note: here, parent node means "real DOM parent" not "virtual parent", as there's no O(1) way to find the virtual parent)
+                if (bindingContextMayDifferFromDomParentElement)
+                    ko.storedBindingContextForNode(node, bindingContextInstance);
+
+                // Use evaluatedBindings if given, otherwise fall back on asking the bindings provider to give us some bindings
+                var evaluatedBindings = (typeof bindings == "function") ? bindings(bindingContextInstance, node) : bindings;
+                parsedBindings = evaluatedBindings || ko.bindingProvider['instance']['getBindings'](node, bindingContextInstance);
+
+                if (parsedBindings) {
+                    // First run all the inits, so bindings can register for notification on changes
+                    if (initPhase === 0) {
+                        initPhase = 1;
+                        for (var bindingKey in parsedBindings) {
+                            var binding = ko.bindingHandlers[bindingKey];
+                            if (binding && node.nodeType === 8)
+                                validateThatBindingIsAllowedForVirtualElements(bindingKey);
+
+                            if (binding && typeof binding["init"] == "function") {
+                                var handlerInitFn = binding["init"];
+                                var initResult = handlerInitFn(node, makeValueAccessor(bindingKey), parsedBindingsAccessor, viewModel, bindingContextInstance);
+
+                                // If this binding handler claims to control descendant bindings, make a note of this
+                                if (initResult && initResult['controlsDescendantBindings']) {
+                                    if (bindingHandlerThatControlsDescendantBindings !== undefined)
+                                        throw new Error("Multiple bindings (" + bindingHandlerThatControlsDescendantBindings + " and " + bindingKey + ") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.");
+                                    bindingHandlerThatControlsDescendantBindings = bindingKey;
+                                }
+                            }
+                        }
+                        initPhase = 2;
+                    }
+
+                    // ... then run all the updates, which might trigger changes even on the first evaluation
+                    if (initPhase === 2) {
+                        for (var bindingKey in parsedBindings) {
+                            var binding = ko.bindingHandlers[bindingKey];
+                            if (binding && typeof binding["update"] == "function") {
+                                var handlerUpdateFn = binding["update"];
+                                handlerUpdateFn(node, makeValueAccessor(bindingKey), parsedBindingsAccessor, viewModel, bindingContextInstance);
+                            }
+                        }
+                    }
+                }
+            },
+            null,
+            { disposeWhenNodeIsRemoved : node }
+        );
+
+        return {
+            shouldBindDescendants: bindingHandlerThatControlsDescendantBindings === undefined
+        };
+    };
+
+    var storedBindingContextDomDataKey = "__ko_bindingContext__";
+    ko.storedBindingContextForNode = function (node, bindingContext) {
+        if (arguments.length == 2)
+            ko.utils.domData.set(node, storedBindingContextDomDataKey, bindingContext);
+        else
+            return ko.utils.domData.get(node, storedBindingContextDomDataKey);
+    }
+
+    ko.applyBindingsToNode = function (node, bindings, viewModel) {
+        if (node.nodeType === 1) // If it's an element, workaround IE <= 8 HTML parsing weirdness
+            ko.virtualElements.normaliseVirtualElementDomStructure(node);
+        return applyBindingsToNodeInternal(node, bindings, viewModel, true);
+    };
+
+    ko.applyBindingsToDescendants = function(viewModel, rootNode) {
+        if (rootNode.nodeType === 1 || rootNode.nodeType === 8)
+            applyBindingsToDescendantsInternal(viewModel, rootNode, true);
+    };
+
+    ko.applyBindings = function (viewModel, rootNode) {
+        if (rootNode && (rootNode.nodeType !== 1) && (rootNode.nodeType !== 8))
+            throw new Error("ko.applyBindings: first parameter should be your view model; second parameter should be a DOM node");
+        rootNode = rootNode || window.document.body; // Make "rootNode" parameter optional
+
+        applyBindingsToNodeAndDescendantsInternal(viewModel, rootNode, true);
+    };
+
+    // Retrieving binding context from arbitrary nodes
+    ko.contextFor = function(node) {
+        // We can only do something meaningful for elements and comment nodes (in particular, not text nodes, as IE can't store domdata for them)
+        switch (node.nodeType) {
+            case 1:
+            case 8:
+                var context = ko.storedBindingContextForNode(node);
+                if (context) return context;
+                if (node.parentNode) return ko.contextFor(node.parentNode);
+                break;
+        }
+        return undefined;
+    };
+    ko.dataFor = function(node) {
+        var context = ko.contextFor(node);
+        return context ? context['$data'] : undefined;
+    };
+
+    ko.exportSymbol('bindingHandlers', ko.bindingHandlers);
+    ko.exportSymbol('applyBindings', ko.applyBindings);
+    ko.exportSymbol('applyBindingsToDescendants', ko.applyBindingsToDescendants);
+    ko.exportSymbol('applyBindingsToNode', ko.applyBindingsToNode);
+    ko.exportSymbol('contextFor', ko.contextFor);
+    ko.exportSymbol('dataFor', ko.dataFor);
+})();
+var attrHtmlToJavascriptMap = { 'class': 'className', 'for': 'htmlFor' };
+ko.bindingHandlers['attr'] = {
+    'update': function(element, valueAccessor, allBindingsAccessor) {
+        var value = ko.utils.unwrapObservable(valueAccessor()) || {};
+        for (var attrName in value) {
+            if (typeof attrName == "string") {
+                var attrValue = ko.utils.unwrapObservable(value[attrName]);
+
+                // To cover cases like "attr: { checked:someProp }", we want to remove the attribute entirely
+                // when someProp is a "no value"-like value (strictly null, false, or undefined)
+                // (because the absence of the "checked" attr is how to mark an element as not checked, etc.)
+                var toRemove = (attrValue === false) || (attrValue === null) || (attrValue === undefined);
+                if (toRemove)
+                    element.removeAttribute(attrName);
+
+                // In IE <= 7 and IE8 Quirks Mode, you have to use the Javascript property name instead of the
+                // HTML attribute name for certain attributes. IE8 Standards Mode supports the correct behavior,
+                // but instead of figuring out the mode, we'll just set the attribute through the Javascript
+                // property for IE <= 8.
+                if (ko.utils.ieVersion <= 8 && attrName in attrHtmlToJavascriptMap) {
+                    attrName = attrHtmlToJavascriptMap[attrName];
+                    if (toRemove)
+                        element.removeAttribute(attrName);
+                    else
+                        element[attrName] = attrValue;
+                } else if (!toRemove) {
+                    try {
+                        element.setAttribute(attrName, attrValue.toString());
+                    } catch (err) {
+                        // ignore for now
+                        if (console) {
+                            console.log("Can't set attribute " + attrName + " to " + attrValue + " error: " + err);
+                        }
+                    }
+                }
+
+                // Treat "name" specially - although you can think of it as an attribute, it also needs
+                // special handling on older versions of IE (https://github.com/SteveSanderson/knockout/pull/333)
+                // Deliberately being case-sensitive here because XHTML would regard "Name" as a different thing
+                // entirely, and there's no strong reason to allow for such casing in HTML.
+                if (attrName === "name") {
+                    ko.utils.setElementName(element, toRemove ? "" : attrValue.toString());
+                }
+            }
+        }
+    }
+};
+ko.bindingHandlers['checked'] = {
+    'init': function (element, valueAccessor, allBindingsAccessor) {
+        var updateHandler = function() {
+            var valueToWrite;
+            if (element.type == "checkbox") {
+                valueToWrite = element.checked;
+            } else if ((element.type == "radio") && (element.checked)) {
+                valueToWrite = element.value;
+            } else {
+                return; // "checked" binding only responds to checkboxes and selected radio buttons
+            }
+
+            var modelValue = valueAccessor(), unwrappedValue = ko.utils.unwrapObservable(modelValue);
+            if ((element.type == "checkbox") && (unwrappedValue instanceof Array)) {
+                // For checkboxes bound to an array, we add/remove the checkbox value to that array
+                // This works for both observable and non-observable arrays
+                var existingEntryIndex = ko.utils.arrayIndexOf(unwrappedValue, element.value);
+                if (element.checked && (existingEntryIndex < 0))
+                    modelValue.push(element.value);
+                else if ((!element.checked) && (existingEntryIndex >= 0))
+                    modelValue.splice(existingEntryIndex, 1);
+            } else {
+                ko.expressionRewriting.writeValueToProperty(modelValue, allBindingsAccessor, 'checked', valueToWrite, true);
+            }
+        };
+        ko.utils.registerEventHandler(element, "click", updateHandler);
+
+        // IE 6 won't allow radio buttons to be selected unless they have a name
+        if ((element.type == "radio") && !element.name)
+            ko.bindingHandlers['uniqueName']['init'](element, function() { return true });
+    },
+    'update': function (element, valueAccessor) {
+        var value = ko.utils.unwrapObservable(valueAccessor());
+
+        if (element.type == "checkbox") {
+            if (value instanceof Array) {
+                // When bound to an array, the checkbox being checked represents its value being present in that array
+                element.checked = ko.utils.arrayIndexOf(value, element.value) >= 0;
+            } else {
+                // When bound to anything other value (not an array), the checkbox being checked represents the value being trueish
+                element.checked = value;
+            }
+        } else if (element.type == "radio") {
+            element.checked = (element.value == value);
+        }
+    }
+};
+var classesWrittenByBindingKey = '__ko__cssValue';
+ko.bindingHandlers['css'] = {
+    'update': function (element, valueAccessor) {
+        var value = ko.utils.unwrapObservable(valueAccessor());
+        if (typeof value == "object") {
+            for (var className in value) {
+                var shouldHaveClass = ko.utils.unwrapObservable(value[className]);
+                ko.utils.toggleDomNodeCssClass(element, className, shouldHaveClass);
+            }
+        } else {
+            value = String(value || ''); // Make sure we don't try to store or set a non-string value
+            ko.utils.toggleDomNodeCssClass(element, element[classesWrittenByBindingKey], false);
+            element[classesWrittenByBindingKey] = value;
+            ko.utils.toggleDomNodeCssClass(element, value, true);
+        }
+    }
+};
+ko.bindingHandlers['enable'] = {
+    'update': function (element, valueAccessor) {
+        var value = ko.utils.unwrapObservable(valueAccessor());
+        if (value && element.disabled)
+            element.removeAttribute("disabled");
+        else if ((!value) && (!element.disabled))
+            element.disabled = true;
+    }
+};
+
+ko.bindingHandlers['disable'] = {
+    'update': function (element, valueAccessor) {
+        ko.bindingHandlers['enable']['update'](element, function() { return !ko.utils.unwrapObservable(valueAccessor()) });
+    }
+};
+// For certain common events (currently just 'click'), allow a simplified data-binding syntax
+// e.g. click:handler instead of the usual full-length event:{click:handler}
+function makeEventHandlerShortcut(eventName) {
+    ko.bindingHandlers[eventName] = {
+        'init': function(element, valueAccessor, allBindingsAccessor, viewModel) {
+            var newValueAccessor = function () {
+                var result = {};
+                result[eventName] = valueAccessor();
+                return result;
+            };
+            return ko.bindingHandlers['event']['init'].call(this, element, newValueAccessor, allBindingsAccessor, viewModel);
+        }
+    }
+}
+
+ko.bindingHandlers['event'] = {
+    'init' : function (element, valueAccessor, allBindingsAccessor, viewModel) {
+        var eventsToHandle = valueAccessor() || {};
+        for(var eventNameOutsideClosure in eventsToHandle) {
+            (function() {
+                var eventName = eventNameOutsideClosure; // Separate variable to be captured by event handler closure
+                if (typeof eventName == "string") {
+                    ko.utils.registerEventHandler(element, eventName, function (event) {
+                        var handlerReturnValue;
+                        var handlerFunction = valueAccessor()[eventName];
+                        if (!handlerFunction)
+                            return;
+                        var allBindings = allBindingsAccessor();
+
+                        try {
+                            // Take all the event args, and prefix with the viewmodel
+                            var argsForHandler = ko.utils.makeArray(arguments);
+                            argsForHandler.unshift(viewModel);
+                            handlerReturnValue = handlerFunction.apply(viewModel, argsForHandler);
+                        } finally {
+                            if (handlerReturnValue !== true) { // Normally we want to prevent default action. Developer can override this be explicitly returning true.
+                                if (event.preventDefault)
+                                    event.preventDefault();
+                                else
+                                    event.returnValue = false;
+                            }
+                        }
+
+                        var bubble = allBindings[eventName + 'Bubble'] !== false;
+                        if (!bubble) {
+                            event.cancelBubble = true;
+                            if (event.stopPropagation)
+                                event.stopPropagation();
+                        }
+                    });
+                }
+            })();
+        }
+    }
+};
+// "foreach: someExpression" is equivalent to "template: { foreach: someExpression }"
+// "foreach: { data: someExpression, afterAdd: myfn }" is equivalent to "template: { foreach: someExpression, afterAdd: myfn }"
+ko.bindingHandlers['foreach'] = {
+    makeTemplateValueAccessor: function(valueAccessor) {
+        return function() {
+            var modelValue = valueAccessor(),
+                unwrappedValue = ko.utils.peekObservable(modelValue);    // Unwrap without setting a dependency here
+
+            // If unwrappedValue is the array, pass in the wrapped value on its own
+            // The value will be unwrapped and tracked within the template binding
+            // (See https://github.com/SteveSanderson/knockout/issues/523)
+            if ((!unwrappedValue) || typeof unwrappedValue.length == "number")
+                return { 'foreach': modelValue, 'templateEngine': ko.nativeTemplateEngine.instance };
+
+            // If unwrappedValue.data is the array, preserve all relevant options and unwrap again value so we get updates
+            ko.utils.unwrapObservable(modelValue);
+            return {
+                'foreach': unwrappedValue['data'],
+                'as': unwrappedValue['as'],
+                'includeDestroyed': unwrappedValue['includeDestroyed'],
+                'afterAdd': unwrappedValue['afterAdd'],
+                'beforeRemove': unwrappedValue['beforeRemove'],
+                'afterRender': unwrappedValue['afterRender'],
+                'beforeMove': unwrappedValue['beforeMove'],
+                'afterMove': unwrappedValue['afterMove'],
+                'templateEngine': ko.nativeTemplateEngine.instance
+            };
+        };
+    },
+    'init': function(element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
+        return ko.bindingHandlers['template']['init'](element, ko.bindingHandlers['foreach'].makeTemplateValueAccessor(valueAccessor));
+    },
+    'update': function(element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
+        return ko.bindingHandlers['template']['update'](element, ko.bindingHandlers['foreach'].makeTemplateValueAccessor(valueAccessor), allBindingsAccessor, viewModel, bindingContext);
+    }
+};
+ko.expressionRewriting.bindingRewriteValidators['foreach'] = false; // Can't rewrite control flow bindings
+ko.virtualElements.allowedBindings['foreach'] = true;
+var hasfocusUpdatingProperty = '__ko_hasfocusUpdating';
+ko.bindingHandlers['hasfocus'] = {
+    'init': function(element, valueAccessor, allBindingsAccessor) {
+        var handleElementFocusChange = function(isFocused) {
+            // Where possible, ignore which event was raised and determine focus state using activeElement,
+            // as this avoids phantom focus/blur events raised when changing tabs in modern browsers.
+            // However, not all KO-targeted browsers (Firefox 2) support activeElement. For those browsers,
+            // prevent a loss of focus when changing tabs/windows by setting a flag that prevents hasfocus
+            // from calling 'blur()' on the element when it loses focus.
+            // Discussion at https://github.com/SteveSanderson/knockout/pull/352
+            element[hasfocusUpdatingProperty] = true;
+            var ownerDoc = element.ownerDocument;
+            if ("activeElement" in ownerDoc) {
+                isFocused = (ownerDoc.activeElement === element);
+            }
+            var modelValue = valueAccessor();
+            ko.expressionRewriting.writeValueToProperty(modelValue, allBindingsAccessor, 'hasfocus', isFocused, true);
+            element[hasfocusUpdatingProperty] = false;
+        };
+        var handleElementFocusIn = handleElementFocusChange.bind(null, true);
+        var handleElementFocusOut = handleElementFocusChange.bind(null, false);
+
+        ko.utils.registerEventHandler(element, "focus", handleElementFocusIn);
+        ko.utils.registerEventHandler(element, "focusin", handleElementFocusIn); // For IE
+        ko.utils.registerEventHandler(element, "blur",  handleElementFocusOut);
+        ko.utils.registerEventHandler(element, "focusout",  handleElementFocusOut); // For IE
+    },
+    'update': function(element, valueAccessor) {
+        var value = ko.utils.unwrapObservable(valueAccessor());
+        if (!element[hasfocusUpdatingProperty]) {
+            value ? element.focus() : element.blur();
+            ko.dependencyDetection.ignore(ko.utils.triggerEvent, null, [element, value ? "focusin" : "focusout"]); // For IE, which doesn't reliably fire "focus" or "blur" events synchronously
+        }
+    }
+};
+ko.bindingHandlers['html'] = {
+    'init': function() {
+        // Prevent binding on the dynamically-injected HTML (as developers are unlikely to expect that, and it has security implications)
+        return { 'controlsDescendantBindings': true };
+    },
+    'update': function (element, valueAccessor) {
+        // setHtml will unwrap the value if needed
+        ko.utils.setHtml(element, valueAccessor());
+    }
+};
+var withIfDomDataKey = '__ko_withIfBindingData';
+// Makes a binding like with or if
+function makeWithIfBinding(bindingKey, isWith, isNot, makeContextCallback) {
+    ko.bindingHandlers[bindingKey] = {
+        'init': function(element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
+            ko.utils.domData.set(element, withIfDomDataKey, {});
+            return { 'controlsDescendantBindings': true };
+        },
+        'update': function(element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
+            var withIfData = ko.utils.domData.get(element, withIfDomDataKey),
+                dataValue = ko.utils.unwrapObservable(valueAccessor()),
+                shouldDisplay = !isNot !== !dataValue, // equivalent to isNot ? !dataValue : !!dataValue
+                isFirstRender = !withIfData.savedNodes,
+                needsRefresh = isFirstRender || isWith || (shouldDisplay !== withIfData.didDisplayOnLastUpdate);
+
+            if (needsRefresh) {
+                if (isFirstRender) {
+                    withIfData.savedNodes = ko.utils.cloneNodes(ko.virtualElements.childNodes(element), true /* shouldCleanNodes */);
+                }
+
+                if (shouldDisplay) {
+                    if (!isFirstRender) {
+                        ko.virtualElements.setDomNodeChildren(element, ko.utils.cloneNodes(withIfData.savedNodes));
+                    }
+                    ko.applyBindingsToDescendants(makeContextCallback ? makeContextCallback(bindingContext, dataValue) : bindingContext, element);
+                } else {
+                    ko.virtualElements.emptyNode(element);
+                }
+
+                withIfData.didDisplayOnLastUpdate = shouldDisplay;
+            }
+        }
+    };
+    ko.expressionRewriting.bindingRewriteValidators[bindingKey] = false; // Can't rewrite control flow bindings
+    ko.virtualElements.allowedBindings[bindingKey] = true;
+}
+
+// Construct the actual binding handlers
+makeWithIfBinding('if');
+makeWithIfBinding('ifnot', false /* isWith */, true /* isNot */);
+makeWithIfBinding('with', true /* isWith */, false /* isNot */,
+    function(bindingContext, dataValue) {
+        return bindingContext['createChildContext'](dataValue);
+    }
+);
+function ensureDropdownSelectionIsConsistentWithModelValue(element, modelValue, preferModelValue) {
+    if (preferModelValue) {
+        if (modelValue !== ko.selectExtensions.readValue(element))
+            ko.selectExtensions.writeValue(element, modelValue);
+    }
+
+    // No matter which direction we're syncing in, we want the end result to be equality between dropdown value and model value.
+    // If they aren't equal, either we prefer the dropdown value, or the model value couldn't be represented, so either way,
+    // change the model value to match the dropdown.
+    if (modelValue !== ko.selectExtensions.readValue(element))
+        ko.dependencyDetection.ignore(ko.utils.triggerEvent, null, [element, "change"]);
+};
+
+ko.bindingHandlers['options'] = {
+    'update': function (element, valueAccessor, allBindingsAccessor) {
+        if (ko.utils.tagNameLower(element) !== "select")
+            throw new Error("options binding applies only to SELECT elements");
+
+        var selectWasPreviouslyEmpty = element.length == 0;
+        var previousSelectedValues = ko.utils.arrayMap(ko.utils.arrayFilter(element.childNodes, function (node) {
+            return node.tagName && (ko.utils.tagNameLower(node) === "option") && node.selected;
+        }), function (node) {
+            return ko.selectExtensions.readValue(node) || node.innerText || node.textContent;
+        });
+        var previousScrollTop = element.scrollTop;
+
+        var value = ko.utils.unwrapObservable(valueAccessor());
+        var selectedValue = element.value;
+
+        // Remove all existing <option>s.
+        // Need to use .remove() rather than .removeChild() for <option>s otherwise IE behaves oddly (https://github.com/SteveSanderson/knockout/issues/134)
+        while (element.length > 0) {
+            ko.cleanNode(element.options[0]);
+            element.remove(0);
+        }
+
+        if (value) {
+            var allBindings = allBindingsAccessor(),
+                includeDestroyed = allBindings['optionsIncludeDestroyed'];
+
+            if (typeof value.length != "number")
+                value = [value];
+            if (allBindings['optionsCaption']) {
+                var option = document.createElement("option");
+                ko.utils.setHtml(option, allBindings['optionsCaption']);
+                ko.selectExtensions.writeValue(option, undefined);
+                element.appendChild(option);
+            }
+
+            for (var i = 0, j = value.length; i < j; i++) {
+                // Skip destroyed items
+                var arrayEntry = value[i];
+                if (arrayEntry && arrayEntry['_destroy'] && !includeDestroyed)
+                    continue;
+
+                var option = document.createElement("option");
+
+                function applyToObject(object, predicate, defaultValue) {
+                    var predicateType = typeof predicate;
+                    if (predicateType == "function")    // Given a function; run it against the data value
+                        return predicate(object);
+                    else if (predicateType == "string") // Given a string; treat it as a property name on the data value
+                        return object[predicate];
+                    else                                // Given no optionsText arg; use the data value itself
+                        return defaultValue;
+                }
+
+                // Apply a value to the option element
+                var optionValue = applyToObject(arrayEntry, allBindings['optionsValue'], arrayEntry);
+                ko.selectExtensions.writeValue(option, ko.utils.unwrapObservable(optionValue));
+
+                // Apply some text to the option element
+                var optionText = applyToObject(arrayEntry, allBindings['optionsText'], optionValue);
+                ko.utils.setTextContent(option, optionText);
+
+                element.appendChild(option);
+            }
+
+            // IE6 doesn't like us to assign selection to OPTION nodes before they're added to the document.
+            // That's why we first added them without selection. Now it's time to set the selection.
+            var newOptions = element.getElementsByTagName("option");
+            var countSelectionsRetained = 0;
+            for (var i = 0, j = newOptions.length; i < j; i++) {
+                if (ko.utils.arrayIndexOf(previousSelectedValues, ko.selectExtensions.readValue(newOptions[i])) >= 0) {
+                    ko.utils.setOptionNodeSelectionState(newOptions[i], true);
+                    countSelectionsRetained++;
+                }
+            }
+
+            element.scrollTop = previousScrollTop;
+
+            if (selectWasPreviouslyEmpty && ('value' in allBindings)) {
+                // Ensure consistency between model value and selected option.
+                // If the dropdown is being populated for the first time here (or was otherwise previously empty),
+                // the dropdown selection state is meaningless, so we preserve the model value.
+                ensureDropdownSelectionIsConsistentWithModelValue(element, ko.utils.peekObservable(allBindings['value']), /* preferModelValue */ true);
+            }
+
+            // Workaround for IE9 bug
+            ko.utils.ensureSelectElementIsRenderedCorrectly(element);
+        }
+    }
+};
+ko.bindingHandlers['options'].optionValueDomDataKey = '__ko.optionValueDomData__';
+ko.bindingHandlers['selectedOptions'] = {
+    'init': function (element, valueAccessor, allBindingsAccessor) {
+        ko.utils.registerEventHandler(element, "change", function () {
+            var value = valueAccessor(), valueToWrite = [];
+            ko.utils.arrayForEach(element.getElementsByTagName("option"), function(node) {
+                if (node.selected)
+                    valueToWrite.push(ko.selectExtensions.readValue(node));
+            });
+            ko.expressionRewriting.writeValueToProperty(value, allBindingsAccessor, 'value', valueToWrite);
+        });
+    },
+    'update': function (element, valueAccessor) {
+        if (ko.utils.tagNameLower(element) != "select")
+            throw new Error("values binding applies only to SELECT elements");
+
+        var newValue = ko.utils.unwrapObservable(valueAccessor());
+        if (newValue && typeof newValue.length == "number") {
+            ko.utils.arrayForEach(element.getElementsByTagName("option"), function(node) {
+                var isSelected = ko.utils.arrayIndexOf(newValue, ko.selectExtensions.readValue(node)) >= 0;
+                ko.utils.setOptionNodeSelectionState(node, isSelected);
+            });
+        }
+    }
+};
+ko.bindingHandlers['style'] = {
+    'update': function (element, valueAccessor) {
+        var value = ko.utils.unwrapObservable(valueAccessor() || {});
+        for (var styleName in value) {
+            if (typeof styleName == "string") {
+                var styleValue = ko.utils.unwrapObservable(value[styleName]);
+                element.style[styleName] = styleValue || ""; // Empty string removes the value, whereas null/undefined have no effect
+            }
+        }
+    }
+};
+ko.bindingHandlers['submit'] = {
+    'init': function (element, valueAccessor, allBindingsAccessor, viewModel) {
+        if (typeof valueAccessor() != "function")
+            throw new Error("The value for a submit binding must be a function");
+        ko.utils.registerEventHandler(element, "submit", function (event) {
+            var handlerReturnValue;
+            var value = valueAccessor();
+            try { handlerReturnValue = value.call(viewModel, element); }
+            finally {
+                if (handlerReturnValue !== true) { // Normally we want to prevent default action. Developer can override this be explicitly returning true.
+                    if (event.preventDefault)
+                        event.preventDefault();
+                    else
+                        event.returnValue = false;
+                }
+            }
+        });
+    }
+};
+ko.bindingHandlers['text'] = {
+    'update': function (element, valueAccessor) {
+        ko.utils.setTextContent(element, valueAccessor());
+    }
+};
+ko.virtualElements.allowedBindings['text'] = true;
+ko.bindingHandlers['uniqueName'] = {
+    'init': function (element, valueAccessor) {
+        if (valueAccessor()) {
+            var name = "ko_unique_" + (++ko.bindingHandlers['uniqueName'].currentIndex);
+            ko.utils.setElementName(element, name);
+        }
+    }
+};
+ko.bindingHandlers['uniqueName'].currentIndex = 0;
+ko.bindingHandlers['value'] = {
+    'init': function (element, valueAccessor, allBindingsAccessor) {
+        // Always catch "change" event; possibly other events too if asked
+        var eventsToCatch = ["change"];
+        var requestedEventsToCatch = allBindingsAccessor()["valueUpdate"];
+        var propertyChangedFired = false;
+        if (requestedEventsToCatch) {
+            if (typeof requestedEventsToCatch == "string") // Allow both individual event names, and arrays of event names
+                requestedEventsToCatch = [requestedEventsToCatch];
+            ko.utils.arrayPushAll(eventsToCatch, requestedEventsToCatch);
+            eventsToCatch = ko.utils.arrayGetDistinctValues(eventsToCatch);
+        }
+
+        var valueUpdateHandler = function() {
+            propertyChangedFired = false;
+            var modelValue = valueAccessor();
+            var elementValue = ko.selectExtensions.readValue(element);
+            ko.expressionRewriting.writeValueToProperty(modelValue, allBindingsAccessor, 'value', elementValue);
+        }
+
+        // Workaround for https://github.com/SteveSanderson/knockout/issues/122
+        // IE doesn't fire "change" events on textboxes if the user selects a value from its autocomplete list
+        var ieAutoCompleteHackNeeded = ko.utils.ieVersion && element.tagName.toLowerCase() == "input" && element.type == "text"
+                                       && element.autocomplete != "off" && (!element.form || element.form.autocomplete != "off");
+        if (ieAutoCompleteHackNeeded && ko.utils.arrayIndexOf(eventsToCatch, "propertychange") == -1) {
+            ko.utils.registerEventHandler(element, "propertychange", function () { propertyChangedFired = true });
+            ko.utils.registerEventHandler(element, "blur", function() {
+                if (propertyChangedFired) {
+                    valueUpdateHandler();
+                }
+            });
+        }
+
+        ko.utils.arrayForEach(eventsToCatch, function(eventName) {
+            // The syntax "after<eventname>" means "run the handler asynchronously after the event"
+            // This is useful, for example, to catch "keydown" events after the browser has updated the control
+            // (otherwise, ko.selectExtensions.readValue(this) will receive the control's value *before* the key event)
+            var handler = valueUpdateHandler;
+            if (ko.utils.stringStartsWith(eventName, "after")) {
+                handler = function() { setTimeout(valueUpdateHandler, 0) };
+                eventName = eventName.substring("after".length);
+            }
+            ko.utils.registerEventHandler(element, eventName, handler);
+        });
+    },
+    'update': function (element, valueAccessor) {
+        var valueIsSelectOption = ko.utils.tagNameLower(element) === "select";
+        var newValue = ko.utils.unwrapObservable(valueAccessor());
+        var elementValue = ko.selectExtensions.readValue(element);
+        var valueHasChanged = (newValue != elementValue);
+
+        // JavaScript's 0 == "" behavious is unfortunate here as it prevents writing 0 to an empty text box (loose equality suggests the values are the same).
+        // We don't want to do a strict equality comparison as that is more confusing for developers in certain cases, so we specifically special case 0 != "" here.
+        if ((newValue === 0) && (elementValue !== 0) && (elementValue !== "0"))
+            valueHasChanged = true;
+
+        if (valueHasChanged) {
+            var applyValueAction = function () { ko.selectExtensions.writeValue(element, newValue); };
+            applyValueAction();
+
+            // Workaround for IE6 bug: It won't reliably apply values to SELECT nodes during the same execution thread
+            // right after you've changed the set of OPTION nodes on it. So for that node type, we'll schedule a second thread
+            // to apply the value as well.
+            var alsoApplyAsynchronously = valueIsSelectOption;
+            if (alsoApplyAsynchronously)
+                setTimeout(applyValueAction, 0);
+        }
+
+        // If you try to set a model value that can't be represented in an already-populated dropdown, reject that change,
+        // because you're not allowed to have a model value that disagrees with a visible UI selection.
+        if (valueIsSelectOption && (element.length > 0))
+            ensureDropdownSelectionIsConsistentWithModelValue(element, newValue, /* preferModelValue */ false);
+    }
+};
+ko.bindingHandlers['visible'] = {
+    'update': function (element, valueAccessor) {
+        var value = ko.utils.unwrapObservable(valueAccessor());
+        var isCurrentlyVisible = !(element.style.display == "none");
+        if (value && !isCurrentlyVisible)
+            element.style.display = "";
+        else if ((!value) && isCurrentlyVisible)
+            element.style.display = "none";
+    }
+};
+// 'click' is just a shorthand for the usual full-length event:{click:handler}
+makeEventHandlerShortcut('click');
+// If you want to make a custom template engine,
+//
+// [1] Inherit from this class (like ko.nativeTemplateEngine does)
+// [2] Override 'renderTemplateSource', supplying a function with this signature:
+//
+//        function (templateSource, bindingContext, options) {
+//            // - templateSource.text() is the text of the template you should render
+//            // - bindingContext.$data is the data you should pass into the template
+//            //   - you might also want to make bindingContext.$parent, bindingContext.$parents,
+//            //     and bindingContext.$root available in the template too
+//            // - options gives you access to any other properties set on "data-bind: { template: options }"
+//            //
+//            // Return value: an array of DOM nodes
+//        }
+//
+// [3] Override 'createJavaScriptEvaluatorBlock', supplying a function with this signature:
+//
+//        function (script) {
+//            // Return value: Whatever syntax means "Evaluate the JavaScript statement 'script' and output the result"
+//            //               For example, the jquery.tmpl template engine converts 'someScript' to '${ someScript }'
+//        }
+//
+//     This is only necessary if you want to allow data-bind attributes to reference arbitrary template variables.
+//     If you don't want to allow that, you can set the property 'allowTemplateRewriting' to false (like ko.nativeTemplateEngine does)
+//     and then you don't need to override 'createJavaScriptEvaluatorBlock'.
+
+ko.templateEngine = function () { };
+
+ko.templateEngine.prototype['renderTemplateSource'] = function (templateSource, bindingContext, options) {
+    throw new Error("Override renderTemplateSource");
+};
+
+ko.templateEngine.prototype['createJavaScriptEvaluatorBlock'] = function (script) {
+    throw new Error("Override createJavaScriptEvaluatorBlock");
+};
+
+ko.templateEngine.prototype['makeTemplateSource'] = function(template, templateDocument) {
+    // Named template
+    if (typeof template == "string") {
+        templateDocument = templateDocument || document;
+        var elem = templateDocument.getElementById(template);
+        if (!elem)
+            throw new Error("Cannot find template with ID " + template);
+        return new ko.templateSources.domElement(elem);
+    } else if ((template.nodeType == 1) || (template.nodeType == 8)) {
+        // Anonymous template
+        return new ko.templateSources.anonymousTemplate(template);
+    } else
+        throw new Error("Unknown template type: " + template);
+};
+
+ko.templateEngine.prototype['renderTemplate'] = function (template, bindingContext, options, templateDocument) {
+    var templateSource = this['makeTemplateSource'](template, templateDocument);
+    return this['renderTemplateSource'](templateSource, bindingContext, options);
+};
+
+ko.templateEngine.prototype['isTemplateRewritten'] = function (template, templateDocument) {
+    // Skip rewriting if requested
+    if (this['allowTemplateRewriting'] === false)
+        return true;
+    return this['makeTemplateSource'](template, templateDocument)['data']("isRewritten");
+};
+
+ko.templateEngine.prototype['rewriteTemplate'] = function (template, rewriterCallback, templateDocument) {
+    var templateSource = this['makeTemplateSource'](template, templateDocument);
+    var rewritten = rewriterCallback(templateSource['text']());
+    templateSource['text'](rewritten);
+    templateSource['data']("isRewritten", true);
+};
+
+ko.exportSymbol('templateEngine', ko.templateEngine);
+
+ko.templateRewriting = (function () {
+    var memoizeDataBindingAttributeSyntaxRegex = /(<[a-z]+\d*(\s+(?!data-bind=)[a-z0-9\-]+(=(\"[^\"]*\"|\'[^\']*\'))?)*\s+)data-bind=(["'])([\s\S]*?)\5/gi;
+    var memoizeVirtualContainerBindingSyntaxRegex = /<!--\s*ko\b\s*([\s\S]*?)\s*-->/g;
+
+    function validateDataBindValuesForRewriting(keyValueArray) {
+        var allValidators = ko.expressionRewriting.bindingRewriteValidators;
+        for (var i = 0; i < keyValueArray.length; i++) {
+            var key = keyValueArray[i]['key'];
+            if (allValidators.hasOwnProperty(key)) {
+                var validator = allValidators[key];
+
+                if (typeof validator === "function") {
+                    var possibleErrorMessage = validator(keyValueArray[i]['value']);
+                    if (possibleErrorMessage)
+                        throw new Error(possibleErrorMessage);
+                } else if (!validator) {
+                    throw new Error("This template engine does not support the '" + key + "' binding within its templates");
+                }
+            }
+        }
+    }
+
+    function constructMemoizedTagReplacement(dataBindAttributeValue, tagToRetain, templateEngine) {
+        var dataBindKeyValueArray = ko.expressionRewriting.parseObjectLiteral(dataBindAttributeValue);
+        validateDataBindValuesForRewriting(dataBindKeyValueArray);
+        var rewrittenDataBindAttributeValue = ko.expressionRewriting.preProcessBindings(dataBindKeyValueArray);
+
+        // For no obvious reason, Opera fails to evaluate rewrittenDataBindAttributeValue unless it's wrapped in an additional
+        // anonymous function, even though Opera's built-in debugger can evaluate it anyway. No other browser requires this
+        // extra indirection.
+        var applyBindingsToNextSiblingScript =
+            "ko.__tr_ambtns(function($context,$element){return(function(){return{ " + rewrittenDataBindAttributeValue + " } })()})";
+        return templateEngine['createJavaScriptEvaluatorBlock'](applyBindingsToNextSiblingScript) + tagToRetain;
+    }
+
+    return {
+        ensureTemplateIsRewritten: function (template, templateEngine, templateDocument) {
+            if (!templateEngine['isTemplateRewritten'](template, templateDocument))
+                templateEngine['rewriteTemplate'](template, function (htmlString) {
+                    return ko.templateRewriting.memoizeBindingAttributeSyntax(htmlString, templateEngine);
+                }, templateDocument);
+        },
+
+        memoizeBindingAttributeSyntax: function (htmlString, templateEngine) {
+            return htmlString.replace(memoizeDataBindingAttributeSyntaxRegex, function () {
+                return constructMemoizedTagReplacement(/* dataBindAttributeValue: */ arguments[6], /* tagToRetain: */ arguments[1], templateEngine);
+            }).replace(memoizeVirtualContainerBindingSyntaxRegex, function() {
+                return constructMemoizedTagReplacement(/* dataBindAttributeValue: */ arguments[1], /* tagToRetain: */ "<!-- ko -->", templateEngine);
+            });
+        },
+
+        applyMemoizedBindingsToNextSibling: function (bindings) {
+            return ko.memoization.memoize(function (domNode, bindingContext) {
+                if (domNode.nextSibling)
+                    ko.applyBindingsToNode(domNode.nextSibling, bindings, bindingContext);
+            });
+        }
+    }
+})();
+
+
+// Exported only because it has to be referenced by string lookup from within rewritten template
+ko.exportSymbol('__tr_ambtns', ko.templateRewriting.applyMemoizedBindingsToNextSibling);
+(function() {
+    // A template source represents a read/write way of accessing a template. This is to eliminate the need for template loading/saving
+    // logic to be duplicated in every template engine (and means they can all work with anonymous templates, etc.)
+    //
+    // Two are provided by default:
+    //  1. ko.templateSources.domElement       - reads/writes the text content of an arbitrary DOM element
+    //  2. ko.templateSources.anonymousElement - uses ko.utils.domData to read/write text *associated* with the DOM element, but
+    //                                           without reading/writing the actual element text content, since it will be overwritten
+    //                                           with the rendered template output.
+    // You can implement your own template source if you want to fetch/store templates somewhere other than in DOM elements.
+    // Template sources need to have the following functions:
+    //   text() 			- returns the template text from your storage location
+    //   text(value)		- writes the supplied template text to your storage location
+    //   data(key)			- reads values stored using data(key, value) - see below
+    //   data(key, value)	- associates "value" with this template and the key "key". Is used to store information like "isRewritten".
+    //
+    // Optionally, template sources can also have the following functions:
+    //   nodes()            - returns a DOM element containing the nodes of this template, where available
+    //   nodes(value)       - writes the given DOM element to your storage location
+    // If a DOM element is available for a given template source, template engines are encouraged to use it in preference over text()
+    // for improved speed. However, all templateSources must supply text() even if they don't supply nodes().
+    //
+    // Once you've implemented a templateSource, make your template engine use it by subclassing whatever template engine you were
+    // using and overriding "makeTemplateSource" to return an instance of your custom template source.
+
+    ko.templateSources = {};
+
+    // ---- ko.templateSources.domElement -----
+
+    ko.templateSources.domElement = function(element) {
+        this.domElement = element;
+    }
+
+    ko.templateSources.domElement.prototype['text'] = function(/* valueToWrite */) {
+        var tagNameLower = ko.utils.tagNameLower(this.domElement),
+            elemContentsProperty = tagNameLower === "script" ? "text"
+                                 : tagNameLower === "textarea" ? "value"
+                                 : "innerHTML";
+
+        if (arguments.length == 0) {
+            return this.domElement[elemContentsProperty];
+        } else {
+            var valueToWrite = arguments[0];
+            if (elemContentsProperty === "innerHTML")
+                ko.utils.setHtml(this.domElement, valueToWrite);
+            else
+                this.domElement[elemContentsProperty] = valueToWrite;
+        }
+    };
+
+    ko.templateSources.domElement.prototype['data'] = function(key /*, valueToWrite */) {
+        if (arguments.length === 1) {
+            return ko.utils.domData.get(this.domElement, "templateSourceData_" + key);
+        } else {
+            ko.utils.domData.set(this.domElement, "templateSourceData_" + key, arguments[1]);
+        }
+    };
+
+    // ---- ko.templateSources.anonymousTemplate -----
+    // Anonymous templates are normally saved/retrieved as DOM nodes through "nodes".
+    // For compatibility, you can also read "text"; it will be serialized from the nodes on demand.
+    // Writing to "text" is still supported, but then the template data will not be available as DOM nodes.
+
+    var anonymousTemplatesDomDataKey = "__ko_anon_template__";
+    ko.templateSources.anonymousTemplate = function(element) {
+        this.domElement = element;
+    }
+    ko.templateSources.anonymousTemplate.prototype = new ko.templateSources.domElement();
+    ko.templateSources.anonymousTemplate.prototype['text'] = function(/* valueToWrite */) {
+        if (arguments.length == 0) {
+            var templateData = ko.utils.domData.get(this.domElement, anonymousTemplatesDomDataKey) || {};
+            if (templateData.textData === undefined && templateData.containerData)
+                templateData.textData = templateData.containerData.innerHTML;
+            return templateData.textData;
+        } else {
+            var valueToWrite = arguments[0];
+            ko.utils.domData.set(this.domElement, anonymousTemplatesDomDataKey, {textData: valueToWrite});
+        }
+    };
+    ko.templateSources.domElement.prototype['nodes'] = function(/* valueToWrite */) {
+        if (arguments.length == 0) {
+            var templateData = ko.utils.domData.get(this.domElement, anonymousTemplatesDomDataKey) || {};
+            return templateData.containerData;
+        } else {
+            var valueToWrite = arguments[0];
+            ko.utils.domData.set(this.domElement, anonymousTemplatesDomDataKey, {containerData: valueToWrite});
+        }
+    };
+
+    ko.exportSymbol('templateSources', ko.templateSources);
+    ko.exportSymbol('templateSources.domElement', ko.templateSources.domElement);
+    ko.exportSymbol('templateSources.anonymousTemplate', ko.templateSources.anonymousTemplate);
+})();
+(function () {
+    var _templateEngine;
+    ko.setTemplateEngine = function (templateEngine) {
+        if ((templateEngine != undefined) && !(templateEngine instanceof ko.templateEngine))
+            throw new Error("templateEngine must inherit from ko.templateEngine");
+        _templateEngine = templateEngine;
+    }
+
+    function invokeForEachNodeOrCommentInContinuousRange(firstNode, lastNode, action) {
+        var node, nextInQueue = firstNode, firstOutOfRangeNode = ko.virtualElements.nextSibling(lastNode);
+        while (nextInQueue && ((node = nextInQueue) !== firstOutOfRangeNode)) {
+            nextInQueue = ko.virtualElements.nextSibling(node);
+            if (node.nodeType === 1 || node.nodeType === 8)
+                action(node);
+        }
+    }
+
+    function activateBindingsOnContinuousNodeArray(continuousNodeArray, bindingContext) {
+        // To be used on any nodes that have been rendered by a template and have been inserted into some parent element
+        // Walks through continuousNodeArray (which *must* be continuous, i.e., an uninterrupted sequence of sibling nodes, because
+        // the algorithm for walking them relies on this), and for each top-level item in the virtual-element sense,
+        // (1) Does a regular "applyBindings" to associate bindingContext with this node and to activate any non-memoized bindings
+        // (2) Unmemoizes any memos in the DOM subtree (e.g., to activate bindings that had been memoized during template rewriting)
+
+        if (continuousNodeArray.length) {
+            var firstNode = continuousNodeArray[0], lastNode = continuousNodeArray[continuousNodeArray.length - 1];
+
+            // Need to applyBindings *before* unmemoziation, because unmemoization might introduce extra nodes (that we don't want to re-bind)
+            // whereas a regular applyBindings won't introduce new memoized nodes
+            invokeForEachNodeOrCommentInContinuousRange(firstNode, lastNode, function(node) {
+                ko.applyBindings(bindingContext, node);
+            });
+            invokeForEachNodeOrCommentInContinuousRange(firstNode, lastNode, function(node) {
+                ko.memoization.unmemoizeDomNodeAndDescendants(node, [bindingContext]);
+            });
+        }
+    }
+
+    function getFirstNodeFromPossibleArray(nodeOrNodeArray) {
+        return nodeOrNodeArray.nodeType ? nodeOrNodeArray
+                                        : nodeOrNodeArray.length > 0 ? nodeOrNodeArray[0]
+                                        : null;
+    }
+
+    function executeTemplate(targetNodeOrNodeArray, renderMode, template, bindingContext, options) {
+        options = options || {};
+        var firstTargetNode = targetNodeOrNodeArray && getFirstNodeFromPossibleArray(targetNodeOrNodeArray);
+        var templateDocument = firstTargetNode && firstTargetNode.ownerDocument;
+        var templateEngineToUse = (options['templateEngine'] || _templateEngine);
+        ko.templateRewriting.ensureTemplateIsRewritten(template, templateEngineToUse, templateDocument);
+        var renderedNodesArray = templateEngineToUse['renderTemplate'](template, bindingContext, options, templateDocument);
+
+        // Loosely check result is an array of DOM nodes
+        if ((typeof renderedNodesArray.length != "number") || (renderedNodesArray.length > 0 && typeof renderedNodesArray[0].nodeType != "number"))
+            throw new Error("Template engine must return an array of DOM nodes");
+
+        var haveAddedNodesToParent = false;
+        switch (renderMode) {
+            case "replaceChildren":
+                ko.virtualElements.setDomNodeChildren(targetNodeOrNodeArray, renderedNodesArray);
+                haveAddedNodesToParent = true;
+                break;
+            case "replaceNode":
+                ko.utils.replaceDomNodes(targetNodeOrNodeArray, renderedNodesArray);
+                haveAddedNodesToParent = true;
+                break;
+            case "ignoreTargetNode": break;
+            default:
+                throw new Error("Unknown renderMode: " + renderMode);
+        }
+
+        if (haveAddedNodesToParent) {
+            activateBindingsOnContinuousNodeArray(renderedNodesArray, bindingContext);
+            if (options['afterRender'])
+                ko.dependencyDetection.ignore(options['afterRender'], null, [renderedNodesArray, bindingContext['$data']]);
+        }
+
+        return renderedNodesArray;
+    }
+
+    ko.renderTemplate = function (template, dataOrBindingContext, options, targetNodeOrNodeArray, renderMode) {
+        options = options || {};
+        if ((options['templateEngine'] || _templateEngine) == undefined)
+            throw new Error("Set a template engine before calling renderTemplate");
+        renderMode = renderMode || "replaceChildren";
+
+        if (targetNodeOrNodeArray) {
+            var firstTargetNode = getFirstNodeFromPossibleArray(targetNodeOrNodeArray);
+
+            var whenToDispose = function () { return (!firstTargetNode) || !ko.utils.domNodeIsAttachedToDocument(firstTargetNode); }; // Passive disposal (on next evaluation)
+            var activelyDisposeWhenNodeIsRemoved = (firstTargetNode && renderMode == "replaceNode") ? firstTargetNode.parentNode : firstTargetNode;
+
+            return ko.dependentObservable( // So the DOM is automatically updated when any dependency changes
+                function () {
+                    // Ensure we've got a proper binding context to work with
+                    var bindingContext = (dataOrBindingContext && (dataOrBindingContext instanceof ko.bindingContext))
+                        ? dataOrBindingContext
+                        : new ko.bindingContext(ko.utils.unwrapObservable(dataOrBindingContext));
+
+                    // Support selecting template as a function of the data being rendered
+                    var templateName = typeof(template) == 'function' ? template(bindingContext['$data'], bindingContext) : template;
+
+                    var renderedNodesArray = executeTemplate(targetNodeOrNodeArray, renderMode, templateName, bindingContext, options);
+                    if (renderMode == "replaceNode") {
+                        targetNodeOrNodeArray = renderedNodesArray;
+                        firstTargetNode = getFirstNodeFromPossibleArray(targetNodeOrNodeArray);
+                    }
+                },
+                null,
+                { disposeWhen: whenToDispose, disposeWhenNodeIsRemoved: activelyDisposeWhenNodeIsRemoved }
+            );
+        } else {
+            // We don't yet have a DOM node to evaluate, so use a memo and render the template later when there is a DOM node
+            return ko.memoization.memoize(function (domNode) {
+                ko.renderTemplate(template, dataOrBindingContext, options, domNode, "replaceNode");
+            });
+        }
+    };
+
+    ko.renderTemplateForEach = function (template, arrayOrObservableArray, options, targetNode, parentBindingContext) {
+        // Since setDomNodeChildrenFromArrayMapping always calls executeTemplateForArrayItem and then
+        // activateBindingsCallback for added items, we can store the binding context in the former to use in the latter.
+        var arrayItemContext;
+
+        // This will be called by setDomNodeChildrenFromArrayMapping to get the nodes to add to targetNode
+        var executeTemplateForArrayItem = function (arrayValue, index) {
+            // Support selecting template as a function of the data being rendered
+            arrayItemContext = parentBindingContext['createChildContext'](ko.utils.unwrapObservable(arrayValue), options['as']);
+            arrayItemContext['$index'] = index;
+            var templateName = typeof(template) == 'function' ? template(arrayValue, arrayItemContext) : template;
+            return executeTemplate(null, "ignoreTargetNode", templateName, arrayItemContext, options);
+        }
+
+        // This will be called whenever setDomNodeChildrenFromArrayMapping has added nodes to targetNode
+        var activateBindingsCallback = function(arrayValue, addedNodesArray, index) {
+            activateBindingsOnContinuousNodeArray(addedNodesArray, arrayItemContext);
+            if (options['afterRender'])
+                options['afterRender'](addedNodesArray, arrayValue);
+        };
+
+        return ko.dependentObservable(function () {
+            var unwrappedArray = ko.utils.unwrapObservable(arrayOrObservableArray) || [];
+            if (typeof unwrappedArray.length == "undefined") // Coerce single value into array
+                unwrappedArray = [unwrappedArray];
+
+            // Filter out any entries marked as destroyed
+            var filteredArray = ko.utils.arrayFilter(unwrappedArray, function(item) {
+                return options['includeDestroyed'] || item === undefined || item === null || !ko.utils.unwrapObservable(item['_destroy']);
+            });
+
+            // Call setDomNodeChildrenFromArrayMapping, ignoring any observables unwrapped within (most likely from a callback function).
+            // If the array items are observables, though, they will be unwrapped in executeTemplateForArrayItem and managed within setDomNodeChildrenFromArrayMapping.
+            ko.dependencyDetection.ignore(ko.utils.setDomNodeChildrenFromArrayMapping, null, [targetNode, filteredArray, executeTemplateForArrayItem, options, activateBindingsCallback]);
+
+        }, null, { disposeWhenNodeIsRemoved: targetNode });
+    };
+
+    var templateComputedDomDataKey = '__ko__templateComputedDomDataKey__';
+    function disposeOldComputedAndStoreNewOne(element, newComputed) {
+        var oldComputed = ko.utils.domData.get(element, templateComputedDomDataKey);
+        if (oldComputed && (typeof(oldComputed.dispose) == 'function'))
+            oldComputed.dispose();
+        ko.utils.domData.set(element, templateComputedDomDataKey, (newComputed && newComputed.isActive()) ? newComputed : undefined);
+    }
+
+    ko.bindingHandlers['template'] = {
+        'init': function(element, valueAccessor) {
+            // Support anonymous templates
+            var bindingValue = ko.utils.unwrapObservable(valueAccessor());
+            if ((typeof bindingValue != "string") && (!bindingValue['name']) && (element.nodeType == 1 || element.nodeType == 8)) {
+                // It's an anonymous template - store the element contents, then clear the element
+                var templateNodes = element.nodeType == 1 ? element.childNodes : ko.virtualElements.childNodes(element),
+                    container = ko.utils.moveCleanedNodesToContainerElement(templateNodes); // This also removes the nodes from their current parent
+                new ko.templateSources.anonymousTemplate(element)['nodes'](container);
+            }
+            return { 'controlsDescendantBindings': true };
+        },
+        'update': function (element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
+            var templateName = ko.utils.unwrapObservable(valueAccessor()),
+                options = {},
+                shouldDisplay = true,
+                dataValue,
+                templateComputed = null;
+
+            if (typeof templateName != "string") {
+                options = templateName;
+                templateName = options['name'];
+
+                // Support "if"/"ifnot" conditions
+                if ('if' in options)
+                    shouldDisplay = ko.utils.unwrapObservable(options['if']);
+                if (shouldDisplay && 'ifnot' in options)
+                    shouldDisplay = !ko.utils.unwrapObservable(options['ifnot']);
+
+                dataValue = ko.utils.unwrapObservable(options['data']);
+            }
+
+            if ('foreach' in options) {
+                // Render once for each data point (treating data set as empty if shouldDisplay==false)
+                var dataArray = (shouldDisplay && options['foreach']) || [];
+                templateComputed = ko.renderTemplateForEach(templateName || element, dataArray, options, element, bindingContext);
+            } else if (!shouldDisplay) {
+                ko.virtualElements.emptyNode(element);
+            } else {
+                // Render once for this single data point (or use the viewModel if no data was provided)
+                var innerBindingContext = ('data' in options) ?
+                    bindingContext['createChildContext'](dataValue, options['as']) :  // Given an explitit 'data' value, we create a child binding context for it
+                    bindingContext;                                                        // Given no explicit 'data' value, we retain the same binding context
+                templateComputed = ko.renderTemplate(templateName || element, innerBindingContext, options, element);
+            }
+
+            // It only makes sense to have a single template computed per element (otherwise which one should have its output displayed?)
+            disposeOldComputedAndStoreNewOne(element, templateComputed);
+        }
+    };
+
+    // Anonymous templates can't be rewritten. Give a nice error message if you try to do it.
+    ko.expressionRewriting.bindingRewriteValidators['template'] = function(bindingValue) {
+        var parsedBindingValue = ko.expressionRewriting.parseObjectLiteral(bindingValue);
+
+        if ((parsedBindingValue.length == 1) && parsedBindingValue[0]['unknown'])
+            return null; // It looks like a string literal, not an object literal, so treat it as a named template (which is allowed for rewriting)
+
+        if (ko.expressionRewriting.keyValueArrayContainsKey(parsedBindingValue, "name"))
+            return null; // Named templates can be rewritten, so return "no error"
+        return "This template engine does not support anonymous templates nested within its templates";
+    };
+
+    ko.virtualElements.allowedBindings['template'] = true;
+})();
+
+ko.exportSymbol('setTemplateEngine', ko.setTemplateEngine);
+ko.exportSymbol('renderTemplate', ko.renderTemplate);
+
+ko.utils.compareArrays = (function () {
+    var statusNotInOld = 'added', statusNotInNew = 'deleted';
+
+    // Simple calculation based on Levenshtein distance.
+    function compareArrays(oldArray, newArray, dontLimitMoves) {
+        oldArray = oldArray || [];
+        newArray = newArray || [];
+
+        if (oldArray.length <= newArray.length)
+            return compareSmallArrayToBigArray(oldArray, newArray, statusNotInOld, statusNotInNew, dontLimitMoves);
+        else
+            return compareSmallArrayToBigArray(newArray, oldArray, statusNotInNew, statusNotInOld, dontLimitMoves);
+    }
+
+    function compareSmallArrayToBigArray(smlArray, bigArray, statusNotInSml, statusNotInBig, dontLimitMoves) {
+        var myMin = Math.min,
+            myMax = Math.max,
+            editDistanceMatrix = [],
+            smlIndex, smlIndexMax = smlArray.length,
+            bigIndex, bigIndexMax = bigArray.length,
+            compareRange = (bigIndexMax - smlIndexMax) || 1,
+            maxDistance = smlIndexMax + bigIndexMax + 1,
+            thisRow, lastRow,
+            bigIndexMaxForRow, bigIndexMinForRow;
+
+        for (smlIndex = 0; smlIndex <= smlIndexMax; smlIndex++) {
+            lastRow = thisRow;
+            editDistanceMatrix.push(thisRow = []);
+            bigIndexMaxForRow = myMin(bigIndexMax, smlIndex + compareRange);
+            bigIndexMinForRow = myMax(0, smlIndex - 1);
+            for (bigIndex = bigIndexMinForRow; bigIndex <= bigIndexMaxForRow; bigIndex++) {
+                if (!bigIndex)
+                    thisRow[bigIndex] = smlIndex + 1;
+                else if (!smlIndex)  // Top row - transform empty array into new array via additions
+                    thisRow[bigIndex] = bigIndex + 1;
+                else if (smlArray[smlIndex - 1] === bigArray[bigIndex - 1])
+                    thisRow[bigIndex] = lastRow[bigIndex - 1];                  // copy value (no edit)
+                else {
+                    var northDistance = lastRow[bigIndex] || maxDistance;       // not in big (deletion)
+                    var westDistance = thisRow[bigIndex - 1] || maxDistance;    // not in small (addition)
+                    thisRow[bigIndex] = myMin(northDistance, westDistance) + 1;
+                }
+            }
+        }
+
+        var editScript = [], meMinusOne, notInSml = [], notInBig = [];
+        for (smlIndex = smlIndexMax, bigIndex = bigIndexMax; smlIndex || bigIndex;) {
+            meMinusOne = editDistanceMatrix[smlIndex][bigIndex] - 1;
+            if (bigIndex && meMinusOne === editDistanceMatrix[smlIndex][bigIndex-1]) {
+                notInSml.push(editScript[editScript.length] = {     // added
+                    'status': statusNotInSml,
+                    'value': bigArray[--bigIndex],
+                    'index': bigIndex });
+            } else if (smlIndex && meMinusOne === editDistanceMatrix[smlIndex - 1][bigIndex]) {
+                notInBig.push(editScript[editScript.length] = {     // deleted
+                    'status': statusNotInBig,
+                    'value': smlArray[--smlIndex],
+                    'index': smlIndex });
+            } else {
+                editScript.push({
+                    'status': "retained",
+                    'value': bigArray[--bigIndex] });
+                --smlIndex;
+            }
+        }
+
+        if (notInSml.length && notInBig.length) {
+            // Set a limit on the number of consecutive non-matching comparisons; having it a multiple of
+            // smlIndexMax keeps the time complexity of this algorithm linear.
+            var limitFailedCompares = smlIndexMax * 10, failedCompares,
+                a, d, notInSmlItem, notInBigItem;
+            // Go through the items that have been added and deleted and try to find matches between them.
+            for (failedCompares = a = 0; (dontLimitMoves || failedCompares < limitFailedCompares) && (notInSmlItem = notInSml[a]); a++) {
+                for (d = 0; notInBigItem = notInBig[d]; d++) {
+                    if (notInSmlItem['value'] === notInBigItem['value']) {
+                        notInSmlItem['moved'] = notInBigItem['index'];
+                        notInBigItem['moved'] = notInSmlItem['index'];
+                        notInBig.splice(d,1);       // This item is marked as moved; so remove it from notInBig list
+                        failedCompares = d = 0;     // Reset failed compares count because we're checking for consecutive failures
+                        break;
+                    }
+                }
+                failedCompares += d;
+            }
+        }
+        return editScript.reverse();
+    }
+
+    return compareArrays;
+})();
+
+ko.exportSymbol('utils.compareArrays', ko.utils.compareArrays);
+
+(function () {
+    // Objective:
+    // * Given an input array, a container DOM node, and a function from array elements to arrays of DOM nodes,
+    //   map the array elements to arrays of DOM nodes, concatenate together all these arrays, and use them to populate the container DOM node
+    // * Next time we're given the same combination of things (with the array possibly having mutated), update the container DOM node
+    //   so that its children is again the concatenation of the mappings of the array elements, but don't re-map any array elements that we
+    //   previously mapped - retain those nodes, and just insert/delete other ones
+
+    // "callbackAfterAddingNodes" will be invoked after any "mapping"-generated nodes are inserted into the container node
+    // You can use this, for example, to activate bindings on those nodes.
+
+    function fixUpNodesToBeMovedOrRemoved(contiguousNodeArray) {
+        // Before moving, deleting, or replacing a set of nodes that were previously outputted by the "map" function, we have to reconcile
+        // them against what is in the DOM right now. It may be that some of the nodes have already been removed from the document,
+        // or that new nodes might have been inserted in the middle, for example by a binding. Also, there may previously have been
+        // leading comment nodes (created by rewritten string-based templates) that have since been removed during binding.
+        // So, this function translates the old "map" output array into its best guess of what set of current DOM nodes should be removed.
+        //
+        // Rules:
+        //   [A] Any leading nodes that aren't in the document any more should be ignored
+        //       These most likely correspond to memoization nodes that were already removed during binding
+        //       See https://github.com/SteveSanderson/knockout/pull/440
+        //   [B] We want to output a contiguous series of nodes that are still in the document. So, ignore any nodes that
+        //       have already been removed, and include any nodes that have been inserted among the previous collection
+
+        // Rule [A]
+        while (contiguousNodeArray.length && !ko.utils.domNodeIsAttachedToDocument(contiguousNodeArray[0]))
+            contiguousNodeArray.splice(0, 1);
+
+        // Rule [B]
+        if (contiguousNodeArray.length > 1) {
+            // Build up the actual new contiguous node set
+            var current = contiguousNodeArray[0], last = contiguousNodeArray[contiguousNodeArray.length - 1], newContiguousSet = [current];
+            while (current !== last) {
+                current = current.nextSibling;
+                if (!current) // Won't happen, except if the developer has manually removed some DOM elements (then we're in an undefined scenario)
+                    return;
+                newContiguousSet.push(current);
+            }
+
+            // ... then mutate the input array to match this.
+            // (The following line replaces the contents of contiguousNodeArray with newContiguousSet)
+            Array.prototype.splice.apply(contiguousNodeArray, [0, contiguousNodeArray.length].concat(newContiguousSet));
+        }
+        return contiguousNodeArray;
+    }
+
+    function mapNodeAndRefreshWhenChanged(containerNode, mapping, valueToMap, callbackAfterAddingNodes, index) {
+        // Map this array value inside a dependentObservable so we re-map when any dependency changes
+        var mappedNodes = [];
+        var dependentObservable = ko.dependentObservable(function() {
+            var newMappedNodes = mapping(valueToMap, index) || [];
+
+            // On subsequent evaluations, just replace the previously-inserted DOM nodes
+            if (mappedNodes.length > 0) {
+                ko.utils.replaceDomNodes(fixUpNodesToBeMovedOrRemoved(mappedNodes), newMappedNodes);
+                if (callbackAfterAddingNodes)
+                    ko.dependencyDetection.ignore(callbackAfterAddingNodes, null, [valueToMap, newMappedNodes, index]);
+            }
+
+            // Replace the contents of the mappedNodes array, thereby updating the record
+            // of which nodes would be deleted if valueToMap was itself later removed
+            mappedNodes.splice(0, mappedNodes.length);
+            ko.utils.arrayPushAll(mappedNodes, newMappedNodes);
+        }, null, { disposeWhenNodeIsRemoved: containerNode, disposeWhen: function() { return (mappedNodes.length == 0) || !ko.utils.domNodeIsAttachedToDocument(mappedNodes[0]) } });
+        return { mappedNodes : mappedNodes, dependentObservable : (dependentObservable.isActive() ? dependentObservable : undefined) };
+    }
+
+    var lastMappingResultDomDataKey = "setDomNodeChildrenFromArrayMapping_lastMappingResult";
+
+    ko.utils.setDomNodeChildrenFromArrayMapping = function (domNode, array, mapping, options, callbackAfterAddingNodes) {
+        // Compare the provided array against the previous one
+        array = array || [];
+        options = options || {};
+        var isFirstExecution = ko.utils.domData.get(domNode, lastMappingResultDomDataKey) === undefined;
+        var lastMappingResult = ko.utils.domData.get(domNode, lastMappingResultDomDataKey) || [];
+        var lastArray = ko.utils.arrayMap(lastMappingResult, function (x) { return x.arrayEntry; });
+        var editScript = ko.utils.compareArrays(lastArray, array);
+
+        // Build the new mapping result
+        var newMappingResult = [];
+        var lastMappingResultIndex = 0;
+        var newMappingResultIndex = 0;
+
+        var nodesToDelete = [];
+        var itemsToProcess = [];
+        var itemsForBeforeRemoveCallbacks = [];
+        var itemsForMoveCallbacks = [];
+        var itemsForAfterAddCallbacks = [];
+        var mapData;
+
+        function itemMovedOrRetained(editScriptIndex, oldPosition) {
+            mapData = lastMappingResult[oldPosition];
+            if (newMappingResultIndex !== oldPosition)
+                itemsForMoveCallbacks[editScriptIndex] = mapData;
+            // Since updating the index might change the nodes, do so before calling fixUpNodesToBeMovedOrRemoved
+            mapData.indexObservable(newMappingResultIndex++);
+            fixUpNodesToBeMovedOrRemoved(mapData.mappedNodes);
+            newMappingResult.push(mapData);
+            itemsToProcess.push(mapData);
+        }
+
+        function callCallback(callback, items) {
+            if (callback) {
+                for (var i = 0, n = items.length; i < n; i++) {
+                    if (items[i]) {
+                        ko.utils.arrayForEach(items[i].mappedNodes, function(node) {
+                            callback(node, i, items[i].arrayEntry);
+                        });
+                    }
+                }
+            }
+        }
+
+        for (var i = 0, editScriptItem, movedIndex; editScriptItem = editScript[i]; i++) {
+            movedIndex = editScriptItem['moved'];
+            switch (editScriptItem['status']) {
+                case "deleted":
+                    if (movedIndex === undefined) {
+                        mapData = lastMappingResult[lastMappingResultIndex];
+
+                        // Stop tracking changes to the mapping for these nodes
+                        if (mapData.dependentObservable)
+                            mapData.dependentObservable.dispose();
+
+                        // Queue these nodes for later removal
+                        nodesToDelete.push.apply(nodesToDelete, fixUpNodesToBeMovedOrRemoved(mapData.mappedNodes));
+                        if (options['beforeRemove']) {
+                            itemsForBeforeRemoveCallbacks[i] = mapData;
+                            itemsToProcess.push(mapData);
+                        }
+                    }
+                    lastMappingResultIndex++;
+                    break;
+
+                case "retained":
+                    itemMovedOrRetained(i, lastMappingResultIndex++);
+                    break;
+
+                case "added":
+                    if (movedIndex !== undefined) {
+                        itemMovedOrRetained(i, movedIndex);
+                    } else {
+                        mapData = { arrayEntry: editScriptItem['value'], indexObservable: ko.observable(newMappingResultIndex++) };
+                        newMappingResult.push(mapData);
+                        itemsToProcess.push(mapData);
+                        if (!isFirstExecution)
+                            itemsForAfterAddCallbacks[i] = mapData;
+                    }
+                    break;
+            }
+        }
+
+        // Call beforeMove first before any changes have been made to the DOM
+        callCallback(options['beforeMove'], itemsForMoveCallbacks);
+
+        // Next remove nodes for deleted items (or just clean if there's a beforeRemove callback)
+        ko.utils.arrayForEach(nodesToDelete, options['beforeRemove'] ? ko.cleanNode : ko.removeNode);
+
+        // Next add/reorder the remaining items (will include deleted items if there's a beforeRemove callback)
+        for (var i = 0, nextNode = ko.virtualElements.firstChild(domNode), lastNode, node; mapData = itemsToProcess[i]; i++) {
+            // Get nodes for newly added items
+            if (!mapData.mappedNodes)
+                ko.utils.extend(mapData, mapNodeAndRefreshWhenChanged(domNode, mapping, mapData.arrayEntry, callbackAfterAddingNodes, mapData.indexObservable));
+
+            // Put nodes in the right place if they aren't there already
+            for (var j = 0; node = mapData.mappedNodes[j]; nextNode = node.nextSibling, lastNode = node, j++) {
+                if (node !== nextNode)
+                    ko.virtualElements.insertAfter(domNode, node, lastNode);
+            }
+
+            // Run the callbacks for newly added nodes (for example, to apply bindings, etc.)
+            if (!mapData.initialized && callbackAfterAddingNodes) {
+                callbackAfterAddingNodes(mapData.arrayEntry, mapData.mappedNodes, mapData.indexObservable);
+                mapData.initialized = true;
+            }
+        }
+
+        // If there's a beforeRemove callback, call it after reordering.
+        // Note that we assume that the beforeRemove callback will usually be used to remove the nodes using
+        // some sort of animation, which is why we first reorder the nodes that will be removed. If the
+        // callback instead removes the nodes right away, it would be more efficient to skip reordering them.
+        // Perhaps we'll make that change in the future if this scenario becomes more common.
+        callCallback(options['beforeRemove'], itemsForBeforeRemoveCallbacks);
+
+        // Finally call afterMove and afterAdd callbacks
+        callCallback(options['afterMove'], itemsForMoveCallbacks);
+        callCallback(options['afterAdd'], itemsForAfterAddCallbacks);
+
+        // Store a copy of the array items we just considered so we can difference it next time
+        ko.utils.domData.set(domNode, lastMappingResultDomDataKey, newMappingResult);
+    }
+})();
+
+ko.exportSymbol('utils.setDomNodeChildrenFromArrayMapping', ko.utils.setDomNodeChildrenFromArrayMapping);
+ko.nativeTemplateEngine = function () {
+    this['allowTemplateRewriting'] = false;
+}
+
+ko.nativeTemplateEngine.prototype = new ko.templateEngine();
+ko.nativeTemplateEngine.prototype['renderTemplateSource'] = function (templateSource, bindingContext, options) {
+    var useNodesIfAvailable = !(ko.utils.ieVersion < 9), // IE<9 cloneNode doesn't work properly
+        templateNodesFunc = useNodesIfAvailable ? templateSource['nodes'] : null,
+        templateNodes = templateNodesFunc ? templateSource['nodes']() : null;
+
+    if (templateNodes) {
+        return ko.utils.makeArray(templateNodes.cloneNode(true).childNodes);
+    } else {
+        var templateText = templateSource['text']();
+        return ko.utils.parseHtmlFragment(templateText);
+    }
+};
+
+ko.nativeTemplateEngine.instance = new ko.nativeTemplateEngine();
+ko.setTemplateEngine(ko.nativeTemplateEngine.instance);
+
+ko.exportSymbol('nativeTemplateEngine', ko.nativeTemplateEngine);
+(function() {
+    ko.jqueryTmplTemplateEngine = function () {
+        // Detect which version of jquery-tmpl you're using. Unfortunately jquery-tmpl
+        // doesn't expose a version number, so we have to infer it.
+        // Note that as of Knockout 1.3, we only support jQuery.tmpl 1.0.0pre and later,
+        // which KO internally refers to as version "2", so older versions are no longer detected.
+        var jQueryTmplVersion = this.jQueryTmplVersion = (function() {
+            if ((typeof(jQuery) == "undefined") || !(jQuery['tmpl']))
+                return 0;
+            // Since it exposes no official version number, we use our own numbering system. To be updated as jquery-tmpl evolves.
+            try {
+                if (jQuery['tmpl']['tag']['tmpl']['open'].toString().indexOf('__') >= 0) {
+                    // Since 1.0.0pre, custom tags should append markup to an array called "__"
+                    return 2; // Final version of jquery.tmpl
+                }
+            } catch(ex) { /* Apparently not the version we were looking for */ }
+
+            return 1; // Any older version that we don't support
+        })();
+
+        function ensureHasReferencedJQueryTemplates() {
+            if (jQueryTmplVersion < 2)
+                throw new Error("Your version of jQuery.tmpl is too old. Please upgrade to jQuery.tmpl 1.0.0pre or later.");
+        }
+
+        function executeTemplate(compiledTemplate, data, jQueryTemplateOptions) {
+            return jQuery['tmpl'](compiledTemplate, data, jQueryTemplateOptions);
+        }
+
+        this['renderTemplateSource'] = function(templateSource, bindingContext, options) {
+            options = options || {};
+            ensureHasReferencedJQueryTemplates();
+
+            // Ensure we have stored a precompiled version of this template (don't want to reparse on every render)
+            var precompiled = templateSource['data']('precompiled');
+            if (!precompiled) {
+                var templateText = templateSource['text']() || "";
+                // Wrap in "with($whatever.koBindingContext) { ... }"
+                templateText = "{{ko_with $item.koBindingContext}}" + templateText + "{{/ko_with}}";
+
+                precompiled = jQuery['template'](null, templateText);
+                templateSource['data']('precompiled', precompiled);
+            }
+
+            var data = [bindingContext['$data']]; // Prewrap the data in an array to stop jquery.tmpl from trying to unwrap any arrays
+            var jQueryTemplateOptions = jQuery['extend']({ 'koBindingContext': bindingContext }, options['templateOptions']);
+
+            var resultNodes = executeTemplate(precompiled, data, jQueryTemplateOptions);
+            resultNodes['appendTo'](document.createElement("div")); // Using "appendTo" forces jQuery/jQuery.tmpl to perform necessary cleanup work
+
+            jQuery['fragments'] = {}; // Clear jQuery's fragment cache to avoid a memory leak after a large number of template renders
+            return resultNodes;
+        };
+
+        this['createJavaScriptEvaluatorBlock'] = function(script) {
+            return "{{ko_code ((function() { return " + script + " })()) }}";
+        };
+
+        this['addTemplate'] = function(templateName, templateMarkup) {
+            document.write("<script type='text/html' id='" + templateName + "'>" + templateMarkup + "</script>");
+        };
+
+        if (jQueryTmplVersion > 0) {
+            jQuery['tmpl']['tag']['ko_code'] = {
+                open: "__.push($1 || '');"
+            };
+            jQuery['tmpl']['tag']['ko_with'] = {
+                open: "with($1) {",
+                close: "} "
+            };
+        }
+    };
+
+    ko.jqueryTmplTemplateEngine.prototype = new ko.templateEngine();
+
+    // Use this one by default *only if jquery.tmpl is referenced*
+    var jqueryTmplTemplateEngineInstance = new ko.jqueryTmplTemplateEngine();
+    if (jqueryTmplTemplateEngineInstance.jQueryTmplVersion > 0)
+        ko.setTemplateEngine(jqueryTmplTemplateEngineInstance);
+
+    ko.exportSymbol('jqueryTmplTemplateEngine', ko.jqueryTmplTemplateEngine);
+})();
+});
+})(window,document,navigator,window["jQuery"]);
+})();
\ No newline at end of file
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/test/java/org/apidesign/html/kofx/DynamicHTTP.java
--- a/ko-fx/src/test/java/org/apidesign/html/kofx/DynamicHTTP.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,259 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.kofx;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.glassfish.grizzly.PortRange;
-import org.glassfish.grizzly.http.server.HttpHandler;
-import org.glassfish.grizzly.http.server.HttpServer;
-import org.glassfish.grizzly.http.server.NetworkListener;
-import org.glassfish.grizzly.http.server.Request;
-import org.glassfish.grizzly.http.server.Response;
-import org.glassfish.grizzly.http.server.ServerConfiguration;
-import org.glassfish.grizzly.websockets.WebSocket;
-import org.glassfish.grizzly.websockets.WebSocketAddOn;
-import org.glassfish.grizzly.websockets.WebSocketApplication;
-import org.glassfish.grizzly.websockets.WebSocketEngine;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-final class DynamicHTTP extends HttpHandler {
-    private static final Logger LOG = Logger.getLogger(DynamicHTTP.class.getName());
-    private static int resourcesCount;
-    private static List<Resource> resources;
-    private static ServerConfiguration conf;
-    private static HttpServer server;
-    
-    private DynamicHTTP() {
-    }
-    
-    static URI initServer() throws Exception {
-        server = HttpServer.createSimpleServer(null, new PortRange(8080, 65535));
-        final WebSocketAddOn addon = new WebSocketAddOn();
-        for (NetworkListener listener : server.getListeners()) {
-            listener.registerAddOn(addon);
-        }        
-        resources = new ArrayList<Resource>();
-
-        conf = server.getServerConfiguration();
-        final DynamicHTTP dh = new DynamicHTTP();
-
-        conf.addHttpHandler(dh, "/");
-        
-        server.start();
-
-        return pageURL("http", server, "/test.html");
-    }
-    
-    @Override
-    public void service(Request request, Response response) throws Exception {
-        if ("/test.html".equals(request.getRequestURI())) {
-            response.setContentType("text/html");
-            final InputStream is = DynamicHTTP.class.getResourceAsStream("test.html");
-            copyStream(is, response.getOutputStream(), null);
-            return;
-        }
-        if ("/dynamic".equals(request.getRequestURI())) {
-            String mimeType = request.getParameter("mimeType");
-            List<String> params = new ArrayList<String>();
-            boolean webSocket = false;
-            for (int i = 0;; i++) {
-                String p = request.getParameter("param" + i);
-                if (p == null) {
-                    break;
-                }
-                if ("protocol:ws".equals(p)) {
-                    webSocket = true;
-                    continue;
-                }
-                params.add(p);
-            }
-            final String cnt = request.getParameter("content");
-            String mangle = cnt.replace("%20", " ").replace("%0A", "\n");
-            ByteArrayInputStream is = new ByteArrayInputStream(mangle.getBytes("UTF-8"));
-            URI url;
-            final Resource res = new Resource(is, mimeType, "/dynamic/res" + ++resourcesCount, params.toArray(new String[params.size()]));
-            if (webSocket) {
-                url = registerWebSocket(res);
-            } else {
-                url = registerResource(res);
-            }
-            response.getWriter().write(url.toString());
-            response.getWriter().write("\n");
-            return;
-        }
-
-        for (Resource r : resources) {
-            if (r.httpPath.equals(request.getRequestURI())) {
-                response.setContentType(r.httpType);
-                r.httpContent.reset();
-                String[] params = null;
-                if (r.parameters.length != 0) {
-                    params = new String[r.parameters.length];
-                    for (int i = 0; i < r.parameters.length; i++) {
-                        params[i] = request.getParameter(r.parameters[i]);
-                        if (params[i] == null) {
-                            if ("http.method".equals(r.parameters[i])) {
-                                params[i] = request.getMethod().toString();
-                            } else if ("http.requestBody".equals(r.parameters[i])) {
-                                Reader rdr = request.getReader();
-                                StringBuilder sb = new StringBuilder();
-                                for (;;) {
-                                    int ch = rdr.read();
-                                    if (ch == -1) {
-                                        break;
-                                    }
-                                    sb.append((char) ch);
-                                }
-                                params[i] = sb.toString();
-                            }
-                        }
-                        if (params[i] == null) {
-                            params[i] = "null";
-                        }
-                    }
-                }
-
-                copyStream(r.httpContent, response.getOutputStream(), null, params);
-            }
-        }
-    }
-    
-    private URI registerWebSocket(Resource r) {
-        WebSocketEngine.getEngine().register("", r.httpPath, new WS(r));
-        return pageURL("ws", server, r.httpPath);
-    }
-
-    private URI registerResource(Resource r) {
-        if (!resources.contains(r)) {
-            resources.add(r);
-            conf.addHttpHandler(this, r.httpPath);
-        }
-        return pageURL("http", server, r.httpPath);
-    }
-    
-    private static URI pageURL(String proto, HttpServer server, final String page) {
-        NetworkListener listener = server.getListeners().iterator().next();
-        int port = listener.getPort();
-        try {
-            return new URI(proto + "://localhost:" + port + page);
-        } catch (URISyntaxException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-    
-    static final class Resource {
-
-        final InputStream httpContent;
-        final String httpType;
-        final String httpPath;
-        final String[] parameters;
-
-        Resource(InputStream httpContent, String httpType, String httpPath,
-            String[] parameters) {
-            httpContent.mark(Integer.MAX_VALUE);
-            this.httpContent = httpContent;
-            this.httpType = httpType;
-            this.httpPath = httpPath;
-            this.parameters = parameters;
-        }
-    }
-
-    static void copyStream(InputStream is, OutputStream os, String baseURL, String... params) throws IOException {
-        for (;;) {
-            int ch = is.read();
-            if (ch == -1) {
-                break;
-            }
-            if (ch == '$' && params.length > 0) {
-                int cnt = is.read() - '0';
-                if (baseURL != null && cnt == 'U' - '0') {
-                    os.write(baseURL.getBytes("UTF-8"));
-                } else {
-                    if (cnt >= 0 && cnt < params.length) {
-                        os.write(params[cnt].getBytes("UTF-8"));
-                    } else {
-                        os.write('$');
-                        os.write(cnt + '0');
-                    }
-                }
-            } else {
-                os.write(ch);
-            }
-        }
-    }
-    
-    private static class WS extends WebSocketApplication {
-        private final Resource r;
-
-        private WS(Resource r) {
-            this.r = r;
-        }
-
-        @Override
-        public void onMessage(WebSocket socket, String text) {
-            try {
-                r.httpContent.reset();
-                ByteArrayOutputStream out = new ByteArrayOutputStream();
-                copyStream(r.httpContent, out, null, text);
-                String s = new String(out.toByteArray(), "UTF-8");
-                socket.send(s);
-            } catch (IOException ex) {
-                LOG.log(Level.WARNING, "Error processing message " + text, ex);
-            }
-        }
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/test/java/org/apidesign/html/kofx/KOFx.java
--- a/ko-fx/src/test/java/org/apidesign/html/kofx/KOFx.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.kofx;
-
-import java.io.Closeable;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import javafx.application.Platform;
-import org.apidesign.html.boot.spi.Fn;
-import org.testng.ITest;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class KOFx implements ITest, Runnable {
-    private final Fn.Presenter p;
-    private final Method m;
-    private Object result;
-    private Object inst;
-    private int count;
-
-    KOFx(Fn.Presenter p, Method m) {
-        this.p = p;
-        this.m = m;
-    }
-
-    @Override
-    public String getTestName() {
-        return m.getName();
-    }
-
-    @Test
-    public synchronized void executeTest() throws Exception {
-        if (result == null) {
-            Platform.runLater(this);
-            wait();
-        }
-        if (result instanceof Exception) {
-            throw (Exception)result;
-        }
-        if (result instanceof Error) {
-            throw (Error)result;
-        }
-    }
-
-    @Override
-    public synchronized void run() {
-        boolean notify = true;
-        try (Closeable a = Fn.activate(p)) {
-            if (inst == null) {
-                inst = m.getDeclaringClass().newInstance();
-            }
-            result = m.invoke(inst);
-            if (result == null) {
-                result = this;
-            }
-        } catch (InvocationTargetException ex) {
-            Throwable r = ex.getTargetException();
-            if (r instanceof InterruptedException) {
-                if (count++ < 10000) {
-                    notify = false;
-                    Platform.runLater(this);
-                    return;
-                }
-            }
-            result = r;
-        } catch (Exception ex) {
-            result = ex;
-        } finally {
-            if (notify) {
-                notifyAll();
-            }
-        }
-    }
-    
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/test/java/org/apidesign/html/kofx/KnockoutFXTest.java
--- a/ko-fx/src/test/java/org/apidesign/html/kofx/KnockoutFXTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,229 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.kofx;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Executors;
-import net.java.html.BrwsrCtx;
-import net.java.html.boot.BrowserBuilder;
-import net.java.html.js.JavaScriptBody;
-import org.apidesign.html.boot.impl.FnContext;
-import org.apidesign.html.boot.spi.Fn;
-import org.apidesign.html.context.spi.Contexts;
-import org.apidesign.html.json.spi.Technology;
-import org.apidesign.html.json.spi.Transfer;
-import org.apidesign.html.json.spi.WSTransfer;
-import org.apidesign.html.json.tck.KOTest;
-import org.apidesign.html.json.tck.KnockoutTCK;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.openide.util.lookup.ServiceProvider;
-import org.testng.annotations.Factory;
-import static org.testng.Assert.*;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@ServiceProvider(service = KnockoutTCK.class)
-public final class KnockoutFXTest extends KnockoutTCK {
-    private static Class<?> browserClass;
-    private static Fn.Presenter browserContext;
-    
-    public KnockoutFXTest() {
-    }
-    
-    @Factory public static Object[] compatibilityTests() throws Exception {
-        Class[] arr = testClasses();
-        for (int i = 0; i < arr.length; i++) {
-            assertEquals(
-                arr[i].getClassLoader(),
-                KnockoutFXTest.class.getClassLoader(),
-                "All classes loaded by the same classloader"
-            );
-        }
-        
-        URI uri = DynamicHTTP.initServer();
-    
-        final BrowserBuilder bb = BrowserBuilder.newBrowser().loadClass(KnockoutFXTest.class).
-            loadPage(uri.toString()).
-            invoke("initialized");
-        
-        Executors.newSingleThreadExecutor().submit(new Runnable() {
-            @Override
-            public void run() {
-                bb.showAndWait();
-            }
-        });
-        
-        ClassLoader l = getClassLoader();
-        List<Object> res = new ArrayList<Object>();
-        for (int i = 0; i < arr.length; i++) {
-            Class<?> c = Class.forName(arr[i].getName(), true, l);
-            seekKOTests(c, res);
-        }
-        Class<?> c = Class.forName(LessCallbacksCheck.class.getName(), true, l);
-        seekKOTests(c, res);
-        return res.toArray();
-    }
-
-    private static void seekKOTests(Class<?> c, List<Object> res) throws SecurityException, ClassNotFoundException {
-        Class<? extends Annotation> koTest =
-            c.getClassLoader().loadClass(KOTest.class.getName()).
-            asSubclass(Annotation.class);
-        for (Method m : c.getMethods()) {
-            if (m.getAnnotation(koTest) != null) {
-                res.add(new KOFx(browserContext, m));
-            }
-        }
-    }
-
-    static synchronized ClassLoader getClassLoader() throws InterruptedException {
-        while (browserClass == null) {
-            KnockoutFXTest.class.wait();
-        }
-        return browserClass.getClassLoader();
-    }
-    
-    public static synchronized void initialized(Class<?> browserCls) throws Exception {
-        browserClass = browserCls;
-        browserContext = FnContext.currentPresenter();
-        KnockoutFXTest.class.notifyAll();
-    }
-    
-    public static void initialized() throws Exception {
-        Class<?> classpathClass = ClassLoader.getSystemClassLoader().loadClass(KnockoutFXTest.class.getName());
-        Method m = classpathClass.getMethod("initialized", Class.class);
-        m.invoke(null, KnockoutFXTest.class);
-        browserContext = FnContext.currentPresenter();
-    }
-    
-    @Override
-    public BrwsrCtx createContext() {
-        FXContext fx = new FXContext(browserContext);
-        Contexts.Builder cb = Contexts.newBuilder().
-            register(Technology.class, fx, 10).
-            register(Transfer.class, fx, 10);
-        if (fx.areWebSocketsSupported()) {
-            cb.register(WSTransfer.class, fx, 10);
-        }
-        return cb.build();
-    }
-
-    @Override
-    public Object createJSON(Map<String, Object> values) {
-        JSONObject json = new JSONObject();
-        for (Map.Entry<String, Object> entry : values.entrySet()) {
-            try {
-                json.put(entry.getKey(), entry.getValue());
-            } catch (JSONException ex) {
-                throw new IllegalStateException(ex);
-            }
-        }
-        return json;
-    }
-
-    @Override
-    @JavaScriptBody(args = { "s", "args" }, body = ""
-        + "var f = new Function(s); "
-        + "return f.apply(null, args);"
-    )
-    public native Object executeScript(String script, Object[] arguments);
-
-    @JavaScriptBody(args = {  }, body = 
-          "var h;"
-        + "if (!!window && !!window.location && !!window.location.href)\n"
-        + "  h = window.location.href;\n"
-        + "else "
-        + "  h = null;"
-        + "return h;\n"
-    )
-    private static native String findBaseURL();
-    
-    @Override
-    public URI prepareURL(String content, String mimeType, String[] parameters) {
-        try {
-            final URL baseURL = new URL(findBaseURL());
-            StringBuilder sb = new StringBuilder();
-            sb.append("/dynamic?mimeType=").append(mimeType);
-            for (int i = 0; i < parameters.length; i++) {
-                sb.append("&param" + i).append("=").append(parameters[i]);
-            }
-            String mangle = content.replace("\n", "%0a")
-                .replace("\"", "\\\"").replace(" ", "%20");
-            sb.append("&content=").append(mangle);
-
-            URL query = new URL(baseURL, sb.toString());
-            URLConnection c = query.openConnection();
-            BufferedReader br = new BufferedReader(new InputStreamReader(c.getInputStream()));
-            URI connectTo = new URI(br.readLine());
-            return connectTo;
-        } catch (IOException ex) {
-            throw new IllegalStateException(ex);
-        } catch (URISyntaxException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    @Override
-    public boolean canFailWebSocketTest() {
-        try {
-            Class.forName("java.util.function.Function");
-            return false;
-        } catch (ClassNotFoundException ex) {
-            // running on JDK7, FX WebView WebSocket impl does not work
-            return true;
-        }
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/test/java/org/apidesign/html/kofx/LessCallbacksCheck.java
--- a/ko-fx/src/test/java/org/apidesign/html/kofx/LessCallbacksCheck.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.kofx;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import net.java.html.json.ComputedProperty;
-import net.java.html.json.Model;
-import net.java.html.json.Property;
-import org.apidesign.html.json.tck.KOTest;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Model(className = "LessCalls", properties = {
-    @Property(name = "value", type = int.class)
-})
-public class LessCallbacksCheck {
-    private static StringWriter sw;
-    
-    @ComputedProperty static int plusOne(int value) {
-        if (sw == null) {
-            sw = new StringWriter();
-        }
-        new Exception("Who calls me?").printStackTrace(
-            new PrintWriter(sw)
-        );
-        return value + 1;
-    }
-    
-    @KOTest public void dontCallForInitialValueBackToJavaVM() {
-        LessCalls m = new LessCalls(10).applyBindings();
-        assert m.getPlusOne() == 11 : "Expecting 11: " + m.getPlusOne();
-        
-        assert sw != null : "StringWriter should be initialized: " + sw;
-        
-        if (sw.toString().contains("$JsCallbacks$")) {
-            assert false : "Don't call for initial value via JsCallbacks:\n" + sw;
-        }
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/test/java/org/netbeans/html/kofx/DynamicHTTP.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-fx/src/test/java/org/netbeans/html/kofx/DynamicHTTP.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,259 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.kofx;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.glassfish.grizzly.PortRange;
+import org.glassfish.grizzly.http.server.HttpHandler;
+import org.glassfish.grizzly.http.server.HttpServer;
+import org.glassfish.grizzly.http.server.NetworkListener;
+import org.glassfish.grizzly.http.server.Request;
+import org.glassfish.grizzly.http.server.Response;
+import org.glassfish.grizzly.http.server.ServerConfiguration;
+import org.glassfish.grizzly.websockets.WebSocket;
+import org.glassfish.grizzly.websockets.WebSocketAddOn;
+import org.glassfish.grizzly.websockets.WebSocketApplication;
+import org.glassfish.grizzly.websockets.WebSocketEngine;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class DynamicHTTP extends HttpHandler {
+    private static final Logger LOG = Logger.getLogger(DynamicHTTP.class.getName());
+    private static int resourcesCount;
+    private static List<Resource> resources;
+    private static ServerConfiguration conf;
+    private static HttpServer server;
+    
+    private DynamicHTTP() {
+    }
+    
+    static URI initServer() throws Exception {
+        server = HttpServer.createSimpleServer(null, new PortRange(8080, 65535));
+        final WebSocketAddOn addon = new WebSocketAddOn();
+        for (NetworkListener listener : server.getListeners()) {
+            listener.registerAddOn(addon);
+        }        
+        resources = new ArrayList<Resource>();
+
+        conf = server.getServerConfiguration();
+        final DynamicHTTP dh = new DynamicHTTP();
+
+        conf.addHttpHandler(dh, "/");
+        
+        server.start();
+
+        return pageURL("http", server, "/test.html");
+    }
+    
+    @Override
+    public void service(Request request, Response response) throws Exception {
+        if ("/test.html".equals(request.getRequestURI())) {
+            response.setContentType("text/html");
+            final InputStream is = DynamicHTTP.class.getResourceAsStream("test.html");
+            copyStream(is, response.getOutputStream(), null);
+            return;
+        }
+        if ("/dynamic".equals(request.getRequestURI())) {
+            String mimeType = request.getParameter("mimeType");
+            List<String> params = new ArrayList<String>();
+            boolean webSocket = false;
+            for (int i = 0;; i++) {
+                String p = request.getParameter("param" + i);
+                if (p == null) {
+                    break;
+                }
+                if ("protocol:ws".equals(p)) {
+                    webSocket = true;
+                    continue;
+                }
+                params.add(p);
+            }
+            final String cnt = request.getParameter("content");
+            String mangle = cnt.replace("%20", " ").replace("%0A", "\n");
+            ByteArrayInputStream is = new ByteArrayInputStream(mangle.getBytes("UTF-8"));
+            URI url;
+            final Resource res = new Resource(is, mimeType, "/dynamic/res" + ++resourcesCount, params.toArray(new String[params.size()]));
+            if (webSocket) {
+                url = registerWebSocket(res);
+            } else {
+                url = registerResource(res);
+            }
+            response.getWriter().write(url.toString());
+            response.getWriter().write("\n");
+            return;
+        }
+
+        for (Resource r : resources) {
+            if (r.httpPath.equals(request.getRequestURI())) {
+                response.setContentType(r.httpType);
+                r.httpContent.reset();
+                String[] params = null;
+                if (r.parameters.length != 0) {
+                    params = new String[r.parameters.length];
+                    for (int i = 0; i < r.parameters.length; i++) {
+                        params[i] = request.getParameter(r.parameters[i]);
+                        if (params[i] == null) {
+                            if ("http.method".equals(r.parameters[i])) {
+                                params[i] = request.getMethod().toString();
+                            } else if ("http.requestBody".equals(r.parameters[i])) {
+                                Reader rdr = request.getReader();
+                                StringBuilder sb = new StringBuilder();
+                                for (;;) {
+                                    int ch = rdr.read();
+                                    if (ch == -1) {
+                                        break;
+                                    }
+                                    sb.append((char) ch);
+                                }
+                                params[i] = sb.toString();
+                            }
+                        }
+                        if (params[i] == null) {
+                            params[i] = "null";
+                        }
+                    }
+                }
+
+                copyStream(r.httpContent, response.getOutputStream(), null, params);
+            }
+        }
+    }
+    
+    private URI registerWebSocket(Resource r) {
+        WebSocketEngine.getEngine().register("", r.httpPath, new WS(r));
+        return pageURL("ws", server, r.httpPath);
+    }
+
+    private URI registerResource(Resource r) {
+        if (!resources.contains(r)) {
+            resources.add(r);
+            conf.addHttpHandler(this, r.httpPath);
+        }
+        return pageURL("http", server, r.httpPath);
+    }
+    
+    private static URI pageURL(String proto, HttpServer server, final String page) {
+        NetworkListener listener = server.getListeners().iterator().next();
+        int port = listener.getPort();
+        try {
+            return new URI(proto + "://localhost:" + port + page);
+        } catch (URISyntaxException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+    
+    static final class Resource {
+
+        final InputStream httpContent;
+        final String httpType;
+        final String httpPath;
+        final String[] parameters;
+
+        Resource(InputStream httpContent, String httpType, String httpPath,
+            String[] parameters) {
+            httpContent.mark(Integer.MAX_VALUE);
+            this.httpContent = httpContent;
+            this.httpType = httpType;
+            this.httpPath = httpPath;
+            this.parameters = parameters;
+        }
+    }
+
+    static void copyStream(InputStream is, OutputStream os, String baseURL, String... params) throws IOException {
+        for (;;) {
+            int ch = is.read();
+            if (ch == -1) {
+                break;
+            }
+            if (ch == '$' && params.length > 0) {
+                int cnt = is.read() - '0';
+                if (baseURL != null && cnt == 'U' - '0') {
+                    os.write(baseURL.getBytes("UTF-8"));
+                } else {
+                    if (cnt >= 0 && cnt < params.length) {
+                        os.write(params[cnt].getBytes("UTF-8"));
+                    } else {
+                        os.write('$');
+                        os.write(cnt + '0');
+                    }
+                }
+            } else {
+                os.write(ch);
+            }
+        }
+    }
+    
+    private static class WS extends WebSocketApplication {
+        private final Resource r;
+
+        private WS(Resource r) {
+            this.r = r;
+        }
+
+        @Override
+        public void onMessage(WebSocket socket, String text) {
+            try {
+                r.httpContent.reset();
+                ByteArrayOutputStream out = new ByteArrayOutputStream();
+                copyStream(r.httpContent, out, null, text);
+                String s = new String(out.toByteArray(), "UTF-8");
+                socket.send(s);
+            } catch (IOException ex) {
+                LOG.log(Level.WARNING, "Error processing message " + text, ex);
+            }
+        }
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/test/java/org/netbeans/html/kofx/KOFx.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-fx/src/test/java/org/netbeans/html/kofx/KOFx.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,118 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.kofx;
+
+import java.io.Closeable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import javafx.application.Platform;
+import org.apidesign.html.boot.spi.Fn;
+import org.testng.ITest;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class KOFx implements ITest, Runnable {
+    private final Fn.Presenter p;
+    private final Method m;
+    private Object result;
+    private Object inst;
+    private int count;
+
+    KOFx(Fn.Presenter p, Method m) {
+        this.p = p;
+        this.m = m;
+    }
+
+    @Override
+    public String getTestName() {
+        return m.getName();
+    }
+
+    @Test
+    public synchronized void executeTest() throws Exception {
+        if (result == null) {
+            Platform.runLater(this);
+            wait();
+        }
+        if (result instanceof Exception) {
+            throw (Exception)result;
+        }
+        if (result instanceof Error) {
+            throw (Error)result;
+        }
+    }
+
+    @Override
+    public synchronized void run() {
+        boolean notify = true;
+        try (Closeable a = Fn.activate(p)) {
+            if (inst == null) {
+                inst = m.getDeclaringClass().newInstance();
+            }
+            result = m.invoke(inst);
+            if (result == null) {
+                result = this;
+            }
+        } catch (InvocationTargetException ex) {
+            Throwable r = ex.getTargetException();
+            if (r instanceof InterruptedException) {
+                if (count++ < 10000) {
+                    notify = false;
+                    Platform.runLater(this);
+                    return;
+                }
+            }
+            result = r;
+        } catch (Exception ex) {
+            result = ex;
+        } finally {
+            if (notify) {
+                notifyAll();
+            }
+        }
+    }
+    
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/test/java/org/netbeans/html/kofx/KnockoutFXTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-fx/src/test/java/org/netbeans/html/kofx/KnockoutFXTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,229 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.kofx;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import net.java.html.BrwsrCtx;
+import net.java.html.boot.BrowserBuilder;
+import net.java.html.js.JavaScriptBody;
+import org.netbeans.html.boot.impl.FnContext;
+import org.apidesign.html.boot.spi.Fn;
+import org.apidesign.html.context.spi.Contexts;
+import org.apidesign.html.json.spi.Technology;
+import org.apidesign.html.json.spi.Transfer;
+import org.apidesign.html.json.spi.WSTransfer;
+import org.apidesign.html.json.tck.KOTest;
+import org.apidesign.html.json.tck.KnockoutTCK;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.openide.util.lookup.ServiceProvider;
+import org.testng.annotations.Factory;
+import static org.testng.Assert.*;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@ServiceProvider(service = KnockoutTCK.class)
+public final class KnockoutFXTest extends KnockoutTCK {
+    private static Class<?> browserClass;
+    private static Fn.Presenter browserContext;
+    
+    public KnockoutFXTest() {
+    }
+    
+    @Factory public static Object[] compatibilityTests() throws Exception {
+        Class[] arr = testClasses();
+        for (int i = 0; i < arr.length; i++) {
+            assertEquals(
+                arr[i].getClassLoader(),
+                KnockoutFXTest.class.getClassLoader(),
+                "All classes loaded by the same classloader"
+            );
+        }
+        
+        URI uri = DynamicHTTP.initServer();
+    
+        final BrowserBuilder bb = BrowserBuilder.newBrowser().loadClass(KnockoutFXTest.class).
+            loadPage(uri.toString()).
+            invoke("initialized");
+        
+        Executors.newSingleThreadExecutor().submit(new Runnable() {
+            @Override
+            public void run() {
+                bb.showAndWait();
+            }
+        });
+        
+        ClassLoader l = getClassLoader();
+        List<Object> res = new ArrayList<Object>();
+        for (int i = 0; i < arr.length; i++) {
+            Class<?> c = Class.forName(arr[i].getName(), true, l);
+            seekKOTests(c, res);
+        }
+        Class<?> c = Class.forName(LessCallbacksCheck.class.getName(), true, l);
+        seekKOTests(c, res);
+        return res.toArray();
+    }
+
+    private static void seekKOTests(Class<?> c, List<Object> res) throws SecurityException, ClassNotFoundException {
+        Class<? extends Annotation> koTest =
+            c.getClassLoader().loadClass(KOTest.class.getName()).
+            asSubclass(Annotation.class);
+        for (Method m : c.getMethods()) {
+            if (m.getAnnotation(koTest) != null) {
+                res.add(new KOFx(browserContext, m));
+            }
+        }
+    }
+
+    static synchronized ClassLoader getClassLoader() throws InterruptedException {
+        while (browserClass == null) {
+            KnockoutFXTest.class.wait();
+        }
+        return browserClass.getClassLoader();
+    }
+    
+    public static synchronized void initialized(Class<?> browserCls) throws Exception {
+        browserClass = browserCls;
+        browserContext = FnContext.currentPresenter();
+        KnockoutFXTest.class.notifyAll();
+    }
+    
+    public static void initialized() throws Exception {
+        Class<?> classpathClass = ClassLoader.getSystemClassLoader().loadClass(KnockoutFXTest.class.getName());
+        Method m = classpathClass.getMethod("initialized", Class.class);
+        m.invoke(null, KnockoutFXTest.class);
+        browserContext = FnContext.currentPresenter();
+    }
+    
+    @Override
+    public BrwsrCtx createContext() {
+        FXContext fx = new FXContext(browserContext);
+        Contexts.Builder cb = Contexts.newBuilder().
+            register(Technology.class, fx, 10).
+            register(Transfer.class, fx, 10);
+        if (fx.areWebSocketsSupported()) {
+            cb.register(WSTransfer.class, fx, 10);
+        }
+        return cb.build();
+    }
+
+    @Override
+    public Object createJSON(Map<String, Object> values) {
+        JSONObject json = new JSONObject();
+        for (Map.Entry<String, Object> entry : values.entrySet()) {
+            try {
+                json.put(entry.getKey(), entry.getValue());
+            } catch (JSONException ex) {
+                throw new IllegalStateException(ex);
+            }
+        }
+        return json;
+    }
+
+    @Override
+    @JavaScriptBody(args = { "s", "args" }, body = ""
+        + "var f = new Function(s); "
+        + "return f.apply(null, args);"
+    )
+    public native Object executeScript(String script, Object[] arguments);
+
+    @JavaScriptBody(args = {  }, body = 
+          "var h;"
+        + "if (!!window && !!window.location && !!window.location.href)\n"
+        + "  h = window.location.href;\n"
+        + "else "
+        + "  h = null;"
+        + "return h;\n"
+    )
+    private static native String findBaseURL();
+    
+    @Override
+    public URI prepareURL(String content, String mimeType, String[] parameters) {
+        try {
+            final URL baseURL = new URL(findBaseURL());
+            StringBuilder sb = new StringBuilder();
+            sb.append("/dynamic?mimeType=").append(mimeType);
+            for (int i = 0; i < parameters.length; i++) {
+                sb.append("&param" + i).append("=").append(parameters[i]);
+            }
+            String mangle = content.replace("\n", "%0a")
+                .replace("\"", "\\\"").replace(" ", "%20");
+            sb.append("&content=").append(mangle);
+
+            URL query = new URL(baseURL, sb.toString());
+            URLConnection c = query.openConnection();
+            BufferedReader br = new BufferedReader(new InputStreamReader(c.getInputStream()));
+            URI connectTo = new URI(br.readLine());
+            return connectTo;
+        } catch (IOException ex) {
+            throw new IllegalStateException(ex);
+        } catch (URISyntaxException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+
+    @Override
+    public boolean canFailWebSocketTest() {
+        try {
+            Class.forName("java.util.function.Function");
+            return false;
+        } catch (ClassNotFoundException ex) {
+            // running on JDK7, FX WebView WebSocket impl does not work
+            return true;
+        }
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/test/java/org/netbeans/html/kofx/LessCallbacksCheck.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-fx/src/test/java/org/netbeans/html/kofx/LessCallbacksCheck.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,82 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.kofx;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import net.java.html.json.ComputedProperty;
+import net.java.html.json.Model;
+import net.java.html.json.Property;
+import org.apidesign.html.json.tck.KOTest;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Model(className = "LessCalls", properties = {
+    @Property(name = "value", type = int.class)
+})
+public class LessCallbacksCheck {
+    private static StringWriter sw;
+    
+    @ComputedProperty static int plusOne(int value) {
+        if (sw == null) {
+            sw = new StringWriter();
+        }
+        new Exception("Who calls me?").printStackTrace(
+            new PrintWriter(sw)
+        );
+        return value + 1;
+    }
+    
+    @KOTest public void dontCallForInitialValueBackToJavaVM() {
+        LessCalls m = new LessCalls(10).applyBindings();
+        assert m.getPlusOne() == 11 : "Expecting 11: " + m.getPlusOne();
+        
+        assert sw != null : "StringWriter should be initialized: " + sw;
+        
+        if (sw.toString().contains("$JsCallbacks$")) {
+            assert false : "Don't call for initial value via JsCallbacks:\n" + sw;
+        }
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/test/resources/org/apidesign/html/kofx/test.html
--- a/ko-fx/src/test/resources/org/apidesign/html/kofx/test.html	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-<!--
-
-    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-    Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-    Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-    Other names may be trademarks of their respective owners.
-
-    The contents of this file are subject to the terms of either the GNU
-    General Public License Version 2 only ("GPL") or the Common
-    Development and Distribution License("CDDL") (collectively, the
-    "License"). You may not use this file except in compliance with the
-    License. You can obtain a copy of the License at
-    http://www.netbeans.org/cddl-gplv2.html
-    or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-    specific language governing permissions and limitations under the
-    License.  When distributing the software, include this License Header
-    Notice in each file and include the License file at
-    nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-    particular file as subject to the "Classpath" exception as provided
-    by Oracle in the GPL Version 2 section of the License file that
-    accompanied this code. If applicable, add the following below the
-    License Header, with the fields enclosed by brackets [] replaced by
-    your own identifying information:
-    "Portions Copyrighted [year] [name of copyright owner]"
-
-    Contributor(s):
-
-    The Original Software is NetBeans. The Initial Developer of the Original
-    Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
-
-    If you wish your version of this file to be governed by only the CDDL
-    or only the GPL Version 2, indicate your decision by adding
-    "[Contributor] elects to include this software in this distribution
-    under the [CDDL or GPL Version 2] license." If you do not indicate a
-    single choice of license, a recipient has the option to distribute
-    your version of this file under either the CDDL, the GPL Version 2 or
-    to extend the choice of license to its licensees as provided above.
-    However, if you add GPL Version 2 code and therefore, elected the GPL
-    Version 2 license, then the option applies only if the new code is
-    made subject to such option by the copyright holder.
-
--->
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Knockout.fx Execution Harness</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <meta name="viewport" content="width=device-width">
-    </head>
-    <body>
-        <h1>Knockout.fx Execution Harness</h1>
-    </body>
-    <script></script>
-</html>
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-fx/src/test/resources/org/netbeans/html/kofx/test.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-fx/src/test/resources/org/netbeans/html/kofx/test.html	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,56 @@
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+
+    Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+    Other names may be trademarks of their respective owners.
+
+    The contents of this file are subject to the terms of either the GNU
+    General Public License Version 2 only ("GPL") or the Common
+    Development and Distribution License("CDDL") (collectively, the
+    "License"). You may not use this file except in compliance with the
+    License. You can obtain a copy of the License at
+    http://www.netbeans.org/cddl-gplv2.html
+    or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+    specific language governing permissions and limitations under the
+    License.  When distributing the software, include this License Header
+    Notice in each file and include the License file at
+    nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+    particular file as subject to the "Classpath" exception as provided
+    by Oracle in the GPL Version 2 section of the License file that
+    accompanied this code. If applicable, add the following below the
+    License Header, with the fields enclosed by brackets [] replaced by
+    your own identifying information:
+    "Portions Copyrighted [year] [name of copyright owner]"
+
+    Contributor(s):
+
+    The Original Software is NetBeans. The Initial Developer of the Original
+    Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+
+    If you wish your version of this file to be governed by only the CDDL
+    or only the GPL Version 2, indicate your decision by adding
+    "[Contributor] elects to include this software in this distribution
+    under the [CDDL or GPL Version 2] license." If you do not indicate a
+    single choice of license, a recipient has the option to distribute
+    your version of this file under either the CDDL, the GPL Version 2 or
+    to extend the choice of license to its licensees as provided above.
+    However, if you add GPL Version 2 code and therefore, elected the GPL
+    Version 2 license, then the option applies only if the new code is
+    made subject to such option by the copyright holder.
+
+-->
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Knockout.fx Execution Harness</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width">
+    </head>
+    <body>
+        <h1>Knockout.fx Execution Harness</h1>
+    </body>
+    <script></script>
+</html>
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-ws-tyrus/src/main/java/org/apidesign/html/wstyrus/TyrusContext.java
--- a/ko-ws-tyrus/src/main/java/org/apidesign/html/wstyrus/TyrusContext.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.wstyrus;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Iterator;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.ContainerProvider;
-import javax.websocket.DeploymentException;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import net.java.html.json.OnReceive;
-import org.apidesign.html.context.spi.Contexts;
-import org.apidesign.html.json.spi.JSONCall;
-import org.apidesign.html.json.spi.WSTransfer;
-import org.apidesign.html.wstyrus.TyrusContext.Comm;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-import org.openide.util.lookup.ServiceProvider;
-
-/** This is an implementation module that provides support for
- * WebSocket protocol for {@link OnReceive} communication end point for
- * JDK7.
- * <p>
- * Don't deal with this module directly, rather use the 
- * {@link OnReceive @OnReceive(url="ws://...", ...)} API to establish your
- * WebSocket connection.
- * <p>
- * There is no need to include this module in your application if you are
- * running on JDK8. JDK8 WebView provides its own implementation of the
- * WebSocket API based on WebSocket object inside a browser. This is included
- * in the <code>org.apidesign.html:ko-fx:0.5</code> module.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@ServiceProvider(service = Contexts.Provider.class)
-public final class TyrusContext implements Contexts.Provider, WSTransfer<Comm> {
-    @Override
-    public void fillContext(Contexts.Builder context, Class<?> requestor) {
-        // default WebSocket transfer implementation is registered
-        // in ko-fx module with 100, provide this one as a fallback only
-        context.register(WSTransfer.class, this, 1000);
-    }
-
-    @Override
-    public Comm open(String url, JSONCall callback) {
-        try {
-            return new Comm(new URI(url), callback);
-        } catch (URISyntaxException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    @Override
-    public void send(Comm socket, JSONCall data) {
-        socket.session.getAsyncRemote().sendText(data.getMessage());
-    }
-
-    @Override
-    public void close(Comm socket) {
-        try {
-            final Session s = socket.session;
-            if (s != null) {
-                s.close();
-            }
-        } catch (IOException ex) {
-            socket.callback.notifyError(ex);
-        }
-    }
-    
-    /** Implementation class in an implementation. Represents a {@link ClientEndpoint} of the
-     * WebSocket channel. You are unlikely to get on hold of it.
-     */
-    @ClientEndpoint
-    public static final class Comm {
-        private final JSONCall callback;
-        private Session session;
-
-        Comm(final URI url, JSONCall callback) {
-            this.callback = callback;
-            try {
-                final WebSocketContainer c = ContainerProvider.getWebSocketContainer();
-                c.connectToServer(Comm.this, url);
-            } catch (DeploymentException | IOException ex) {
-                wasAnError(ex);
-            }
-        }
-
-        @OnOpen
-        public synchronized void open(Session s) {
-            this.session = s;
-            callback.notifySuccess(null);
-        }
-
-        @OnClose
-        public void close() {
-            this.session = null;
-            callback.notifyError(null);
-        }
-
-        @OnMessage
-        public void message(final String orig, Session s) {
-            Object json;
-            String data = orig.trim();
-            try {
-                JSONTokener tok = new JSONTokener(data);
-                Object obj = data.startsWith("[") ? new JSONArray(tok) : new JSONObject(tok);
-                json = convertToArray(obj);
-            } catch (JSONException ex) {
-                json = data;
-            }
-            callback.notifySuccess(json);
-        }
-
-        @OnError
-        public void wasAnError(Throwable t) {
-            callback.notifyError(t);
-        }
-
-        static Object convertToArray(Object o) throws JSONException {
-            if (o instanceof JSONArray) {
-                JSONArray ja = (JSONArray) o;
-                Object[] arr = new Object[ja.length()];
-                for (int i = 0; i < arr.length; i++) {
-                    arr[i] = convertToArray(ja.get(i));
-                }
-                return arr;
-            } else if (o instanceof JSONObject) {
-                JSONObject obj = (JSONObject) o;
-                Iterator it = obj.keys();
-                while (it.hasNext()) {
-                    String key = (String) it.next();
-                    obj.put(key, convertToArray(obj.get(key)));
-                }
-                return obj;
-            } else {
-                return o;
-            }
-        }
-        
-    } // end of Comm
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-ws-tyrus/src/main/java/org/netbeans/html/wstyrus/TyrusContext.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-ws-tyrus/src/main/java/org/netbeans/html/wstyrus/TyrusContext.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,190 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.wstyrus;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Iterator;
+import javax.websocket.ClientEndpoint;
+import javax.websocket.ContainerProvider;
+import javax.websocket.DeploymentException;
+import javax.websocket.OnClose;
+import javax.websocket.OnError;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.WebSocketContainer;
+import net.java.html.json.OnReceive;
+import org.apidesign.html.context.spi.Contexts;
+import org.apidesign.html.json.spi.JSONCall;
+import org.apidesign.html.json.spi.WSTransfer;
+import org.netbeans.html.wstyrus.TyrusContext.Comm;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.openide.util.lookup.ServiceProvider;
+
+/** This is an implementation module that provides support for
+ * WebSocket protocol for {@link OnReceive} communication end point for
+ * JDK7.
+ * <p>
+ * Don't deal with this module directly, rather use the 
+ * {@link OnReceive @OnReceive(url="ws://...", ...)} API to establish your
+ * WebSocket connection.
+ * <p>
+ * There is no need to include this module in your application if you are
+ * running on JDK8. JDK8 WebView provides its own implementation of the
+ * WebSocket API based on WebSocket object inside a browser. This is included
+ * in the <code>org.apidesign.html:ko-fx:0.5</code> module.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@ServiceProvider(service = Contexts.Provider.class)
+public final class TyrusContext implements Contexts.Provider, WSTransfer<Comm> {
+    @Override
+    public void fillContext(Contexts.Builder context, Class<?> requestor) {
+        // default WebSocket transfer implementation is registered
+        // in ko-fx module with 100, provide this one as a fallback only
+        context.register(WSTransfer.class, this, 1000);
+    }
+
+    @Override
+    public Comm open(String url, JSONCall callback) {
+        try {
+            return new Comm(new URI(url), callback);
+        } catch (URISyntaxException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+
+    @Override
+    public void send(Comm socket, JSONCall data) {
+        socket.session.getAsyncRemote().sendText(data.getMessage());
+    }
+
+    @Override
+    public void close(Comm socket) {
+        try {
+            final Session s = socket.session;
+            if (s != null) {
+                s.close();
+            }
+        } catch (IOException ex) {
+            socket.callback.notifyError(ex);
+        }
+    }
+    
+    /** Implementation class in an implementation. Represents a {@link ClientEndpoint} of the
+     * WebSocket channel. You are unlikely to get on hold of it.
+     */
+    @ClientEndpoint
+    public static final class Comm {
+        private final JSONCall callback;
+        private Session session;
+
+        Comm(final URI url, JSONCall callback) {
+            this.callback = callback;
+            try {
+                final WebSocketContainer c = ContainerProvider.getWebSocketContainer();
+                c.connectToServer(Comm.this, url);
+            } catch (DeploymentException | IOException ex) {
+                wasAnError(ex);
+            }
+        }
+
+        @OnOpen
+        public synchronized void open(Session s) {
+            this.session = s;
+            callback.notifySuccess(null);
+        }
+
+        @OnClose
+        public void close() {
+            this.session = null;
+            callback.notifyError(null);
+        }
+
+        @OnMessage
+        public void message(final String orig, Session s) {
+            Object json;
+            String data = orig.trim();
+            try {
+                JSONTokener tok = new JSONTokener(data);
+                Object obj = data.startsWith("[") ? new JSONArray(tok) : new JSONObject(tok);
+                json = convertToArray(obj);
+            } catch (JSONException ex) {
+                json = data;
+            }
+            callback.notifySuccess(json);
+        }
+
+        @OnError
+        public void wasAnError(Throwable t) {
+            callback.notifyError(t);
+        }
+
+        static Object convertToArray(Object o) throws JSONException {
+            if (o instanceof JSONArray) {
+                JSONArray ja = (JSONArray) o;
+                Object[] arr = new Object[ja.length()];
+                for (int i = 0; i < arr.length; i++) {
+                    arr[i] = convertToArray(ja.get(i));
+                }
+                return arr;
+            } else if (o instanceof JSONObject) {
+                JSONObject obj = (JSONObject) o;
+                Iterator it = obj.keys();
+                while (it.hasNext()) {
+                    String key = (String) it.next();
+                    obj.put(key, convertToArray(obj.get(key)));
+                }
+                return obj;
+            } else {
+                return o;
+            }
+        }
+        
+    } // end of Comm
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-ws-tyrus/src/test/java/org/apidesign/html/wstyrus/TyrusDynamicHTTP.java
--- a/ko-ws-tyrus/src/test/java/org/apidesign/html/wstyrus/TyrusDynamicHTTP.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,260 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.wstyrus;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.glassfish.grizzly.PortRange;
-import org.glassfish.grizzly.http.server.HttpHandler;
-import org.glassfish.grizzly.http.server.HttpServer;
-import org.glassfish.grizzly.http.server.NetworkListener;
-import org.glassfish.grizzly.http.server.Request;
-import org.glassfish.grizzly.http.server.Response;
-import org.glassfish.grizzly.http.server.ServerConfiguration;
-import org.glassfish.grizzly.websockets.WebSocket;
-import org.glassfish.grizzly.websockets.WebSocketAddOn;
-import org.glassfish.grizzly.websockets.WebSocketApplication;
-import org.glassfish.grizzly.websockets.WebSocketEngine;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-final class TyrusDynamicHTTP extends HttpHandler {
-    private static int resourcesCount;
-    private static List<Resource> resources;
-    private static ServerConfiguration conf;
-    private static HttpServer server;
-    
-    private TyrusDynamicHTTP() {
-    }
-    
-    static URI initServer() throws Exception {
-        server = HttpServer.createSimpleServer(null, new PortRange(8080, 65535));
-        final WebSocketAddOn addon = new WebSocketAddOn();
-        for (NetworkListener listener : server.getListeners()) {
-            listener.registerAddOn(addon);
-        }        
-        resources = new ArrayList<Resource>();
-
-        conf = server.getServerConfiguration();
-        final TyrusDynamicHTTP dh = new TyrusDynamicHTTP();
-
-        conf.addHttpHandler(dh, "/");
-        
-        server.start();
-
-        return pageURL("http", server, "/test.html");
-    }
-    
-    @Override
-    public void service(Request request, Response response) throws Exception {
-        if ("/test.html".equals(request.getRequestURI())) {
-            response.setContentType("text/html");
-            final InputStream is = TyrusDynamicHTTP.class.getResourceAsStream("test.html");
-            copyStream(is, response.getOutputStream(), null);
-            return;
-        }
-        if ("/dynamic".equals(request.getRequestURI())) {
-            String mimeType = request.getParameter("mimeType");
-            List<String> params = new ArrayList<String>();
-            boolean webSocket = false;
-            for (int i = 0;; i++) {
-                String p = request.getParameter("param" + i);
-                if (p == null) {
-                    break;
-                }
-                if ("protocol:ws".equals(p)) {
-                    webSocket = true;
-                    continue;
-                }
-                params.add(p);
-            }
-            final String cnt = request.getParameter("content");
-            String mangle = cnt.replace("%20", " ").replace("%0A", "\n");
-            ByteArrayInputStream is = new ByteArrayInputStream(mangle.getBytes("UTF-8"));
-            URI url;
-            final Resource res = new Resource(is, mimeType, "/dynamic/res" + ++resourcesCount, params.toArray(new String[params.size()]));
-            if (webSocket) {
-                url = registerWebSocket(res);
-            } else {
-                url = registerResource(res);
-            }
-            response.getWriter().write(url.toString());
-            response.getWriter().write("\n");
-            return;
-        }
-
-        for (Resource r : resources) {
-            if (r.httpPath.equals(request.getRequestURI())) {
-                response.setContentType(r.httpType);
-                r.httpContent.reset();
-                String[] params = null;
-                if (r.parameters.length != 0) {
-                    params = new String[r.parameters.length];
-                    for (int i = 0; i < r.parameters.length; i++) {
-                        params[i] = request.getParameter(r.parameters[i]);
-                        if (params[i] == null) {
-                            if ("http.method".equals(r.parameters[i])) {
-                                params[i] = request.getMethod().toString();
-                            } else if ("http.requestBody".equals(r.parameters[i])) {
-                                Reader rdr = request.getReader();
-                                StringBuilder sb = new StringBuilder();
-                                for (;;) {
-                                    int ch = rdr.read();
-                                    if (ch == -1) {
-                                        break;
-                                    }
-                                    sb.append((char) ch);
-                                }
-                                params[i] = sb.toString();
-                            }
-                        }
-                        if (params[i] == null) {
-                            params[i] = "null";
-                        }
-                    }
-                }
-
-                copyStream(r.httpContent, response.getOutputStream(), null, params);
-            }
-        }
-    }
-    
-    private URI registerWebSocket(Resource r) {
-        WebSocketEngine.getEngine().register("", r.httpPath, new WS(r));
-        return pageURL("ws", server, r.httpPath);
-    }
-
-    private URI registerResource(Resource r) {
-        if (!resources.contains(r)) {
-            resources.add(r);
-            conf.addHttpHandler(this, r.httpPath);
-        }
-        return pageURL("http", server, r.httpPath);
-    }
-    
-    private static URI pageURL(String proto, HttpServer server, final String page) {
-        NetworkListener listener = server.getListeners().iterator().next();
-        int port = listener.getPort();
-        try {
-            return new URI(proto + "://localhost:" + port + page);
-        } catch (URISyntaxException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-    
-    static final class Resource {
-
-        final InputStream httpContent;
-        final String httpType;
-        final String httpPath;
-        final String[] parameters;
-
-        Resource(InputStream httpContent, String httpType, String httpPath,
-            String[] parameters) {
-            httpContent.mark(Integer.MAX_VALUE);
-            this.httpContent = httpContent;
-            this.httpType = httpType;
-            this.httpPath = httpPath;
-            this.parameters = parameters;
-        }
-    }
-
-    static void copyStream(InputStream is, OutputStream os, String baseURL, String... params) throws IOException {
-        for (;;) {
-            int ch = is.read();
-            if (ch == -1) {
-                break;
-            }
-            if (ch == '$' && params.length > 0) {
-                int cnt = is.read() - '0';
-                if (baseURL != null && cnt == 'U' - '0') {
-                    os.write(baseURL.getBytes("UTF-8"));
-                } else {
-                    if (cnt >= 0 && cnt < params.length) {
-                        os.write(params[cnt].getBytes("UTF-8"));
-                    } else {
-                        os.write('$');
-                        os.write(cnt + '0');
-                    }
-                }
-            } else {
-                os.write(ch);
-            }
-        }
-    }
-    
-    private static class WS extends WebSocketApplication {
-        private final Resource r;
-
-        private WS(Resource r) {
-            this.r = r;
-        }
-
-        @Override
-        public void onMessage(WebSocket socket, String text) {
-            try {
-                r.httpContent.reset();
-                ByteArrayOutputStream out = new ByteArrayOutputStream();
-                copyStream(r.httpContent, out, null, text);
-                String s = new String(out.toByteArray(), "UTF-8");
-                socket.send(s);
-            } catch (IOException ex) {
-                LOG.log(Level.WARNING, null, ex);
-            }
-        }
-        private static final Logger LOG = Logger.getLogger(WS.class.getName());
-        
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-ws-tyrus/src/test/java/org/apidesign/html/wstyrus/TyrusFX.java
--- a/ko-ws-tyrus/src/test/java/org/apidesign/html/wstyrus/TyrusFX.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.wstyrus;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import javafx.application.Platform;
-import org.apidesign.html.boot.impl.FnContext;
-import org.apidesign.html.boot.spi.Fn;
-import org.testng.ITest;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class TyrusFX implements ITest, Runnable {
-    private final Fn.Presenter p;
-    private final Method m;
-    private Object result;
-    private Object inst;
-    private int count;
-
-    TyrusFX(Fn.Presenter p, Method m) {
-        this.p = p;
-        this.m = m;
-    }
-
-    @Override
-    public String getTestName() {
-        return m.getName();
-    }
-
-    @Test
-    public synchronized void executeTest() throws Exception {
-        if (result == null) {
-            Platform.runLater(this);
-            wait();
-        }
-        if (result instanceof Exception) {
-            throw (Exception)result;
-        }
-        if (result instanceof Error) {
-            throw (Error)result;
-        }
-    }
-
-    @Override
-    public synchronized void run() {
-        boolean notify = true;
-        try {
-            FnContext.currentPresenter(p);
-            if (inst == null) {
-                inst = m.getDeclaringClass().newInstance();
-            }
-            result = m.invoke(inst);
-            if (result == null) {
-                result = this;
-            }
-        } catch (InvocationTargetException ex) {
-            Throwable r = ex.getTargetException();
-            if (r instanceof InterruptedException) {
-                if (count++ < 10000) {
-                    notify = false;
-                    Platform.runLater(this);
-                    return;
-                }
-            }
-            result = r;
-        } catch (Exception ex) {
-            result = ex;
-        } finally {
-            if (notify) {
-                notifyAll();
-            }
-            FnContext.currentPresenter(null);
-        }
-    }
-    
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-ws-tyrus/src/test/java/org/apidesign/html/wstyrus/TyrusKnockoutTest.java
--- a/ko-ws-tyrus/src/test/java/org/apidesign/html/wstyrus/TyrusKnockoutTest.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.wstyrus;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Executors;
-import net.java.html.BrwsrCtx;
-import net.java.html.boot.BrowserBuilder;
-import net.java.html.js.JavaScriptBody;
-import org.apidesign.html.boot.impl.FnContext;
-import org.apidesign.html.boot.impl.FnUtils;
-import org.apidesign.html.boot.spi.Fn;
-import org.apidesign.html.context.spi.Contexts;
-import org.apidesign.html.json.spi.Technology;
-import org.apidesign.html.json.spi.Transfer;
-import org.apidesign.html.json.spi.WSTransfer;
-import org.apidesign.html.json.tck.KOTest;
-import org.apidesign.html.json.tck.KnockoutTCK;
-import org.apidesign.html.kofx.FXContext;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.openide.util.lookup.ServiceProvider;
-import org.testng.annotations.Factory;
-import static org.testng.Assert.*;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@ServiceProvider(service = KnockoutTCK.class)
-public final class TyrusKnockoutTest extends KnockoutTCK {
-    private static Class<?> browserClass;
-    private static Fn.Presenter browserContext;
-    
-    public TyrusKnockoutTest() {
-    }
-    
-    @Factory public static Object[] compatibilityTests() throws Exception {
-        Class[] arr = testClasses();
-        for (int i = 0; i < arr.length; i++) {
-            assertEquals(
-                arr[i].getClassLoader(),
-                TyrusKnockoutTest.class.getClassLoader(),
-                "All classes loaded by the same classloader"
-            );
-        }
-        
-        URI uri = TyrusDynamicHTTP.initServer();
-    
-        final BrowserBuilder bb = BrowserBuilder.newBrowser().loadClass(TyrusKnockoutTest.class).
-            loadPage(uri.toString()).
-            invoke("initialized");
-        
-        Executors.newSingleThreadExecutor().submit(new Runnable() {
-            @Override
-            public void run() {
-                bb.showAndWait();
-            }
-        });
-        
-        ClassLoader l = getClassLoader();
-        List<Object> res = new ArrayList<Object>();
-        for (int i = 0; i < arr.length; i++) {
-            Class<?> c = Class.forName(arr[i].getName(), true, l);
-            Class<? extends Annotation> koTest = 
-                c.getClassLoader().loadClass(KOTest.class.getName()).
-                asSubclass(Annotation.class);
-            for (Method m : c.getMethods()) {
-                if (m.getAnnotation(koTest) != null) {
-                    res.add(new TyrusFX(browserContext, m));
-                }
-            }
-        }
-        return res.toArray();
-    }
-
-    static synchronized ClassLoader getClassLoader() throws InterruptedException {
-        while (browserClass == null) {
-            TyrusKnockoutTest.class.wait();
-        }
-        return browserClass.getClassLoader();
-    }
-    
-    public static synchronized void initialized(Class<?> browserCls) throws Exception {
-        browserClass = browserCls;
-        browserContext = FnContext.currentPresenter();
-        TyrusKnockoutTest.class.notifyAll();
-    }
-    
-    public static void initialized() throws Exception {
-        Class<?> classpathClass = ClassLoader.getSystemClassLoader().loadClass(TyrusKnockoutTest.class.getName());
-        Method m = classpathClass.getMethod("initialized", Class.class);
-        m.invoke(null, TyrusKnockoutTest.class);
-        browserContext = FnContext.currentPresenter();
-    }
-    
-    @Override
-    public BrwsrCtx createContext() {
-        FXContext fx = new FXContext(browserContext);
-        TyrusContext tc = new TyrusContext();
-        Contexts.Builder cb = Contexts.newBuilder().
-            register(Technology.class, fx, 10).
-            register(Transfer.class, fx, 10).
-            register(WSTransfer.class, tc, 10);
-        return cb.build();
-    }
-
-    @Override
-    public Object createJSON(Map<String, Object> values) {
-        JSONObject json = new JSONObject();
-        for (Map.Entry<String, Object> entry : values.entrySet()) {
-            try {
-                json.put(entry.getKey(), entry.getValue());
-            } catch (JSONException ex) {
-                throw new IllegalStateException(ex);
-            }
-        }
-        return json;
-    }
-
-    @Override
-    @JavaScriptBody(args = { "s", "args" }, body = ""
-        + "var f = new Function(s); "
-        + "return f.apply(null, args);"
-    )
-    public native Object executeScript(String script, Object[] arguments);
-
-    @JavaScriptBody(args = {  }, body = 
-          "var h;"
-        + "if (!!window && !!window.location && !!window.location.href)\n"
-        + "  h = window.location.href;\n"
-        + "else "
-        + "  h = null;"
-        + "return h;\n"
-    )
-    private static native String findBaseURL();
-    
-    @Override
-    public URI prepareURL(String content, String mimeType, String[] parameters) {
-        try {
-            final URL baseURL = new URL(findBaseURL());
-            StringBuilder sb = new StringBuilder();
-            sb.append("/dynamic?mimeType=").append(mimeType);
-            for (int i = 0; i < parameters.length; i++) {
-                sb.append("&param" + i).append("=").append(parameters[i]);
-            }
-            String mangle = content.replace("\n", "%0a")
-                .replace("\"", "\\\"").replace(" ", "%20");
-            sb.append("&content=").append(mangle);
-
-            URL query = new URL(baseURL, sb.toString());
-            URLConnection c = query.openConnection();
-            BufferedReader br = new BufferedReader(new InputStreamReader(c.getInputStream()));
-            URI connectTo = new URI(br.readLine());
-            return connectTo;
-        } catch (IOException ex) {
-            throw new IllegalStateException(ex);
-        } catch (URISyntaxException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-ws-tyrus/src/test/java/org/netbeans/html/wstyrus/TyrusDynamicHTTP.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-ws-tyrus/src/test/java/org/netbeans/html/wstyrus/TyrusDynamicHTTP.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,260 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.wstyrus;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.glassfish.grizzly.PortRange;
+import org.glassfish.grizzly.http.server.HttpHandler;
+import org.glassfish.grizzly.http.server.HttpServer;
+import org.glassfish.grizzly.http.server.NetworkListener;
+import org.glassfish.grizzly.http.server.Request;
+import org.glassfish.grizzly.http.server.Response;
+import org.glassfish.grizzly.http.server.ServerConfiguration;
+import org.glassfish.grizzly.websockets.WebSocket;
+import org.glassfish.grizzly.websockets.WebSocketAddOn;
+import org.glassfish.grizzly.websockets.WebSocketApplication;
+import org.glassfish.grizzly.websockets.WebSocketEngine;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class TyrusDynamicHTTP extends HttpHandler {
+    private static int resourcesCount;
+    private static List<Resource> resources;
+    private static ServerConfiguration conf;
+    private static HttpServer server;
+    
+    private TyrusDynamicHTTP() {
+    }
+    
+    static URI initServer() throws Exception {
+        server = HttpServer.createSimpleServer(null, new PortRange(8080, 65535));
+        final WebSocketAddOn addon = new WebSocketAddOn();
+        for (NetworkListener listener : server.getListeners()) {
+            listener.registerAddOn(addon);
+        }        
+        resources = new ArrayList<Resource>();
+
+        conf = server.getServerConfiguration();
+        final TyrusDynamicHTTP dh = new TyrusDynamicHTTP();
+
+        conf.addHttpHandler(dh, "/");
+        
+        server.start();
+
+        return pageURL("http", server, "/test.html");
+    }
+    
+    @Override
+    public void service(Request request, Response response) throws Exception {
+        if ("/test.html".equals(request.getRequestURI())) {
+            response.setContentType("text/html");
+            final InputStream is = TyrusDynamicHTTP.class.getResourceAsStream("test.html");
+            copyStream(is, response.getOutputStream(), null);
+            return;
+        }
+        if ("/dynamic".equals(request.getRequestURI())) {
+            String mimeType = request.getParameter("mimeType");
+            List<String> params = new ArrayList<String>();
+            boolean webSocket = false;
+            for (int i = 0;; i++) {
+                String p = request.getParameter("param" + i);
+                if (p == null) {
+                    break;
+                }
+                if ("protocol:ws".equals(p)) {
+                    webSocket = true;
+                    continue;
+                }
+                params.add(p);
+            }
+            final String cnt = request.getParameter("content");
+            String mangle = cnt.replace("%20", " ").replace("%0A", "\n");
+            ByteArrayInputStream is = new ByteArrayInputStream(mangle.getBytes("UTF-8"));
+            URI url;
+            final Resource res = new Resource(is, mimeType, "/dynamic/res" + ++resourcesCount, params.toArray(new String[params.size()]));
+            if (webSocket) {
+                url = registerWebSocket(res);
+            } else {
+                url = registerResource(res);
+            }
+            response.getWriter().write(url.toString());
+            response.getWriter().write("\n");
+            return;
+        }
+
+        for (Resource r : resources) {
+            if (r.httpPath.equals(request.getRequestURI())) {
+                response.setContentType(r.httpType);
+                r.httpContent.reset();
+                String[] params = null;
+                if (r.parameters.length != 0) {
+                    params = new String[r.parameters.length];
+                    for (int i = 0; i < r.parameters.length; i++) {
+                        params[i] = request.getParameter(r.parameters[i]);
+                        if (params[i] == null) {
+                            if ("http.method".equals(r.parameters[i])) {
+                                params[i] = request.getMethod().toString();
+                            } else if ("http.requestBody".equals(r.parameters[i])) {
+                                Reader rdr = request.getReader();
+                                StringBuilder sb = new StringBuilder();
+                                for (;;) {
+                                    int ch = rdr.read();
+                                    if (ch == -1) {
+                                        break;
+                                    }
+                                    sb.append((char) ch);
+                                }
+                                params[i] = sb.toString();
+                            }
+                        }
+                        if (params[i] == null) {
+                            params[i] = "null";
+                        }
+                    }
+                }
+
+                copyStream(r.httpContent, response.getOutputStream(), null, params);
+            }
+        }
+    }
+    
+    private URI registerWebSocket(Resource r) {
+        WebSocketEngine.getEngine().register("", r.httpPath, new WS(r));
+        return pageURL("ws", server, r.httpPath);
+    }
+
+    private URI registerResource(Resource r) {
+        if (!resources.contains(r)) {
+            resources.add(r);
+            conf.addHttpHandler(this, r.httpPath);
+        }
+        return pageURL("http", server, r.httpPath);
+    }
+    
+    private static URI pageURL(String proto, HttpServer server, final String page) {
+        NetworkListener listener = server.getListeners().iterator().next();
+        int port = listener.getPort();
+        try {
+            return new URI(proto + "://localhost:" + port + page);
+        } catch (URISyntaxException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+    
+    static final class Resource {
+
+        final InputStream httpContent;
+        final String httpType;
+        final String httpPath;
+        final String[] parameters;
+
+        Resource(InputStream httpContent, String httpType, String httpPath,
+            String[] parameters) {
+            httpContent.mark(Integer.MAX_VALUE);
+            this.httpContent = httpContent;
+            this.httpType = httpType;
+            this.httpPath = httpPath;
+            this.parameters = parameters;
+        }
+    }
+
+    static void copyStream(InputStream is, OutputStream os, String baseURL, String... params) throws IOException {
+        for (;;) {
+            int ch = is.read();
+            if (ch == -1) {
+                break;
+            }
+            if (ch == '$' && params.length > 0) {
+                int cnt = is.read() - '0';
+                if (baseURL != null && cnt == 'U' - '0') {
+                    os.write(baseURL.getBytes("UTF-8"));
+                } else {
+                    if (cnt >= 0 && cnt < params.length) {
+                        os.write(params[cnt].getBytes("UTF-8"));
+                    } else {
+                        os.write('$');
+                        os.write(cnt + '0');
+                    }
+                }
+            } else {
+                os.write(ch);
+            }
+        }
+    }
+    
+    private static class WS extends WebSocketApplication {
+        private final Resource r;
+
+        private WS(Resource r) {
+            this.r = r;
+        }
+
+        @Override
+        public void onMessage(WebSocket socket, String text) {
+            try {
+                r.httpContent.reset();
+                ByteArrayOutputStream out = new ByteArrayOutputStream();
+                copyStream(r.httpContent, out, null, text);
+                String s = new String(out.toByteArray(), "UTF-8");
+                socket.send(s);
+            } catch (IOException ex) {
+                LOG.log(Level.WARNING, null, ex);
+            }
+        }
+        private static final Logger LOG = Logger.getLogger(WS.class.getName());
+        
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-ws-tyrus/src/test/java/org/netbeans/html/wstyrus/TyrusFX.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-ws-tyrus/src/test/java/org/netbeans/html/wstyrus/TyrusFX.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,120 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.wstyrus;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import javafx.application.Platform;
+import org.netbeans.html.boot.impl.FnContext;
+import org.apidesign.html.boot.spi.Fn;
+import org.testng.ITest;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class TyrusFX implements ITest, Runnable {
+    private final Fn.Presenter p;
+    private final Method m;
+    private Object result;
+    private Object inst;
+    private int count;
+
+    TyrusFX(Fn.Presenter p, Method m) {
+        this.p = p;
+        this.m = m;
+    }
+
+    @Override
+    public String getTestName() {
+        return m.getName();
+    }
+
+    @Test
+    public synchronized void executeTest() throws Exception {
+        if (result == null) {
+            Platform.runLater(this);
+            wait();
+        }
+        if (result instanceof Exception) {
+            throw (Exception)result;
+        }
+        if (result instanceof Error) {
+            throw (Error)result;
+        }
+    }
+
+    @Override
+    public synchronized void run() {
+        boolean notify = true;
+        try {
+            FnContext.currentPresenter(p);
+            if (inst == null) {
+                inst = m.getDeclaringClass().newInstance();
+            }
+            result = m.invoke(inst);
+            if (result == null) {
+                result = this;
+            }
+        } catch (InvocationTargetException ex) {
+            Throwable r = ex.getTargetException();
+            if (r instanceof InterruptedException) {
+                if (count++ < 10000) {
+                    notify = false;
+                    Platform.runLater(this);
+                    return;
+                }
+            }
+            result = r;
+        } catch (Exception ex) {
+            result = ex;
+        } finally {
+            if (notify) {
+                notifyAll();
+            }
+            FnContext.currentPresenter(null);
+        }
+    }
+    
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-ws-tyrus/src/test/java/org/netbeans/html/wstyrus/TyrusKnockoutTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-ws-tyrus/src/test/java/org/netbeans/html/wstyrus/TyrusKnockoutTest.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,212 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.wstyrus;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import net.java.html.BrwsrCtx;
+import net.java.html.boot.BrowserBuilder;
+import net.java.html.js.JavaScriptBody;
+import org.netbeans.html.boot.impl.FnContext;
+import org.apidesign.html.boot.spi.Fn;
+import org.apidesign.html.context.spi.Contexts;
+import org.apidesign.html.json.spi.Technology;
+import org.apidesign.html.json.spi.Transfer;
+import org.apidesign.html.json.spi.WSTransfer;
+import org.apidesign.html.json.tck.KOTest;
+import org.apidesign.html.json.tck.KnockoutTCK;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.netbeans.html.kofx.FXContext;
+import org.openide.util.lookup.ServiceProvider;
+import org.testng.annotations.Factory;
+import static org.testng.Assert.*;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@ServiceProvider(service = KnockoutTCK.class)
+public final class TyrusKnockoutTest extends KnockoutTCK {
+    private static Class<?> browserClass;
+    private static Fn.Presenter browserContext;
+    
+    public TyrusKnockoutTest() {
+    }
+    
+    @Factory public static Object[] compatibilityTests() throws Exception {
+        Class[] arr = testClasses();
+        for (int i = 0; i < arr.length; i++) {
+            assertEquals(
+                arr[i].getClassLoader(),
+                TyrusKnockoutTest.class.getClassLoader(),
+                "All classes loaded by the same classloader"
+            );
+        }
+        
+        URI uri = TyrusDynamicHTTP.initServer();
+    
+        final BrowserBuilder bb = BrowserBuilder.newBrowser().loadClass(TyrusKnockoutTest.class).
+            loadPage(uri.toString()).
+            invoke("initialized");
+        
+        Executors.newSingleThreadExecutor().submit(new Runnable() {
+            @Override
+            public void run() {
+                bb.showAndWait();
+            }
+        });
+        
+        ClassLoader l = getClassLoader();
+        List<Object> res = new ArrayList<Object>();
+        for (int i = 0; i < arr.length; i++) {
+            Class<?> c = Class.forName(arr[i].getName(), true, l);
+            Class<? extends Annotation> koTest = 
+                c.getClassLoader().loadClass(KOTest.class.getName()).
+                asSubclass(Annotation.class);
+            for (Method m : c.getMethods()) {
+                if (m.getAnnotation(koTest) != null) {
+                    res.add(new TyrusFX(browserContext, m));
+                }
+            }
+        }
+        return res.toArray();
+    }
+
+    static synchronized ClassLoader getClassLoader() throws InterruptedException {
+        while (browserClass == null) {
+            TyrusKnockoutTest.class.wait();
+        }
+        return browserClass.getClassLoader();
+    }
+    
+    public static synchronized void initialized(Class<?> browserCls) throws Exception {
+        browserClass = browserCls;
+        browserContext = FnContext.currentPresenter();
+        TyrusKnockoutTest.class.notifyAll();
+    }
+    
+    public static void initialized() throws Exception {
+        Class<?> classpathClass = ClassLoader.getSystemClassLoader().loadClass(TyrusKnockoutTest.class.getName());
+        Method m = classpathClass.getMethod("initialized", Class.class);
+        m.invoke(null, TyrusKnockoutTest.class);
+        browserContext = FnContext.currentPresenter();
+    }
+    
+    @Override
+    public BrwsrCtx createContext() {
+        FXContext fx = new FXContext(browserContext);
+        TyrusContext tc = new TyrusContext();
+        Contexts.Builder cb = Contexts.newBuilder().
+            register(Technology.class, fx, 10).
+            register(Transfer.class, fx, 10).
+            register(WSTransfer.class, tc, 10);
+        return cb.build();
+    }
+
+    @Override
+    public Object createJSON(Map<String, Object> values) {
+        JSONObject json = new JSONObject();
+        for (Map.Entry<String, Object> entry : values.entrySet()) {
+            try {
+                json.put(entry.getKey(), entry.getValue());
+            } catch (JSONException ex) {
+                throw new IllegalStateException(ex);
+            }
+        }
+        return json;
+    }
+
+    @Override
+    @JavaScriptBody(args = { "s", "args" }, body = ""
+        + "var f = new Function(s); "
+        + "return f.apply(null, args);"
+    )
+    public native Object executeScript(String script, Object[] arguments);
+
+    @JavaScriptBody(args = {  }, body = 
+          "var h;"
+        + "if (!!window && !!window.location && !!window.location.href)\n"
+        + "  h = window.location.href;\n"
+        + "else "
+        + "  h = null;"
+        + "return h;\n"
+    )
+    private static native String findBaseURL();
+    
+    @Override
+    public URI prepareURL(String content, String mimeType, String[] parameters) {
+        try {
+            final URL baseURL = new URL(findBaseURL());
+            StringBuilder sb = new StringBuilder();
+            sb.append("/dynamic?mimeType=").append(mimeType);
+            for (int i = 0; i < parameters.length; i++) {
+                sb.append("&param" + i).append("=").append(parameters[i]);
+            }
+            String mangle = content.replace("\n", "%0a")
+                .replace("\"", "\\\"").replace(" ", "%20");
+            sb.append("&content=").append(mangle);
+
+            URL query = new URL(baseURL, sb.toString());
+            URLConnection c = query.openConnection();
+            BufferedReader br = new BufferedReader(new InputStreamReader(c.getInputStream()));
+            URI connectTo = new URI(br.readLine());
+            return connectTo;
+        } catch (IOException ex) {
+            throw new IllegalStateException(ex);
+        } catch (URISyntaxException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+}
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-ws-tyrus/src/test/resources/org/apidesign/html/wstyrus/test.html
--- a/ko-ws-tyrus/src/test/resources/org/apidesign/html/wstyrus/test.html	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-<!--
-
-    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-    Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-    Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-    Other names may be trademarks of their respective owners.
-
-    The contents of this file are subject to the terms of either the GNU
-    General Public License Version 2 only ("GPL") or the Common
-    Development and Distribution License("CDDL") (collectively, the
-    "License"). You may not use this file except in compliance with the
-    License. You can obtain a copy of the License at
-    http://www.netbeans.org/cddl-gplv2.html
-    or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-    specific language governing permissions and limitations under the
-    License.  When distributing the software, include this License Header
-    Notice in each file and include the License file at
-    nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-    particular file as subject to the "Classpath" exception as provided
-    by Oracle in the GPL Version 2 section of the License file that
-    accompanied this code. If applicable, add the following below the
-    License Header, with the fields enclosed by brackets [] replaced by
-    your own identifying information:
-    "Portions Copyrighted [year] [name of copyright owner]"
-
-    Contributor(s):
-
-    The Original Software is NetBeans. The Initial Developer of the Original
-    Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
-
-    If you wish your version of this file to be governed by only the CDDL
-    or only the GPL Version 2, indicate your decision by adding
-    "[Contributor] elects to include this software in this distribution
-    under the [CDDL or GPL Version 2] license." If you do not indicate a
-    single choice of license, a recipient has the option to distribute
-    your version of this file under either the CDDL, the GPL Version 2 or
-    to extend the choice of license to its licensees as provided above.
-    However, if you add GPL Version 2 code and therefore, elected the GPL
-    Version 2 license, then the option applies only if the new code is
-    made subject to such option by the copyright holder.
-
--->
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Tyrus WebSockets Execution Harness</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <meta name="viewport" content="width=device-width">
-    </head>
-    <body>
-        <h1>Tyrus WebSockets Execution Harness</h1>
-    </body>
-    <script></script>
-</html>
diff -r 700087d2a5d3 -r 92fb71afdc0e ko-ws-tyrus/src/test/resources/org/netbeans/html/wstyrus/test.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ko-ws-tyrus/src/test/resources/org/netbeans/html/wstyrus/test.html	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,56 @@
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+
+    Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+    Other names may be trademarks of their respective owners.
+
+    The contents of this file are subject to the terms of either the GNU
+    General Public License Version 2 only ("GPL") or the Common
+    Development and Distribution License("CDDL") (collectively, the
+    "License"). You may not use this file except in compliance with the
+    License. You can obtain a copy of the License at
+    http://www.netbeans.org/cddl-gplv2.html
+    or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+    specific language governing permissions and limitations under the
+    License.  When distributing the software, include this License Header
+    Notice in each file and include the License file at
+    nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+    particular file as subject to the "Classpath" exception as provided
+    by Oracle in the GPL Version 2 section of the License file that
+    accompanied this code. If applicable, add the following below the
+    License Header, with the fields enclosed by brackets [] replaced by
+    your own identifying information:
+    "Portions Copyrighted [year] [name of copyright owner]"
+
+    Contributor(s):
+
+    The Original Software is NetBeans. The Initial Developer of the Original
+    Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+
+    If you wish your version of this file to be governed by only the CDDL
+    or only the GPL Version 2, indicate your decision by adding
+    "[Contributor] elects to include this software in this distribution
+    under the [CDDL or GPL Version 2] license." If you do not indicate a
+    single choice of license, a recipient has the option to distribute
+    your version of this file under either the CDDL, the GPL Version 2 or
+    to extend the choice of license to its licensees as provided above.
+    However, if you add GPL Version 2 code and therefore, elected the GPL
+    Version 2 license, then the option applies only if the new code is
+    made subject to such option by the copyright holder.
+
+-->
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Tyrus WebSockets Execution Harness</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width">
+    </head>
+    <body>
+        <h1>Tyrus WebSockets Execution Harness</h1>
+    </body>
+    <script></script>
+</html>
diff -r 700087d2a5d3 -r 92fb71afdc0e pom.xml
--- a/pom.xml	Mon Dec 16 15:48:09 2013 +0100
+++ b/pom.xml	Mon Dec 16 16:59:43 2013 +0100
@@ -92,7 +92,7 @@
                        <exclude>*</exclude>
                        <exclude>.*/**</exclude>
                        <exclude>ko-archetype/src/main/resources/**</exclude>
-                       <exclude>ko-fx/src/main/resources/org/apidesign/html/kofx/knockout*.js</exclude>
+                       <exclude>ko-fx/src/main/resources/org/netbeans/html/kofx/knockout*.js</exclude>
                   </excludes>
               </configuration>
           </plugin>
diff -r 700087d2a5d3 -r 92fb71afdc0e sound/src/main/java/org/apidesign/html/sound/impl/BrowserAudioEnv.java
--- a/sound/src/main/java/org/apidesign/html/sound/impl/BrowserAudioEnv.java	Mon Dec 16 15:48:09 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.apidesign.html.sound.impl;
-
-import net.java.html.js.JavaScriptBody;
-import org.apidesign.html.sound.spi.AudioEnvironment;
-import org.openide.util.lookup.ServiceProvider;
-
-/** Registers an audio provider that delegates to HTML5 Audio tag.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@ServiceProvider(service = AudioEnvironment.class, position = 100)
-public final class BrowserAudioEnv implements AudioEnvironment<Object> {
-    @Override
-    @JavaScriptBody(args = { "src" }, body = ""
-        + "if (!Audio) return null;"
-        + "return new Audio(src);")
-    public Object create(String src) {
-        // null if not running in browser
-        return null;
-    }
-
-    @Override @JavaScriptBody(args = { "a" }, body = "a.play();")
-    public void play(Object a) {
-    }
-
-    @Override @JavaScriptBody(args = { "a" }, body = "a.pause();")
-    public void pause(Object a) {
-    }
-
-    @Override @JavaScriptBody(args = { "a", "volume" }, body = "a.setVolume(volume);")
-    public void setVolume(Object a, double volume) {
-    }
-
-    @Override
-    @JavaScriptBody(args = "a", body = "return true;")
-    public boolean isSupported(Object a) {
-        return false;
-    }
-}
diff -r 700087d2a5d3 -r 92fb71afdc0e sound/src/main/java/org/netbeans/html/sound/impl/BrowserAudioEnv.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sound/src/main/java/org/netbeans/html/sound/impl/BrowserAudioEnv.java	Mon Dec 16 16:59:43 2013 +0100
@@ -0,0 +1,81 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.sound.impl;
+
+import net.java.html.js.JavaScriptBody;
+import org.apidesign.html.sound.spi.AudioEnvironment;
+import org.openide.util.lookup.ServiceProvider;
+
+/** Registers an audio provider that delegates to HTML5 Audio tag.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@ServiceProvider(service = AudioEnvironment.class, position = 100)
+public final class BrowserAudioEnv implements AudioEnvironment<Object> {
+    @Override
+    @JavaScriptBody(args = { "src" }, body = ""
+        + "if (!Audio) return null;"
+        + "return new Audio(src);")
+    public Object create(String src) {
+        // null if not running in browser
+        return null;
+    }
+
+    @Override @JavaScriptBody(args = { "a" }, body = "a.play();")
+    public void play(Object a) {
+    }
+
+    @Override @JavaScriptBody(args = { "a" }, body = "a.pause();")
+    public void pause(Object a) {
+    }
+
+    @Override @JavaScriptBody(args = { "a", "volume" }, body = "a.setVolume(volume);")
+    public void setVolume(Object a, double volume) {
+    }
+
+    @Override
+    @JavaScriptBody(args = "a", body = "return true;")
+    public boolean isSupported(Object a) {
+        return false;
+    }
+}