# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1389565542 -3600
# Node ID 9984b9f7d8c634924d6e68776792300361b5a971
# Parent  68cecf6c31137697bec4b2b84a9eca18d62f9c48
Adjusting to new naming scheme (which includes netbeans name)

diff -r 68cecf6c3113 -r 9984b9f7d8c6 chat/client/pom.xml
--- a/chat/client/pom.xml	Fri Dec 20 08:24:57 2013 +0100
+++ b/chat/client/pom.xml	Sun Jan 12 23:25:42 2014 +0100
@@ -79,7 +79,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apidesign.html</groupId>
+      <groupId>org.netbeans.html</groupId>
       <artifactId>net.java.html.json</artifactId>
       <version>${net.java.html.version}</version>
       <type>jar</type>
@@ -112,9 +112,9 @@
         <scope>provided</scope>
     </dependency>
     <dependency>
-        <groupId>org.apidesign.html</groupId>
+        <groupId>org.apidesign.bck2brwsr</groupId>
         <artifactId>ko-bck2brwsr</artifactId>
-        <version>${net.java.html.version}</version>
+        <version>${bck2brwsr.version}</version>
         <scope>runtime</scope>
     </dependency>
   </dependencies>
diff -r 68cecf6c3113 -r 9984b9f7d8c6 chat/client/src/main/java/org/apidesign/html/chatserver/client/ChatClient.java
--- a/chat/client/src/main/java/org/apidesign/html/chatserver/client/ChatClient.java	Fri Dec 20 08:24:57 2013 +0100
+++ b/chat/client/src/main/java/org/apidesign/html/chatserver/client/ChatClient.java	Sun Jan 12 23:25:42 2014 +0100
@@ -24,7 +24,6 @@
 package org.apidesign.html.chatserver.client;
 
 import net.java.html.json.ComputedProperty;
-import net.java.html.json.Context;
 import net.java.html.json.Function;
 import net.java.html.json.Model;
 import net.java.html.json.OnReceive;
@@ -53,7 +52,7 @@
         if (!sendEnabled(m.getUser(), m.getComment())) {
             return;
         }
-        Message msg = new Message(CNTX);
+        Message msg = new Message();
         msg.setUser(m.getUser());
         msg.setComment(m.getComment());
         m.postComment(msg);
@@ -89,10 +88,9 @@
         m.updateMsgs("" + (now + 1));
     }
     
