1.1 --- a/ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrJavaScriptBodyTest.java	Mon Aug 11 18:17:47 2014 +0200
     1.2 +++ b/ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrJavaScriptBodyTest.java	Sun Aug 31 22:36:54 2014 +0200
     1.3 @@ -18,8 +18,8 @@
     1.4  package org.apidesign.bck2brwsr.ko2brwsr;
     1.5  
     1.6  import org.apidesign.bck2brwsr.vmtest.VMTest;
     1.7 -import org.apidesign.html.json.tck.JavaScriptTCK;
     1.8 -import org.apidesign.html.json.tck.KOTest;
     1.9 +import org.netbeans.html.json.tck.JavaScriptTCK;
    1.10 +import org.netbeans.html.json.tck.KOTest;
    1.11  import org.testng.annotations.Factory;
    1.12  
    1.13  /**

     2.1 --- a/ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrKnockoutTest.java	Mon Aug 11 18:17:47 2014 +0200
     2.2 +++ b/ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrKnockoutTest.java	Sun Aug 31 22:36:54 2014 +0200
     2.3 @@ -25,12 +25,12 @@
     2.4  import net.java.html.BrwsrCtx;
     2.5  import org.apidesign.bck2brwsr.core.JavaScriptBody;
     2.6  import org.apidesign.bck2brwsr.vmtest.VMTest;
     2.7 -import org.apidesign.html.context.spi.Contexts;
     2.8 -import org.apidesign.html.json.spi.Technology;
     2.9 -import org.apidesign.html.json.spi.Transfer;
    2.10 -import org.apidesign.html.json.spi.WSTransfer;
    2.11 -import org.apidesign.html.json.tck.KOTest;
    2.12 -import org.apidesign.html.json.tck.KnockoutTCK;
    2.13 +import org.netbeans.html.context.spi.Contexts;
    2.14 +import org.netbeans.html.json.spi.Technology;
    2.15 +import org.netbeans.html.json.spi.Transfer;
    2.16 +import org.netbeans.html.json.spi.WSTransfer;
    2.17 +import org.netbeans.html.json.tck.KOTest;
    2.18 +import org.netbeans.html.json.tck.KnockoutTCK;
    2.19  import org.netbeans.html.ko4j.KO4J;
    2.20  import org.openide.util.lookup.ServiceProvider;
    2.21  import org.testng.annotations.Factory;

     3.1 --- a/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/JavaScriptBodyFXBrwsrTest.java	Mon Aug 11 18:17:47 2014 +0200
     3.2 +++ b/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/JavaScriptBodyFXBrwsrTest.java	Sun Aug 31 22:36:54 2014 +0200
     3.3 @@ -18,8 +18,8 @@
     3.4  package org.apidesign.bck2brwsr.kofx;
     3.5  
     3.6  import org.apidesign.bck2brwsr.vmtest.VMTest;
     3.7 -import org.apidesign.html.json.tck.JavaScriptTCK;
     3.8 -import org.apidesign.html.json.tck.KOTest;
     3.9 +import org.netbeans.html.json.tck.JavaScriptTCK;
    3.10 +import org.netbeans.html.json.tck.KOTest;
    3.11  import org.testng.annotations.Factory;
    3.12  
    3.13  /**

     4.1 --- a/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/KnockoutFXTest.java	Mon Aug 11 18:17:47 2014 +0200
     4.2 +++ b/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/KnockoutFXTest.java	Sun Aug 31 22:36:54 2014 +0200
     4.3 @@ -29,15 +29,13 @@
     4.4  import net.java.html.BrwsrCtx;
     4.5  import net.java.html.js.JavaScriptBody;
     4.6  import org.apidesign.bck2brwsr.vmtest.VMTest;
     4.7 -import org.apidesign.html.boot.spi.Fn;
     4.8 -import org.apidesign.html.context.spi.Contexts;
     4.9 -import org.apidesign.html.json.spi.Technology;
    4.10 -import org.apidesign.html.json.spi.Transfer;
    4.11 -import org.apidesign.html.json.spi.WSTransfer;
    4.12 -import org.apidesign.html.json.tck.KOTest;
    4.13 -import org.apidesign.html.json.tck.KnockoutTCK;
    4.14 -import org.json.JSONException;
    4.15 -import org.json.JSONObject;
    4.16 +import org.netbeans.html.boot.spi.Fn;
    4.17 +import org.netbeans.html.context.spi.Contexts;
    4.18 +import org.netbeans.html.json.spi.Technology;
    4.19 +import org.netbeans.html.json.spi.Transfer;
    4.20 +import org.netbeans.html.json.spi.WSTransfer;
    4.21 +import org.netbeans.html.json.tck.KOTest;
    4.22 +import org.netbeans.html.json.tck.KnockoutTCK;
    4.23  import org.netbeans.html.ko4j.KO4J;
    4.24  import org.netbeans.html.wstyrus.TyrusContext;
    4.25  import org.openide.util.lookup.ServiceProvider;

     5.1 --- a/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/fximpl/JVMBridge.java	Mon Aug 11 18:17:47 2014 +0200
     5.2 +++ b/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/fximpl/JVMBridge.java	Sun Aug 31 22:36:54 2014 +0200
     5.3 @@ -21,20 +21,18 @@
     5.4  import java.io.Reader;
     5.5  import java.net.URL;
     5.6  import java.util.ArrayList;
     5.7 -import java.util.Arrays;
     5.8  import java.util.Collection;
     5.9  import java.util.List;
    5.10  import java.util.TooManyListenersException;
    5.11  import java.util.concurrent.Executor;
    5.12 -import java.util.logging.Level;
    5.13  import java.util.logging.Logger;
    5.14  import javafx.application.Platform;
    5.15  import javafx.beans.value.ChangeListener;
    5.16  import javafx.scene.web.WebEngine;
    5.17  import netscape.javascript.JSObject;
    5.18 -import org.apidesign.html.boot.spi.Fn;
    5.19  import org.netbeans.html.boot.impl.FindResources;
    5.20  import org.netbeans.html.boot.impl.FnUtils;
    5.21 +import org.netbeans.html.boot.spi.Fn;
    5.22  
    5.23  /**
    5.24   *

     6.1 --- a/launcher/fx/src/test/java/org/apidesign/bck2brwsr/launcher/fximpl/JsClassLoaderTest.java	Mon Aug 11 18:17:47 2014 +0200
     6.2 +++ b/launcher/fx/src/test/java/org/apidesign/bck2brwsr/launcher/fximpl/JsClassLoaderTest.java	Sun Aug 31 22:36:54 2014 +0200
     6.3 @@ -30,9 +30,9 @@
     6.4  import javax.script.ScriptEngine;
     6.5  import javax.script.ScriptEngineManager;
     6.6  import javax.script.ScriptException;
     6.7 -import org.apidesign.html.boot.spi.Fn;
     6.8  import org.netbeans.html.boot.impl.FindResources;
     6.9  import org.netbeans.html.boot.impl.FnUtils;
    6.10 +import org.netbeans.html.boot.spi.Fn;
    6.11  import static org.testng.Assert.*;
    6.12  import org.testng.annotations.BeforeClass;
    6.13  import org.testng.annotations.BeforeMethod;

     7.1 --- a/pom.xml	Mon Aug 11 18:17:47 2014 +0200
     7.2 +++ b/pom.xml	Sun Aug 31 22:36:54 2014 +0200
     7.3 @@ -15,7 +15,7 @@
     7.4        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     7.5        <netbeans.version>RELEASE80</netbeans.version>
     7.6        <license>COPYING</license>
     7.7 -      <net.java.html.version>0.8.3</net.java.html.version>
     7.8 +      <net.java.html.version>1.0-SNAPSHOT</net.java.html.version>
     7.9        <netbeans.compile.on.save>none</netbeans.compile.on.save>
    7.10    </properties>
    7.11    <modules>

     8.1 --- a/rt/emul/mini/src/main/java/java/lang/Class.java	Mon Aug 11 18:17:47 2014 +0200
     8.2 +++ b/rt/emul/mini/src/main/java/java/lang/Class.java	Sun Aug 31 22:36:54 2014 +0200
     8.3 @@ -1824,6 +1824,13 @@
     8.4          + "}\n"
     8.5      )
     8.6      static native int activate();
     8.7 +
     8.8 +    @Exported
     8.9 +    @JavaScriptOnly(name = "activate__Ljava_io_Closeable_2Lorg_netbeans_html_boot_spi_Fn$Presenter_2", value = "function() {\n"
    8.10 +        + "  return vm.org_apidesign_bck2brwsr_emul_lang_System(false).activate__Ljava_io_Closeable_2();"
    8.11 +        + "}\n"
    8.12 +    )
    8.13 +    static native int activateNew();
    8.14      
    8.15      private static Object bck2BrwsrCnvrt(Object o) {
    8.16          if (o instanceof Throwable) {

     9.1 --- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Mon Aug 11 18:17:47 2014 +0200
     9.2 +++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Sun Aug 31 22:36:54 2014 +0200
     9.3 @@ -1624,7 +1624,10 @@
     9.4  
     9.5          final String in = mi[0];
     9.6          String mcn;
     9.7 -        if (callbacks && in.equals("org/apidesign/html/boot/spi/Fn")) {
     9.8 +        if (callbacks && (
     9.9 +            in.equals("org/apidesign/html/boot/spi/Fn") ||
    9.10 +            in.equals("org/netbeans/html/boot/spi/Fn")
    9.11 +        )) {
    9.12              mcn = "java_lang_Class";
    9.13          } else {
    9.14              mcn = mangleClassName(in);
    9.15 @@ -1660,7 +1663,7 @@
    9.16          String mn = findMethodName(mi, cnt, returnType);
    9.17  
    9.18          final int numArguments = cnt.length() + 1;
    9.19 -        final CharSequence[] vars = new CharSequence[numArguments];
    9.20 +        final CharSequence[] vars =  new CharSequence[numArguments];
    9.21  
    9.22          for (int j = numArguments - 1; j >= 0; --j) {
    9.23              vars[j] = mapper.popValue();