1.1 --- a/ko/archetype/src/main/resources/archetype-resources/pom.xml Wed Dec 11 08:22:17 2013 +0100
1.2 +++ b/ko/archetype/src/main/resources/archetype-resources/pom.xml Mon Jan 06 13:31:04 2014 +0100
1.3 @@ -126,7 +126,7 @@
1.4 <scope>test</scope>
1.5 </dependency>
1.6 <dependency>
1.7 - <groupId>org.apidesign.html</groupId>
1.8 + <groupId>org.netbeans.html</groupId>
1.9 <artifactId>net.java.html.json</artifactId>
1.10 <version>\${net.java.html.version}</version>
1.11 <type>jar</type>
1.12 @@ -182,7 +182,7 @@
1.13 </build>
1.14 <dependencies>
1.15 <dependency>
1.16 - <groupId>org.apidesign.html</groupId>
1.17 + <groupId>org.netbeans.html</groupId>
1.18 <artifactId>ko-fx</artifactId>
1.19 <version>\${net.java.html.version}</version>
1.20 </dependency>
2.1 --- a/ko/bck2brwsr/pom.xml Wed Dec 11 08:22:17 2013 +0100
2.2 +++ b/ko/bck2brwsr/pom.xml Mon Jan 06 13:31:04 2014 +0100
2.3 @@ -76,12 +76,12 @@
2.4 <scope>test</scope>
2.5 </dependency>
2.6 <dependency>
2.7 - <groupId>org.apidesign.html</groupId>
2.8 + <groupId>org.netbeans.html</groupId>
2.9 <artifactId>net.java.html.json</artifactId>
2.10 <version>${net.java.html.version}</version>
2.11 </dependency>
2.12 <dependency>
2.13 - <groupId>org.apidesign.html</groupId>
2.14 + <groupId>org.netbeans.html</groupId>
2.15 <artifactId>net.java.html.json.tck</artifactId>
2.16 <version>${net.java.html.version}</version>
2.17 <scope>test</scope>
2.18 @@ -93,7 +93,7 @@
2.19 <type>jar</type>
2.20 </dependency>
2.21 <dependency>
2.22 - <groupId>org.apidesign.html</groupId>
2.23 + <groupId>org.netbeans.html</groupId>
2.24 <artifactId>net.java.html.boot</artifactId>
2.25 <version>${net.java.html.version}</version>
2.26 <type>jar</type>
3.1 --- a/ko/fx/pom.xml Wed Dec 11 08:22:17 2013 +0100
3.2 +++ b/ko/fx/pom.xml Mon Jan 06 13:31:04 2014 +0100
3.3 @@ -40,7 +40,7 @@
3.4 <type>jar</type>
3.5 </dependency>
3.6 <dependency>
3.7 - <groupId>org.apidesign.html</groupId>
3.8 + <groupId>org.netbeans.html</groupId>
3.9 <artifactId>net.java.html.json</artifactId>
3.10 <version>${net.java.html.version}</version>
3.11 </dependency>
3.12 @@ -50,7 +50,7 @@
3.13 <scope>test</scope>
3.14 </dependency>
3.15 <dependency>
3.16 - <groupId>org.apidesign.html</groupId>
3.17 + <groupId>org.netbeans.html</groupId>
3.18 <artifactId>net.java.html.json.tck</artifactId>
3.19 <version>${net.java.html.version}</version>
3.20 <scope>test</scope>
3.21 @@ -67,13 +67,13 @@
3.22 <scope>test</scope>
3.23 </dependency>
3.24 <dependency>
3.25 - <groupId>org.apidesign.html</groupId>
3.26 + <groupId>org.netbeans.html</groupId>
3.27 <artifactId>net.java.html.boot</artifactId>
3.28 <version>${net.java.html.version}</version>
3.29 <type>jar</type>
3.30 </dependency>
3.31 <dependency>
3.32 - <groupId>org.apidesign.html</groupId>
3.33 + <groupId>org.netbeans.html</groupId>
3.34 <artifactId>ko-fx</artifactId>
3.35 <version>${net.java.html.version}</version>
3.36 <type>jar</type>
3.37 @@ -86,7 +86,7 @@
3.38 <type>jar</type>
3.39 </dependency>
3.40 <dependency>
3.41 - <groupId>org.apidesign.html</groupId>
3.42 + <groupId>org.netbeans.html</groupId>
3.43 <artifactId>ko-ws-tyrus</artifactId>
3.44 <version>${net.java.html.version}</version>
3.45 <scope>test</scope>
4.1 --- a/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/KnockoutFXTest.java Wed Dec 11 08:22:17 2013 +0100
4.2 +++ b/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/KnockoutFXTest.java Mon Jan 06 13:31:04 2014 +0100
4.3 @@ -28,17 +28,17 @@
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.impl.FnUtils;
4.8 +import org.apidesign.html.boot.spi.Fn;
4.9 import org.apidesign.html.context.spi.Contexts;
4.10 import org.apidesign.html.json.spi.Technology;
4.11 import org.apidesign.html.json.spi.Transfer;
4.12 import org.apidesign.html.json.spi.WSTransfer;
4.13 import org.apidesign.html.json.tck.KOTest;
4.14 import org.apidesign.html.json.tck.KnockoutTCK;
4.15 -import org.apidesign.html.kofx.FXContext;
4.16 -import org.apidesign.html.wstyrus.TyrusContext;
4.17 import org.json.JSONException;
4.18 import org.json.JSONObject;
4.19 +import org.netbeans.html.kofx.FXContext;
4.20 +import org.netbeans.html.wstyrus.TyrusContext;
4.21 import org.openide.util.lookup.ServiceProvider;
4.22 import org.testng.annotations.Factory;
4.23
4.24 @@ -60,7 +60,7 @@
4.25
4.26 @Override
4.27 public BrwsrCtx createContext() {
4.28 - FXContext fx = new FXContext(FnUtils.currentPresenter());
4.29 + FXContext fx = new FXContext(Fn.activePresenter());
4.30 TyrusContext tc = new TyrusContext();
4.31 Contexts.Builder b = Contexts.newBuilder().
4.32 register(Technology.class, fx, 10).
5.1 --- a/launcher/fx/pom.xml Wed Dec 11 08:22:17 2013 +0100
5.2 +++ b/launcher/fx/pom.xml Mon Jan 06 13:31:04 2014 +0100
5.3 @@ -75,7 +75,7 @@
5.4 <version>4.1</version>
5.5 </dependency>
5.6 <dependency>
5.7 - <groupId>org.apidesign.html</groupId>
5.8 + <groupId>org.netbeans.html</groupId>
5.9 <artifactId>net.java.html.boot</artifactId>
5.10 <version>${net.java.html.version}</version>
5.11 </dependency>
6.1 --- a/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/fximpl/JVMBridge.java Wed Dec 11 08:22:17 2013 +0100
6.2 +++ b/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/fximpl/JVMBridge.java Mon Jan 06 13:31:04 2014 +0100
6.3 @@ -19,7 +19,6 @@
6.4
6.5 import java.io.BufferedReader;
6.6 import java.io.Reader;
6.7 -import org.apidesign.html.boot.spi.Fn;
6.8 import java.net.URL;
6.9 import java.util.ArrayList;
6.10 import java.util.Arrays;
6.11 @@ -29,8 +28,9 @@
6.12 import javafx.beans.value.ChangeListener;
6.13 import javafx.scene.web.WebEngine;
6.14 import netscape.javascript.JSObject;
6.15 -import org.apidesign.html.boot.impl.FindResources;
6.16 -import org.apidesign.html.boot.impl.FnUtils;
6.17 +import org.apidesign.html.boot.spi.Fn;
6.18 +import org.netbeans.html.boot.impl.FindResources;
6.19 +import org.netbeans.html.boot.impl.FnUtils;
6.20
6.21 /**
6.22 *
6.23 @@ -70,7 +70,7 @@
6.24 }
6.25
6.26 public Class<?> loadClass(String name) throws ClassNotFoundException {
6.27 - FnUtils.currentPresenter(presenter);
6.28 + Fn.activate(presenter);
6.29 return Class.forName(name, true, cl);
6.30 }
6.31
7.1 --- a/launcher/fx/src/test/java/org/apidesign/bck2brwsr/launcher/fximpl/JsClassLoaderTest.java Wed Dec 11 08:22:17 2013 +0100
7.2 +++ b/launcher/fx/src/test/java/org/apidesign/bck2brwsr/launcher/fximpl/JsClassLoaderTest.java Mon Jan 06 13:31:04 2014 +0100
7.3 @@ -31,8 +31,8 @@
7.4 import javax.script.ScriptEngineManager;
7.5 import javax.script.ScriptException;
7.6 import org.apidesign.html.boot.spi.Fn;
7.7 -import org.apidesign.html.boot.impl.FindResources;
7.8 -import org.apidesign.html.boot.impl.FnUtils;
7.9 +import org.netbeans.html.boot.impl.FindResources;
7.10 +import org.netbeans.html.boot.impl.FnUtils;
7.11 import static org.testng.Assert.*;
7.12 import org.testng.annotations.BeforeClass;
7.13 import org.testng.annotations.BeforeMethod;
7.14 @@ -118,7 +118,7 @@
7.15 }
7.16
7.17 @BeforeMethod public void registerPresenter() {
7.18 - FnUtils.currentPresenter(presenter);
7.19 + Fn.activate(presenter);
7.20 }
7.21
7.22 @Test public void noParamMethod() throws Throwable {
8.1 --- a/pom.xml Wed Dec 11 08:22:17 2013 +0100
8.2 +++ b/pom.xml Mon Jan 06 13:31:04 2014 +0100
8.3 @@ -15,7 +15,7 @@
8.4 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8.5 <netbeans.version>RELEASE74</netbeans.version>
8.6 <license>COPYING</license>
8.7 - <net.java.html.version>0.6</net.java.html.version>
8.8 + <net.java.html.version>0.7-SNAPSHOT</net.java.html.version>
8.9 <netbeans.compile.on.save>none</netbeans.compile.on.save>
8.10 </properties>
8.11 <modules>
9.1 --- a/rt/vm/pom.xml Wed Dec 11 08:22:17 2013 +0100
9.2 +++ b/rt/vm/pom.xml Mon Jan 06 13:31:04 2014 +0100
9.3 @@ -154,7 +154,7 @@
9.4 <scope>compile</scope>
9.5 </dependency>
9.6 <dependency>
9.7 - <groupId>org.apidesign.html</groupId>
9.8 + <groupId>org.netbeans.html</groupId>
9.9 <artifactId>net.java.html.boot</artifactId>
9.10 <scope>test</scope>
9.11 <version>${net.java.html.version}</version>