# HG changeset patch # User Jaroslav Tulach # Date 1389279448 -3600 # Node ID 095ce896e09420731d6c0f9eb561a83701540c5d # Parent 237dbcd482dc72b720edd4be98e0631fb0fab6d0 Adjusting to rename to ko4j diff -r 237dbcd482dc -r 095ce896e094 ko/archetype/src/main/resources/archetype-resources/pom.xml --- a/ko/archetype/src/main/resources/archetype-resources/pom.xml Thu Jan 09 11:55:01 2014 +0100 +++ b/ko/archetype/src/main/resources/archetype-resources/pom.xml Thu Jan 09 15:57:28 2014 +0100 @@ -183,7 +183,7 @@ org.netbeans.html - ko-fx + ko4j \${net.java.html.version} diff -r 237dbcd482dc -r 095ce896e094 ko/bck2brwsr/pom.xml --- a/ko/bck2brwsr/pom.xml Thu Jan 09 11:55:01 2014 +0100 +++ b/ko/bck2brwsr/pom.xml Thu Jan 09 15:57:28 2014 +0100 @@ -118,8 +118,8 @@ org.netbeans.html - ko-fx - 0.7-SNAPSHOT + ko4j + ${net.java.html.version} json diff -r 237dbcd482dc -r 095ce896e094 ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrKnockoutTest.java --- a/ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrKnockoutTest.java Thu Jan 09 11:55:01 2014 +0100 +++ b/ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrKnockoutTest.java Thu Jan 09 15:57:28 2014 +0100 @@ -31,7 +31,7 @@ import org.apidesign.html.json.spi.WSTransfer; import org.apidesign.html.json.tck.KOTest; import org.apidesign.html.json.tck.KnockoutTCK; -import org.netbeans.html.kofx.FXContext; +import org.netbeans.html.ko4j.KO4J; import org.openide.util.lookup.ServiceProvider; import org.testng.annotations.Factory; @@ -51,10 +51,11 @@ @Override public BrwsrCtx createContext() { + KO4J ko = new KO4J(null); return Contexts.newBuilder(). register(Transfer.class, BrwsrCtxImpl.DEFAULT, 9). register(WSTransfer.class, BrwsrCtxImpl.DEFAULT, 9). - register(Technology.class, new FXContext(null), 9).build(); + register(Technology.class, ko.knockout(), 9).build(); } diff -r 237dbcd482dc -r 095ce896e094 ko/fx/pom.xml --- a/ko/fx/pom.xml Thu Jan 09 11:55:01 2014 +0100 +++ b/ko/fx/pom.xml Thu Jan 09 15:57:28 2014 +0100 @@ -74,7 +74,7 @@ org.netbeans.html - ko-fx + ko4j ${net.java.html.version} jar diff -r 237dbcd482dc -r 095ce896e094 ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/KnockoutFXTest.java --- a/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/KnockoutFXTest.java Thu Jan 09 11:55:01 2014 +0100 +++ b/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/KnockoutFXTest.java Thu Jan 09 15:57:28 2014 +0100 @@ -37,7 +37,7 @@ import org.apidesign.html.json.tck.KnockoutTCK; import org.json.JSONException; import org.json.JSONObject; -import org.netbeans.html.kofx.FXContext; +import org.netbeans.html.ko4j.KO4J; import org.netbeans.html.wstyrus.TyrusContext; import org.openide.util.lookup.ServiceProvider; import org.testng.annotations.Factory; @@ -60,15 +60,15 @@ @Override public BrwsrCtx createContext() { - FXContext fx = new FXContext(Fn.activePresenter()); + KO4J ko = new KO4J(Fn.activePresenter()); TyrusContext tc = new TyrusContext(); Contexts.Builder b = Contexts.newBuilder(). - register(Technology.class, fx, 10). - register(Transfer.class, fx, 10); + register(Technology.class, ko.knockout(), 10). + register(Transfer.class, ko.transferViaOrgJSON(), 10); try { Class.forName("java.util.function.Function"); // prefer WebView's WebSockets on JDK8 - b.register(WSTransfer.class, fx, 10); + b.register(WSTransfer.class, ko.websocketsViaBrowser(), 10); } catch (ClassNotFoundException ex) { // ok, JDK7 needs tyrus b.register(WSTransfer.class, tc, 20);