1.1 --- a/chat/client/src/main/java/org/apidesign/html/chatserver/client/ChatClient.java Tue Nov 11 06:58:21 2014 +0100
1.2 +++ b/chat/client/src/main/java/org/apidesign/html/chatserver/client/ChatClient.java Fri Jan 09 06:10:00 2015 +0100
1.3 @@ -35,7 +35,7 @@
1.4 *
1.5 * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
1.6 */
1.7 -@Model(className = "ChatModel", properties = {
1.8 +@Model(className = "ChatModel", targetId = "", properties = {
1.9 @Property(name = "user", type = String.class),
1.10 @Property(name = "comment", type = String.class),
1.11 @Property(name = "msgs", type = Message.class, array = true)
2.1 --- a/chat/server/pom.xml Tue Nov 11 06:58:21 2014 +0100
2.2 +++ b/chat/server/pom.xml Fri Jan 09 06:10:00 2015 +0100
2.3 @@ -72,6 +72,16 @@
2.4 <artifactId>html-json</artifactId>
2.5 <version>${jersey.version}</version>
2.6 <scope>runtime</scope>
2.7 + <exclusions>
2.8 + <exclusion>
2.9 + <groupId>org.netbeans.html</groupId>
2.10 + <artifactId>net.java.html.json</artifactId>
2.11 + </exclusion>
2.12 + <exclusion>
2.13 + <groupId>org.netbeans.html</groupId>
2.14 + <artifactId>ko-ws-tyrus</artifactId>
2.15 + </exclusion>
2.16 + </exclusions>
2.17 </dependency>
2.18 <dependency>
2.19 <groupId>org.testng</groupId>
3.1 --- a/chess/src/main/java/org/apidesign/html/demo/chess/UIModel.java Tue Nov 11 06:58:21 2014 +0100
3.2 +++ b/chess/src/main/java/org/apidesign/html/demo/chess/UIModel.java Fri Jan 09 06:10:00 2015 +0100
3.3 @@ -36,7 +36,7 @@
3.4 *
3.5 * @author Jaroslav Tulach <jtulach@netbeans.org>
3.6 */
3.7 -@Model(className = "UI", properties = {
3.8 +@Model(className = "UI", targetId = "", properties = {
3.9 @Property(name = "status", type = String.class),
3.10 @Property(name = "selectedGameId", type = String.class),
3.11 @Property(name = "boards", type = Board.class, array = true),
4.1 --- a/minesweeper/pom.xml Tue Nov 11 06:58:21 2014 +0100
4.2 +++ b/minesweeper/pom.xml Fri Jan 09 06:10:00 2015 +0100
4.3 @@ -106,6 +106,14 @@
4.4 <groupId>com.oracle</groupId>
4.5 <artifactId>javafx</artifactId>
4.6 </exclusion>
4.7 + <exclusion>
4.8 + <groupId>org.netbeans.html</groupId>
4.9 + <artifactId>net.java.html.boot</artifactId>
4.10 + </exclusion>
4.11 + <exclusion>
4.12 + <groupId>org.netbeans.html</groupId>
4.13 + <artifactId>net.java.html.boot.fx</artifactId>
4.14 + </exclusion>
4.15 </exclusions>
4.16 </dependency>
4.17 <dependency>
5.1 --- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java Tue Nov 11 06:58:21 2014 +0100
5.2 +++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java Fri Jan 09 06:10:00 2015 +0100
5.3 @@ -35,7 +35,7 @@
5.4
5.5 /** Model of the mine field.
5.6 */
5.7 -@Model(className = "Mines", properties = {
5.8 +@Model(className = "Mines", targetId = "", properties = {
5.9 @Property(name = "state", type = MinesModel.GameState.class),
5.10 @Property(name = "rows", type = Row.class, array = true),
5.11 })
6.1 --- a/pom.xml Tue Nov 11 06:58:21 2014 +0100
6.2 +++ b/pom.xml Fri Jan 09 06:10:00 2015 +0100
6.3 @@ -13,11 +13,11 @@
6.4 </parent>
6.5 <properties>
6.6 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6.7 - <net.java.html.version>1.0</net.java.html.version>
6.8 + <net.java.html.version>1.1</net.java.html.version>
6.9 <jersey.version>2.13</jersey.version>
6.10 <grizzly.version>2.3.16</grizzly.version>
6.11 <nb.html.version>1.0</nb.html.version>
6.12 - <bck2brwsr.version>0.11</bck2brwsr.version>
6.13 + <bck2brwsr.version>0.12</bck2brwsr.version>
6.14 <teavm.version>0.2.1</teavm.version>
6.15 <license>COPYING</license>
6.16 </properties>
7.1 --- a/spinningcube/src/main/java/org/apidesign/demo/spinningcube/DataModel.java Tue Nov 11 06:58:21 2014 +0100
7.2 +++ b/spinningcube/src/main/java/org/apidesign/demo/spinningcube/DataModel.java Fri Jan 09 06:10:00 2015 +0100
7.3 @@ -33,7 +33,7 @@
7.4 *
7.5 * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
7.6 */
7.7 -@Model(className = "Data", properties = {
7.8 +@Model(className = "Data", targetId = "", properties = {
7.9 @Property(name = "message", type = String.class),
7.10 })
7.11 final class DataModel {
8.1 --- a/words/src/main/java/org/apidesign/demo/words/DataModel.java Tue Nov 11 06:58:21 2014 +0100
8.2 +++ b/words/src/main/java/org/apidesign/demo/words/DataModel.java Fri Jan 09 06:10:00 2015 +0100
8.3 @@ -34,7 +34,7 @@
8.4 *
8.5 * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
8.6 */
8.7 -@Model(className = "Data", properties = {
8.8 +@Model(className = "Data", targetId = "", properties = {
8.9 @Property(name = "message", type = String.class),
8.10 @Property(name = "on", type = boolean.class)
8.11 })