1.1 --- a/ko/archetype/src/main/resources/archetype-resources/pom.xml	Thu Jan 09 11:55:01 2014 +0100
     1.2 +++ b/ko/archetype/src/main/resources/archetype-resources/pom.xml	Thu Jan 09 15:57:28 2014 +0100
     1.3 @@ -183,7 +183,7 @@
     1.4            <dependencies>
     1.5                <dependency>
     1.6                    <groupId>org.netbeans.html</groupId>
     1.7 -                  <artifactId>ko-fx</artifactId>
     1.8 +                  <artifactId>ko4j</artifactId>
     1.9                    <version>\${net.java.html.version}</version>
    1.10                </dependency>
    1.11                <dependency>

     2.1 --- a/ko/bck2brwsr/pom.xml	Thu Jan 09 11:55:01 2014 +0100
     2.2 +++ b/ko/bck2brwsr/pom.xml	Thu Jan 09 15:57:28 2014 +0100
     2.3 @@ -118,8 +118,8 @@
     2.4      </dependency>
     2.5      <dependency>
     2.6        <groupId>org.netbeans.html</groupId>
     2.7 -      <artifactId>ko-fx</artifactId>
     2.8 -      <version>0.7-SNAPSHOT</version>
     2.9 +      <artifactId>ko4j</artifactId>
    2.10 +      <version>${net.java.html.version}</version>
    2.11        <exclusions>
    2.12          <exclusion>
    2.13            <artifactId>json</artifactId>

     3.1 --- a/ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrKnockoutTest.java	Thu Jan 09 11:55:01 2014 +0100
     3.2 +++ b/ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrKnockoutTest.java	Thu Jan 09 15:57:28 2014 +0100
     3.3 @@ -31,7 +31,7 @@
     3.4  import org.apidesign.html.json.spi.WSTransfer;
     3.5  import org.apidesign.html.json.tck.KOTest;
     3.6  import org.apidesign.html.json.tck.KnockoutTCK;
     3.7 -import org.netbeans.html.kofx.FXContext;
     3.8 +import org.netbeans.html.ko4j.KO4J;
     3.9  import org.openide.util.lookup.ServiceProvider;
    3.10  import org.testng.annotations.Factory;
    3.11  
    3.12 @@ -51,10 +51,11 @@
    3.13      
    3.14      @Override
    3.15      public BrwsrCtx createContext() {
    3.16 +        KO4J ko = new KO4J(null);
    3.17          return Contexts.newBuilder().
    3.18              register(Transfer.class, BrwsrCtxImpl.DEFAULT, 9).
    3.19              register(WSTransfer.class, BrwsrCtxImpl.DEFAULT, 9).
    3.20 -            register(Technology.class, new FXContext(null), 9).build();
    3.21 +            register(Technology.class, ko.knockout(), 9).build();
    3.22      }
    3.23  
    3.24  

     4.1 --- a/ko/fx/pom.xml	Thu Jan 09 11:55:01 2014 +0100
     4.2 +++ b/ko/fx/pom.xml	Thu Jan 09 15:57:28 2014 +0100
     4.3 @@ -74,7 +74,7 @@
     4.4      </dependency>
     4.5      <dependency>
     4.6        <groupId>org.netbeans.html</groupId>
     4.7 -      <artifactId>ko-fx</artifactId>
     4.8 +      <artifactId>ko4j</artifactId>
     4.9        <version>${net.java.html.version}</version>
    4.10        <type>jar</type>
    4.11      </dependency>

     5.1 --- a/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/KnockoutFXTest.java	Thu Jan 09 11:55:01 2014 +0100
     5.2 +++ b/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/KnockoutFXTest.java	Thu Jan 09 15:57:28 2014 +0100
     5.3 @@ -37,7 +37,7 @@
     5.4  import org.apidesign.html.json.tck.KnockoutTCK;
     5.5  import org.json.JSONException;
     5.6  import org.json.JSONObject;
     5.7 -import org.netbeans.html.kofx.FXContext;
     5.8 +import org.netbeans.html.ko4j.KO4J;
     5.9  import org.netbeans.html.wstyrus.TyrusContext;
    5.10  import org.openide.util.lookup.ServiceProvider;
    5.11  import org.testng.annotations.Factory;
    5.12 @@ -60,15 +60,15 @@
    5.13  
    5.14      @Override
    5.15      public BrwsrCtx createContext() {
    5.16 -        FXContext fx = new FXContext(Fn.activePresenter());
    5.17 +        KO4J ko = new KO4J(Fn.activePresenter());
    5.18          TyrusContext tc = new TyrusContext();
    5.19          Contexts.Builder b = Contexts.newBuilder().
    5.20 -            register(Technology.class, fx, 10).
    5.21 -            register(Transfer.class, fx, 10);
    5.22 +            register(Technology.class, ko.knockout(), 10).
    5.23 +            register(Transfer.class, ko.transferViaOrgJSON(), 10);
    5.24          try {
    5.25              Class.forName("java.util.function.Function");
    5.26              // prefer WebView's WebSockets on JDK8
    5.27 -            b.register(WSTransfer.class, fx, 10);
    5.28 +            b.register(WSTransfer.class, ko.websocketsViaBrowser(), 10);
    5.29          } catch (ClassNotFoundException ex) {
    5.30              // ok, JDK7 needs tyrus
    5.31              b.register(WSTransfer.class, tc, 20);