# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1420780200 -3600
# Node ID fd26342cf23dcc35175a736665b14b62389b6209
# Parent  40acb326771154615cd6dc42f48cdb36c3d42140
Switching to HTML/Java@1.1 and bck2brwsr@0.12

diff -r 40acb3267711 -r fd26342cf23d 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	Tue Nov 11 06:58:21 2014 +0100
+++ b/chat/client/src/main/java/org/apidesign/html/chatserver/client/ChatClient.java	Fri Jan 09 06:10:00 2015 +0100
@@ -35,7 +35,7 @@
  *
  * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
  */
-@Model(className = "ChatModel", properties = {
+@Model(className = "ChatModel", targetId = "", properties = {
     @Property(name = "user", type = String.class),
     @Property(name = "comment", type = String.class),
     @Property(name = "msgs", type = Message.class, array = true)
diff -r 40acb3267711 -r fd26342cf23d chat/server/pom.xml
--- a/chat/server/pom.xml	Tue Nov 11 06:58:21 2014 +0100
+++ b/chat/server/pom.xml	Fri Jan 09 06:10:00 2015 +0100
@@ -72,6 +72,16 @@
       <artifactId>html-json</artifactId>
       <version>${jersey.version}</version>
       <scope>runtime</scope>
+      <exclusions>
+          <exclusion>
+              <groupId>org.netbeans.html</groupId>
+              <artifactId>net.java.html.json</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>org.netbeans.html</groupId>
+              <artifactId>ko-ws-tyrus</artifactId>
+          </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
diff -r 40acb3267711 -r fd26342cf23d chess/src/main/java/org/apidesign/html/demo/chess/UIModel.java
--- a/chess/src/main/java/org/apidesign/html/demo/chess/UIModel.java	Tue Nov 11 06:58:21 2014 +0100
+++ b/chess/src/main/java/org/apidesign/html/demo/chess/UIModel.java	Fri Jan 09 06:10:00 2015 +0100
@@ -36,7 +36,7 @@
  *
  * @author Jaroslav Tulach <jtulach@netbeans.org>
  */
-@Model(className = "UI", properties = {
+@Model(className = "UI", targetId = "", properties = {
     @Property(name = "status", type = String.class),
     @Property(name = "selectedGameId", type = String.class),
     @Property(name = "boards", type = Board.class, array = true),
diff -r 40acb3267711 -r fd26342cf23d minesweeper/pom.xml
--- a/minesweeper/pom.xml	Tue Nov 11 06:58:21 2014 +0100
+++ b/minesweeper/pom.xml	Fri Jan 09 06:10:00 2015 +0100
@@ -106,6 +106,14 @@
           <groupId>com.oracle</groupId>
           <artifactId>javafx</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.netbeans.html</groupId>
+          <artifactId>net.java.html.boot</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.netbeans.html</groupId>
+          <artifactId>net.java.html.boot.fx</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff -r 40acb3267711 -r fd26342cf23d minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java
--- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java	Tue Nov 11 06:58:21 2014 +0100
+++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java	Fri Jan 09 06:10:00 2015 +0100
@@ -35,7 +35,7 @@
 
 /** Model of the mine field.
  */
-@Model(className = "Mines", properties = {
+@Model(className = "Mines", targetId = "", properties = {
     @Property(name = "state", type = MinesModel.GameState.class),
     @Property(name = "rows", type = Row.class, array = true),
 })
diff -r 40acb3267711 -r fd26342cf23d pom.xml
--- a/pom.xml	Tue Nov 11 06:58:21 2014 +0100
+++ b/pom.xml	Fri Jan 09 06:10:00 2015 +0100
@@ -13,11 +13,11 @@
   </parent>  
   <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <net.java.html.version>1.0</net.java.html.version>
+      <net.java.html.version>1.1</net.java.html.version>
       <jersey.version>2.13</jersey.version>
       <grizzly.version>2.3.16</grizzly.version>
       <nb.html.version>1.0</nb.html.version>
-      <bck2brwsr.version>0.11</bck2brwsr.version>
+      <bck2brwsr.version>0.12</bck2brwsr.version>
       <teavm.version>0.2.1</teavm.version>
       <license>COPYING</license>
   </properties>
diff -r 40acb3267711 -r fd26342cf23d spinningcube/src/main/java/org/apidesign/demo/spinningcube/DataModel.java
--- a/spinningcube/src/main/java/org/apidesign/demo/spinningcube/DataModel.java	Tue Nov 11 06:58:21 2014 +0100
+++ b/spinningcube/src/main/java/org/apidesign/demo/spinningcube/DataModel.java	Fri Jan 09 06:10:00 2015 +0100
@@ -33,7 +33,7 @@
  *
  * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
  */
-@Model(className = "Data", properties = {
+@Model(className = "Data", targetId = "", properties = {
     @Property(name = "message", type = String.class),
 })
 final class DataModel {
diff -r 40acb3267711 -r fd26342cf23d words/src/main/java/org/apidesign/demo/words/DataModel.java
--- a/words/src/main/java/org/apidesign/demo/words/DataModel.java	Tue Nov 11 06:58:21 2014 +0100
+++ b/words/src/main/java/org/apidesign/demo/words/DataModel.java	Fri Jan 09 06:10:00 2015 +0100
@@ -34,7 +34,7 @@
  *
  * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
  */
-@Model(className = "Data", properties = {
+@Model(className = "Data", targetId = "", properties = {
     @Property(name = "message", type = String.class),
     @Property(name = "on", type = boolean.class)
 })