-    static final Context CNTX = Context.findDefault(ChatClient.class);
     static {
-        ChatModel chm = new ChatModel(CNTX);
-        Message m = new Message(CNTX);
+        ChatModel chm = new ChatModel();
+        Message m = new Message();
         m.setComment("Waiting for messages from the server...");
         m.setUser("system");
         chm.getMsgs().add(m);
diff -r 68cecf6c3113 -r 9984b9f7d8c6 chat/client/src/test/java/org/apidesign/html/chatserver/client/ChatClientTest.java
--- a/chat/client/src/test/java/org/apidesign/html/chatserver/client/ChatClientTest.java	Fri Dec 20 08:24:57 2013 +0100
+++ b/chat/client/src/test/java/org/apidesign/html/chatserver/client/ChatClientTest.java	Sun Jan 12 23:25:42 2014 +0100
@@ -23,7 +23,6 @@
  */
 package org.apidesign.html.chatserver.client;
 
-import net.java.html.json.Context;
 import static org.testng.Assert.*;
 import org.testng.annotations.Test;
 
@@ -36,7 +35,7 @@
     }
     
     @Test public void hasSendEnabled() {
-        ChatModel m = new ChatModel(Context.EMPTY);
+        ChatModel m = new ChatModel();
         assertFalse(m.isSendEnabled(), "By default disabled");
         m.setComment("some msg");
         m.setUser("by me");
diff -r 68cecf6c3113 -r 9984b9f7d8c6 chat/model/pom.xml
--- a/chat/model/pom.xml	Fri Dec 20 08:24:57 2013 +0100
+++ b/chat/model/pom.xml	Sun Jan 12 23:25:42 2014 +0100
@@ -17,7 +17,7 @@
   </properties>
   <dependencies>
     <dependency>
-      <groupId>org.apidesign.html</groupId>
+      <groupId>org.netbeans.html</groupId>
       <artifactId>net.java.html.json</artifactId>
       <version>${net.java.html.version}</version>
       <type>jar</type>
diff -r 68cecf6c3113 -r 9984b9f7d8c6 chat/model/src/test/java/org/apidesign/html/chatserver/model/MessageImplTest.java
--- a/chat/model/src/test/java/org/apidesign/html/chatserver/model/MessageImplTest.java	Fri Dec 20 08:24:57 2013 +0100
+++ b/chat/model/src/test/java/org/apidesign/html/chatserver/model/MessageImplTest.java	Sun Jan 12 23:25:42 2014 +0100
@@ -23,7 +23,6 @@
  */
 package org.apidesign.html.chatserver.model;
 
-import net.java.html.json.Context;
 import static org.testng.Assert.*;
 import org.testng.annotations.Test;
 
@@ -34,12 +33,12 @@
 public class MessageImplTest {
     
     @Test public void properlyConvertedToSeconds() {
-        Message msg = new Message(Context.EMPTY);
+        Message msg = new Message();
         msg.setSince(5143);
         assertEquals(msg.getAt(), "5s");
     }
     @Test public void properlyConvertedToMinutes() {
-        Message msg = new Message(Context.EMPTY);
+        Message msg = new Message();
         msg.setSince(63564);
         assertEquals(msg.getAt(), "1min");
     }
diff -r 68cecf6c3113 -r 9984b9f7d8c6 chat/pom.xml
--- a/chat/pom.xml	Fri Dec 20 08:24:57 2013 +0100
+++ b/chat/pom.xml	Sun Jan 12 23:25:42 2014 +0100
@@ -13,8 +13,8 @@
   <name>Chat Server with Jersey and Bck2Brwsr</name>
   <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <net.java.html.version>0.3</net.java.html.version>
-      <bck2brwsr.version>0.7.2</bck2brwsr.version>
+      <net.java.html.version>0.7-SNAPSHOT</net.java.html.version>
+      <bck2brwsr.version>0.9-SNAPSHOT</bck2brwsr.version>
       <bck2brwsr.obfuscationlevel>MINIMAL</bck2brwsr.obfuscationlevel>
   </properties>
   <modules>
diff -r 68cecf6c3113 -r 9984b9f7d8c6 chat/server/pom.xml
--- a/chat/server/pom.xml	Fri Dec 20 08:24:57 2013 +0100
+++ b/chat/server/pom.xml	Sun Jan 12 23:25:42 2014 +0100
@@ -62,7 +62,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apidesign.html</groupId>
+      <groupId>org.netbeans.html</groupId>
       <artifactId>net.java.html.json</artifactId>
       <version>${net.java.html.version}</version>
       <type>jar</type>
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.glassfish.jersey.media</groupId>
       <artifactId>html-json</artifactId>
-      <version>2.1</version>
+      <version>2.6-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -82,18 +82,18 @@
     <dependency>
       <groupId>org.glassfish.jersey.connectors</groupId>
       <artifactId>jersey-grizzly-connector</artifactId>
-      <version>2.1</version>
+      <version>2.4.1</version>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.containers</groupId>
       <artifactId>jersey-container-grizzly2-http</artifactId>
-      <version>2.1</version>
+      <version>2.6-SNAPSHOT</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>org.glassfish.grizzly</groupId>
       <artifactId>grizzly-http-server</artifactId>
-      <version>2.3.1</version>
+      <version>2.3.8</version>
     </dependency>
     <dependency>
       <groupId>org.apidesign.html.demo</groupId>
@@ -105,7 +105,7 @@
       <artifactId>javax.ws.rs-api</artifactId>
       <groupId>javax.ws.rs</groupId>
       <type>jar</type>
-      <version>2.0-rc3</version>
+      <version>2.0</version>
     </dependency>
   </dependencies>
 </project>
diff -r 68cecf6c3113 -r 9984b9f7d8c6 chat/server/src/main/java/org/apidesign/bck2brwsr/demo/chatserver/impl/ChatServerResource.java
--- a/chat/server/src/main/java/org/apidesign/bck2brwsr/demo/chatserver/impl/ChatServerResource.java	Fri Dec 20 08:24:57 2013 +0100
+++ b/chat/server/src/main/java/org/apidesign/bck2brwsr/demo/chatserver/impl/ChatServerResource.java	Sun Jan 12 23:25:42 2014 +0100
@@ -39,7 +39,6 @@
 import javax.ws.rs.container.AsyncResponse;
 import javax.ws.rs.container.Suspended;
 import javax.ws.rs.core.MediaType;
-import net.java.html.json.Context;
 import org.apidesign.html.chatserver.model.Message;
 import org.apidesign.html.chatserver.model.Query;
 
@@ -51,7 +50,7 @@
     
     private List<Message> msgs = new ArrayList<>();
     {
-        Message welcome = new Message(Context.findDefault(Message.class));
+        Message welcome = new Message();
         welcome.setUser("system");
         welcome.setComment("Welcome and enjoy!");
         welcome.setSince(10);
@@ -65,7 +64,7 @@
         @QueryParam("since") @DefaultValue("0") long since,
         @Suspended AsyncResponse ar
     ) {
-        Query q = new Query(Context.findDefault(ChatServerResource.class));
+        Query q = new Query();
         for (Message m : msgs) {
             if (m.getSince()>= since) {
                 q.getMessages().add(m);
diff -r 68cecf6c3113 -r 9984b9f7d8c6 chess/pom.xml
--- a/chess/pom.xml	Fri Dec 20 08:24:57 2013 +0100
+++ b/chess/pom.xml	Sun Jan 12 23:25:42 2014 +0100
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
     <parent>
-    <artifactId>demo</artifactId>
-    <groupId>org.apidesign.html</groupId>
+        <artifactId>demo</artifactId>
+        <groupId>org.apidesign.html</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
@@ -34,9 +34,9 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <netbeans.compile.on.save>none</netbeans.compile.on.save>
-    <net.java.html.version>0.6</net.java.html.version>
-    <bck2brwsr.version>0.8</bck2brwsr.version>
-    <bck2brwsr.launcher.version>0.8</bck2brwsr.launcher.version>
+    <net.java.html.version>0.7-SNAPSHOT</net.java.html.version>
+    <bck2brwsr.version>0.9-SNAPSHOT</bck2brwsr.version>
+    <bck2brwsr.launcher.version>0.9-SNAPSHOT</bck2brwsr.launcher.version>
     <bck2brwsr.obfuscationlevel>MINIMAL</bck2brwsr.obfuscationlevel>
     <brwsr.startpage>pages/index.html</brwsr.startpage>
   </properties>
@@ -58,7 +58,7 @@
               <configuration>
                   <archive>
                       <manifest>
-                          <mainClass>org.apidesign.html.demo.chess.Main</mainClass>
+                          <mainClass>org.netbeans.html.demo.chess.Main</mainClass>
                           <addClasspath>true</addClasspath>
                           <classpathPrefix>lib/</classpathPrefix>
                       </manifest>
@@ -76,7 +76,7 @@
                           <value>${basedir}/src/main/webapp/</value>
                       </systemProperty>
                   </systemProperties>
-                  <mainClass>org.apidesign.html.demo.chess.Main</mainClass>
+                  <mainClass>org.netbeans.html.demo.chess.Main</mainClass>
               </configuration>
           </plugin>      
           <plugin>
@@ -115,12 +115,12 @@
   </build>
   <dependencies>
     <dependency>
-        <groupId>org.apidesign.html</groupId>
+        <groupId>org.netbeans.html</groupId>
         <artifactId>net.java.html.json</artifactId>
         <version>${net.java.html.version}</version>
     </dependency>
     <dependency>
-        <groupId>org.apidesign.html</groupId>
+        <groupId>org.netbeans.html</groupId>
         <artifactId>net.java.html.boot</artifactId>
         <version>${net.java.html.version}</version>
     </dependency>
@@ -131,7 +131,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apidesign.html</groupId>
+      <groupId>org.netbeans.html</groupId>
       <artifactId>net.java.html.sound</artifactId>
       <version>${net.java.html.version}</version>
       <type>jar</type>
@@ -152,19 +152,19 @@
           </activation>
           <dependencies>
               <dependency>
-                  <groupId>org.apidesign.html</groupId>
-                  <artifactId>ko-fx</artifactId>
+                  <groupId>org.netbeans.html</groupId>
+                  <artifactId>ko4j</artifactId>
                   <version>${net.java.html.version}</version>
                   <scope>runtime</scope>
               </dependency>
               <dependency>
-                  <groupId>org.apidesign.html</groupId>
-                  <artifactId>boot-fx</artifactId>
+                  <groupId>org.netbeans.html</groupId>
+                  <artifactId>net.java.html.boot.fx</artifactId>
                   <version>${net.java.html.version}</version>
                   <scope>runtime</scope>
               </dependency>
               <dependency>
-                  <groupId>org.apidesign.html</groupId>
+                  <groupId>org.netbeans.html</groupId>
                   <artifactId>ko-ws-tyrus</artifactId>
                   <scope>runtime</scope>
                   <version>${net.java.html.version}</version>
diff -r 68cecf6c3113 -r 9984b9f7d8c6 pom.xml
--- a/pom.xml	Fri Dec 20 08:24:57 2013 +0100
+++ b/pom.xml	Sun Jan 12 23:25:42 2014 +0100
@@ -13,11 +13,10 @@
   </parent>  
   <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <bck2brwsr.version>0.7</bck2brwsr.version>
+      <bck2brwsr.version>0.9-SNAPSHOT</bck2brwsr.version>
       <license>COPYING</license>
   </properties>
   <modules>
-    <module>twitter</module>
     <module>chat</module>
     <module>chess</module>
     <module>spinningcube</module>
diff -r 68cecf6c3113 -r 9984b9f7d8c6 spinningcube/pom.xml
--- a/spinningcube/pom.xml	Fri Dec 20 08:24:57 2013 +0100
+++ b/spinningcube/pom.xml	Sun Jan 12 23:25:42 2014 +0100
@@ -26,7 +26,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <net.java.html.version>0.4</net.java.html.version>
+    <net.java.html.version>0.7-SNAPSHOT</net.java.html.version>
     <project.mainclass>org.apidesign.demo.spinningcube.Main</project.mainclass>
     <netbeans.compile.on.save>none</netbeans.compile.on.save>
   </properties>
@@ -91,24 +91,24 @@
   </build>
   <dependencies>
     <dependency>
-        <groupId>org.apidesign.html</groupId>
+        <groupId>org.netbeans.html</groupId>
         <artifactId>net.java.html.json</artifactId>
         <version>${net.java.html.version}</version>
     </dependency>
     <dependency>
-        <groupId>org.apidesign.html</groupId>
+        <groupId>org.netbeans.html</groupId>
         <artifactId>net.java.html.boot</artifactId>
         <version>${net.java.html.version}</version>
     </dependency>
     <dependency>
-        <groupId>org.apidesign.html</groupId>
-        <artifactId>ko-fx</artifactId>
+        <groupId>org.netbeans.html</groupId>
+        <artifactId>ko4j</artifactId>
         <version>${net.java.html.version}</version>
         <scope>runtime</scope>
     </dependency>
     <dependency>
-        <groupId>org.apidesign.html</groupId>
-        <artifactId>boot-fx</artifactId>
+        <groupId>org.netbeans.html</groupId>
+        <artifactId>net.java.html.boot.fx</artifactId>
         <version>${net.java.html.version}</version>
         <scope>runtime</scope>
     </dependency>
diff -r 68cecf6c3113 -r 9984b9f7d8c6 spinningcube/src/main/java/org/apidesign/demo/spinningcube/DataModel.java
--- a/spinningcube/src/main/java/org/apidesign/demo/spinningcube/DataModel.java	Fri Dec 20 08:24:57 2013 +0100
+++ b/spinningcube/src/main/java/org/apidesign/demo/spinningcube/DataModel.java	Sun Jan 12 23:25:42 2014 +0100
@@ -23,6 +23,8 @@
  */
 package org.apidesign.demo.spinningcube;
 
+import java.util.Arrays;
+import java.util.List;
 import net.java.html.json.ComputedProperty;
 import net.java.html.json.Model;
 import net.java.html.json.Property;
@@ -35,12 +37,12 @@
     @Property(name = "message", type = String.class),
 })
 final class DataModel {
-    @ComputedProperty static String[] sides(String message) {
+    @ComputedProperty static List<String> sides(String message) {
         String[] arr = new String[6];
         String[] words = message == null ? new String[0] : message.split(" ", 6);
         for (int i = 0; i < 6; i++) {
             arr[i] = words.length > i ? words[i] : "!";
         }
-        return arr;
+        return Arrays.asList(arr);
     }
 }
diff -r 68cecf6c3113 -r 9984b9f7d8c6 twitter/nbactions.xml
--- a/twitter/nbactions.xml	Fri Dec 20 08:24:57 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    The MIT License (MIT)
-
-    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<actions>
-    <action>
-        <actionName>run</actionName>
-        <goals>
-            <goal>package</goal>
-            <goal>exec:java</goal>
-        </goals>
-    </action>
-    <action>
-        <actionName>debug</actionName>
-        <goals>
-            <goal>package</goal>
-            <goal>exec:java</goal>
-        </goals>
-        <properties>
-            <jpda.listen>maven</jpda.listen>
-        </properties>
-    </action>
-</actions>
diff -r 68cecf6c3113 -r 9984b9f7d8c6 twitter/pom.xml
--- a/twitter/pom.xml	Fri Dec 20 08:24:57 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apidesign.html.demo</groupId>
-  <artifactId>twitter</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <parent>
-      <groupId>org.apidesign.html</groupId>
-      <artifactId>demo</artifactId>
-      <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <name>KO4Java's Twttr</name>
-  <description>
-      Rewrite of knockout.js example to use model written in Java displayed
-      by HTML.
-  </description>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <net.java.html.version>0.6</net.java.html.version>
-    <project.mainclass>org.apidesign.html.demo.twitter.TwitterMain</project.mainclass>
-  </properties>
-
-  <pluginRepositories>
-      <pluginRepository>
-          <id>java.net</id>
-          <name>Java.net</name>
-          <url>https://maven.java.net/content/repositories/releases/</url>
-      </pluginRepository>
-  </pluginRepositories>
-
-  <build>
-      <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <version>2.3.2</version>
-              <configuration>
-                  <source>1.7</source>
-                  <target>1.7</target>
-              </configuration>
-          </plugin>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <version>2.14.1</version>
-              <configuration>
-                  <systemPropertyVariables>
-                      <vmtest.brwsrs>${brwsr}</vmtest.brwsrs>
-                  </systemPropertyVariables>
-              </configuration>
-          </plugin>
-          <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>exec-maven-plugin</artifactId>
-              <version>1.2.1</version>
-              <configuration>
-                  <systemProperties>
-                      <systemProperty>
-                          <key>browser.rootdir</key>
-                          <value>${basedir}/src/main/webapp/</value>
-                      </systemProperty>
-                  </systemProperties>
-                  <mainClass>${project.mainclass}</mainClass>
-              </configuration>
-          </plugin>      
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-jar-plugin</artifactId>
-              <version>2.4</version>
-              <configuration>
-                  <archive>
-                      <manifest>
-                          <addClasspath>true</addClasspath>
-                          <classpathPrefix>lib/</classpathPrefix>
-                      </manifest>
-                  </archive>
-              </configuration>
-          </plugin>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-deploy-plugin</artifactId>
-              <version>2.7</version>
-              <configuration>
-                  <skip>true</skip>
-              </configuration>
-          </plugin>      
-      </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <version>6.5.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apidesign.html</groupId>
-      <artifactId>net.java.html.json</artifactId>
-      <version>${net.java.html.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apidesign.html</groupId>
-      <artifactId>net.java.html.boot</artifactId>
-      <version>${net.java.html.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apidesign.html</groupId>
-      <artifactId>boot-fx</artifactId>
-      <version>${net.java.html.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apidesign.html</groupId>
-      <artifactId>ko-fx</artifactId>
-      <version>${net.java.html.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-</project>
diff -r 68cecf6c3113 -r 9984b9f7d8c6 twitter/src/main/assembly/fxbrwsr.xml
--- a/twitter/src/main/assembly/fxbrwsr.xml	Fri Dec 20 08:24:57 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    The MIT License (MIT)
-
-    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  
-  <id>fxbrwsr</id>
-  <formats>
-      <format>zip</format>
-  </formats>
-  <baseDirectory>${project.build.finalName}-fxbrwsr</baseDirectory>
-  <dependencySets>
-    <dependencySet>
-        <useProjectArtifact>false</useProjectArtifact>
-        <scope>runtime</scope>
-        <outputDirectory>lib</outputDirectory>
-    </dependencySet>
-  </dependencySets> 
-  <files>
-    <file>
-      <source>${project.build.directory}/${project.build.finalName}.jar</source>
-      <outputDirectory>/</outputDirectory>
-    </file>
-  </files>
-</assembly>
\ No newline at end of file
diff -r 68cecf6c3113 -r 9984b9f7d8c6 twitter/src/main/java/org/apidesign/html/demo/twitter/TwitterClient.java
--- a/twitter/src/main/java/org/apidesign/html/demo/twitter/TwitterClient.java	Fri Dec 20 08:24:57 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package org.apidesign.html.demo.twitter;
-
-import java.util.Arrays;
-import java.util.List;
-import net.java.html.json.ComputedProperty;
-import net.java.html.json.Function;
-import net.java.html.json.Model;
-import net.java.html.json.OnPropertyChange;
-import net.java.html.json.OnReceive;
-import net.java.html.json.Property;
-
-/** Controller class for access to Twitter.
- * 
- * @author Jaroslav Tulach
- */
-@Model(className="TwitterModel", properties={
-    @Property(name="savedLists", type=Tweeters.class, array = true),
-    @Property(name="activeTweetersName", type=String.class),
-    @Property(name="activeTweeters", type=String.class, array = true),
-    @Property(name="userNameToAdd", type=String.class),
-    @Property(name="currentTweets", type=Tweet.class, array = true),
-    @Property(name="loading", type=boolean.class)
-})
-final class TwitterClient {
-    @Model(className = "Tweeters", properties = {
-        @Property(name="name", type = String.class),
-        @Property(name="userNames", type = String.class, array = true)
-    })
-    static class Twttrs {
-    }
-    @Model(className = "Tweet", properties = {
-        @Property(name = "from_user", type = String.class),
-        @Property(name = "from_user_id", type = int.class),
-        @Property(name = "profile_image_url", type = String.class),
-        @Property(name = "text", type = String.class),
-        @Property(name = "created_at", type = String.class),
-    })
-    static final class Twt {
-        @ComputedProperty static String html(String text) {
-            StringBuilder sb = new StringBuilder(320);
-            for (int pos = 0;;) {
-                int http = text.indexOf("http", pos);
-                if (http == -1) {
-                    sb.append(text.substring(pos));
-                    return sb.toString();
-                }
-                int spc = text.indexOf(' ', http);
-                if (spc == -1) {
-                    spc = text.length();
-                }
-                sb.append(text.substring(pos, http));
-                String url = text.substring(http, spc);
-                sb.append("<a href='").append(url).append("'>").append(url).append("</a>");
-                pos = spc;
-            }
-        }
-        
-        @ComputedProperty static String userUrl(String from_user) {
-            return "http://twitter.com/" + from_user;
-        }
-    }
-    @Model(className = "TwitterQuery", properties = {
-        @Property(array = true, name = "results", type = Twt.class)
-    })
-    public static final class TwttrQr {
-    }
-    
-    @OnReceive(url="{root}/search.json?{query}&callback={me}", jsonp="me")
-    static void queryTweets(TwitterModel page, TwitterQuery q) {
-        page.getCurrentTweets().clear();
-        page.getCurrentTweets().addAll(q.getResults());
-        page.setLoading(false);
-    }
-    
-    @OnPropertyChange("activeTweetersName")
-    static void changeTweetersList(TwitterModel model) {
-        Tweeters people = findByName(model.getSavedLists(), model.getActiveTweetersName());        
-        model.getActiveTweeters().clear();
-        model.getActiveTweeters().addAll(people.getUserNames());
-    }
-    
-    @OnPropertyChange({ "activeTweeters", "activeTweetersCount" })
-    static void refreshTweets(TwitterModel model) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("rpp=25&q=");
-        String sep = "";
-        for (String p : model.getActiveTweeters()) {
-            sb.append(sep);
-            sb.append("from:");
-            sb.append(p);
-            sep = " OR ";
-        }
-        model.setLoading(true);
-        model.queryTweets("http://search.twitter.com", sb.toString());
-    }
-    
-    static void init() {
-        final TwitterModel model = new TwitterModel();
-        final List<Tweeters> svdLst = model.getSavedLists();
-        svdLst.add(newTweeters("API Design", "JaroslavTulach"));
-        svdLst.add(newTweeters("Celebrities", "JohnCleese", "MCHammer", "StephenFry", "algore", "StevenSanderson"));
-        svdLst.add(newTweeters("Microsoft people", "BillGates", "shanselman", "ScottGu"));
-        svdLst.add(newTweeters("NetBeans", "GeertjanW","monacotoni", "NetBeans", "petrjiricka"));
-        svdLst.add(newTweeters("Tech pundits", "Scobleizer", "LeoLaporte", "techcrunch", "BoingBoing", "timoreilly", "codinghorror"));
-
-        model.setActiveTweetersName("NetBeans");
-
-        model.applyBindings();
-    }
-    
-    @ComputedProperty
-    static boolean hasUnsavedChanges(List<String> activeTweeters, List<Tweeters> savedLists, String activeTweetersName) {
-        Tweeters tw = findByName(savedLists, activeTweetersName);
-        if (activeTweeters == null) {
-            return false;
-        }
-        return !tw.getUserNames().equals(activeTweeters);
-    }
-    
-    @ComputedProperty
-    static int activeTweetersCount(List<String> activeTweeters) {
-        return activeTweeters.size();
-    }
-    
-    @ComputedProperty
-    static boolean userNameToAddIsValid(
-        String userNameToAdd, String activeTweetersName, List<Tweeters> savedLists, List<String> activeTweeters
-    ) {
-        return userNameToAdd != null && 
-            userNameToAdd.matches("[a-zA-Z0-9_]{1,15}") &&
-            !activeTweeters.contains(userNameToAdd);
-    }
-    
-    @Function
-    static void deleteList(TwitterModel model) {
-        final List<Tweeters> sl = model.getSavedLists();
-        sl.remove(findByName(sl, model.getActiveTweetersName()));
-        if (sl.isEmpty()) {
-            final Tweeters t = new Tweeters();
-            t.setName("New");
-            sl.add(t);
-        }
-        model.setActiveTweetersName(sl.get(0).getName());
-    }
-    
-    @Function
-    static void saveChanges(TwitterModel model) {
-        Tweeters t = findByName(model.getSavedLists(), model.getActiveTweetersName());
-        int indx = model.getSavedLists().indexOf(t);
-        if (indx != -1) {
-            t.setName(model.getActiveTweetersName());
-            t.getUserNames().clear();
-            t.getUserNames().addAll(model.getActiveTweeters());
-        }
-    }
-    
-    @Function
-    static void addUser(TwitterModel model) {
-        String n = model.getUserNameToAdd();
-        model.getActiveTweeters().add(n);
-    }
-    @Function
-    static void removeUser(String data, TwitterModel model) {
-        model.getActiveTweeters().remove(data);
-    }
-    
-    private static Tweeters findByName(List<Tweeters> list, String name) {
-        for (Tweeters l : list) {
-            if (l.getName() != null && l.getName().equals(name)) {
-                return l;
-            }
-        }
-        return list.isEmpty() ? new Tweeters() : list.get(0);
-    }
-    
-    private static Tweeters newTweeters(String listName, String... userNames) {
-        Tweeters t = new Tweeters();
-        t.setName(listName);
-        t.getUserNames().addAll(Arrays.asList(userNames));
-        return t;
-    }
-}
diff -r 68cecf6c3113 -r 9984b9f7d8c6 twitter/src/main/java/org/apidesign/html/demo/twitter/TwitterMain.java
--- a/twitter/src/main/java/org/apidesign/html/demo/twitter/TwitterMain.java	Fri Dec 20 08:24:57 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package org.apidesign.html.demo.twitter;
-
-import net.java.html.boot.BrowserBuilder;
-
-/** Boots browser and then performs initialization when the HTML page
- * is ready.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class TwitterMain {
-    private TwitterMain() {
-    }
-    
-    public static void main(String... args) {
-        BrowserBuilder.newBrowser().loadPage("pages/index.html")
-            .invoke("onPageLoad", args).loadClass(TwitterMain.class)
-            .showAndWait();
-        System.exit(0);
-    }
-    
-    public static void onPageLoad(String... args) {
-        TwitterClient.init();
-    }
-}
diff -r 68cecf6c3113 -r 9984b9f7d8c6 twitter/src/main/webapp/pages/index.html
--- a/twitter/src/main/webapp/pages/index.html	Fri Dec 20 08:24:57 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    The MIT License (MIT)
-
-    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-
-<!--
-    Copied from knockout.js Twitter example:
-    http://knockoutjs.com/examples/twitter.html
--->
-
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>Html and Java Twitter</title>
-    </head>
-    <body>
-        <link href='twitterExample.css' rel='Stylesheet' ></link>
-        
-        <style type='text/css'>
-           .liveExample select { height: 1.7em; }
-           .liveExample button { height: 2em; }
-        </style>
-        
-        
-        <h2>Bck2Brwsr's Twitter</h2>
-        
-        <p>
-        This code is based on original <a href="http://knockoutjs.com/examples/twitter.html">knockout.js Twitter example</a> and
-        uses almost unmodified HTML page. It just changes the model. It 
-        is written in Java language and it is executed using the HotSpot
-        virtual machine. The Java source code has about 190 lines and is available 
-        <a href="http://source.apidesign.org/hg/bck2brwsr/file/7fc6b7e9c982/javaquery/demo-twitter/src/main/java/org/apidesign/bck2brwsr/demo/twitter/TwitterClient.java">here</a>
-        - in fact it may even be more dense than the original JavaScript model.
-        </p>
-        
-        <div class='liveExample'>
-            <div class='configuration'>
-                <div class='listChooser'>
-                    <button data-bind='click: deleteList, enable: activeTweetersName'>Delete</button>
-                    <button data-bind='click: saveChanges, enable: hasUnsavedChanges'>Save</button> 
-                    <select data-bind='options: savedLists, optionsValue: "name", value: activeTweetersName'> </select>
-                </div>
-
-                <p>Currently viewing <span data-bind='text: activeTweetersCount'> </span> user(s):</p>
-                <div class='currentUsers' >
-                    <ul data-bind='foreach: activeTweeters'>
-                        <li>
-                            <button data-bind='click: $root.removeUser'>Remove</button>
-                            <div data-bind='text: $data'> </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <form data-bind='submit: addUser'>
-                    <label>Add user:</label>
-                    <input data-bind='value: userNameToAdd, valueUpdate: "keyup", css: { invalid: !userNameToAddIsValid() }' />
-                    <button data-bind='enable: userNameToAddIsValid' type='submit'>Add</button>
-                </form>
-            </div>
-            <div class='tweets'>
-                <div class='loadingIndicator' data-bind="visible: loading">Loading...</div>
-                <table data-bind='foreach: currentTweets' width='100%'>
-                    <tr>
-                        <td><img data-bind='attr: { src: profile_image_url }' /></td>
-                        <td>
-                            <a class='twitterUser' data-bind='attr: { href: userUrl }, text: from_user'> </a>
-                            <span data-bind='html: html'> </span>
-                            <div class='tweetInfo' data-bind='text: created_at'> </div>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </body>
-</html>
diff -r 68cecf6c3113 -r 9984b9f7d8c6 twitter/src/main/webapp/pages/twitterExample.css
--- a/twitter/src/main/webapp/pages/twitterExample.css	Fri Dec 20 08:24:57 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-
-
-/*
-    Copied from knockout.js Twitter example:
-    http://knockoutjs.com/examples/twitter.html
-*/
-
-.configuration, .tweets, .tweets td { font-family: Verdana; font-size: 13px; }
-.configuration { background-color: #DEDEDE; border: 2px solid gray; float:left; height: 40em; width: 40%; padding: 0.5em; border-right-width:0; }
-.tweets { width: 55%; border: 2px solid gray; height: 40em; overflow: scroll; overflow-x: hidden; background-color: Black; color: White; padding: 0.5em; position: relative; }
-.tweets table { border-width: 0;}
-.tweets tr { vertical-align: top; }
-.tweets td { padding: 0.4em 0.3em 1em 0.4em; border-width: 0; }
-.tweets img { width: 4em; }
-.tweetInfo { color: Gray; font-size: 0.9em; }
-.twitterUser { color: #77AAFF; text-decoration: none; font-size: 1.1em; font-weight: bold; }
-input.invalid { border: 1px solid red !important; background-color: #FFAAAA !important; }
-
-.listChooser select, .listChooser button { vertical-align:top; }
-.listChooser select { width: 60%; font-size:1.2em; height:1.4em; }
-.listChooser button { width: 19%; height:1.68em; float:right; }
-
-.currentUsers { height: 28em; overflow-y: auto; overflow-x: hidden; }
-.currentUsers button { float: right; height: 2.5em; margin: 0.1em; padding-left: 1em; padding-right: 1em; }
-.currentUsers ul, .configuration li { list-style: none; margin: 0; padding: 0 }
-.currentUsers li { height: 2.4em; font-size: 1.2em; background-color: #A7D0E3; border: 1px solid gray; margin-bottom: 0.3em; -webkit-border-radius: 5px; -moz-border-radius: 5px; -webkit-box-shadow: 0 0.2em 0.5em gray; -moz-box-shadow: 0 0.2em 0.5em gray; }
-.currentUsers li div { padding: 0.6em; }
-.currentUsers li:hover { background-color: #EEC; }
-
-.configuration form label { width: 25%; display: inline-block; text-align:right; overflow: hidden; }
-.configuration form input { width:40%; font-size: 1.3em; border:1px solid silver; background-color: White; padding: 0.1em; }
-.configuration form button { width: 20%; margin-left: 0.3em; height: 2em; }
-
-.loadingIndicator { position: absolute; top: 0.1em; left: 0.1em; font: 0.8em Arial; background-color: #229; color: White; padding: 0.2em 0.5em 0.2em 0.5em; }
diff -r 68cecf6c3113 -r 9984b9f7d8c6 twitter/src/test/java/org/apidesign/html/demo/twitter/TwitterClientTest.java
--- a/twitter/src/test/java/org/apidesign/html/demo/twitter/TwitterClientTest.java	Fri Dec 20 08:24:57 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package org.apidesign.html.demo.twitter;
-
-import java.util.List;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/** We can unit test the TwitterModel smoothly.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class TwitterClientTest {
-    private TwitterModel model;
-    
-
-    @BeforeMethod
-    public void initModel() {
-        model = new TwitterModel();
-    }
-
-    @Test public void testIsValidToAdd() {
-        model.setUserNameToAdd("Joe");
-        Tweeters t = new Tweeters();
-        t.setName("test");
-        model.getSavedLists().add(t);
-        model.setActiveTweetersName("test");
-        
-        assertTrue(model.isUserNameToAddIsValid(), "Joe is OK");
-        TwitterClient.addUser(model);
-        assertFalse(model.isUserNameToAddIsValid(), "Can't add Joe for the 2nd time");
-        assertEquals(t.getUserNames().size(), 0, "Original tweeters list remains empty");
-        
-        List<String> mod = model.getActiveTweeters();
-        assertTrue(model.isHasUnsavedChanges(), "We have modifications");
-        assertEquals(mod.size(), 1, "One element in the list");
-        assertEquals(mod.get(0), "Joe", "Its name is Joe");
-        
-        assertSame(model.getActiveTweeters(), mod, "Editing list is the modified one");
-        
-        TwitterClient.saveChanges(model);
-        assertFalse(model.isHasUnsavedChanges(), "Does not have anything to save");
-        
-        assertSame(model.getActiveTweeters(), mod, "Still editing the old modified one");
-    }
-    
-    @Test public void httpAtTheEnd() {
-        String res = TwitterClient.Twt.html("Ahoj http://kuk");
-        assertEquals(res, "Ahoj <a href='http://kuk'>http://kuk</a>");
-    }
-}
diff -r 68cecf6c3113 -r 9984b9f7d8c6 words/pom.xml
--- a/words/pom.xml	Fri Dec 20 08:24:57 2013 +0100
+++ b/words/pom.xml	Sun Jan 12 23:25:42 2014 +0100
@@ -26,7 +26,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <net.java.html.version>0.6</net.java.html.version>
+    <net.java.html.version>0.7-SNAPSHOT</net.java.html.version>
     <project.mainclass>org.apidesign.demo.words.Main</project.mainclass>
     <netbeans.compile.on.save>none</netbeans.compile.on.save>
   </properties>
@@ -91,24 +91,24 @@
   </build>
   <dependencies>
     <dependency>
-        <groupId>org.apidesign.html</groupId>
+        <groupId>org.netbeans.html</groupId>
         <artifactId>net.java.html.json</artifactId>
         <version>${net.java.html.version}</version>
     </dependency>
     <dependency>
-        <groupId>org.apidesign.html</groupId>
+        <groupId>org.netbeans.html</groupId>
         <artifactId>net.java.html.boot</artifactId>
         <version>${net.java.html.version}</version>
     </dependency>
     <dependency>
-        <groupId>org.apidesign.html</groupId>
-        <artifactId>ko-fx</artifactId>
+        <groupId>org.netbeans.html</groupId>
+        <artifactId>ko4j</artifactId>
         <version>${net.java.html.version}</version>
         <scope>runtime</scope>
     </dependency>
     <dependency>
-        <groupId>org.apidesign.html</groupId>
-        <artifactId>boot-fx</artifactId>
+        <groupId>org.netbeans.html</groupId>
+        <artifactId>net.java.html.boot.fx</artifactId>
         <version>${net.java.html.version}</version>
         <scope>runtime</scope>
     </dependency>