# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1461297407 -7200
# Node ID a0f15cb8c73074efb6e4ae828ff5a2a0fc42f800
# Parent  0e2b05057c97921b543ef47a9cd09d2ef8fd8f44
Switching to newer version of the libraries

diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-android/nbactions.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client-android/nbactions.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,67 @@
+<?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>clean</goal>
+            <goal>package</goal>
+            <goal>android:deploy</goal>
+            <goal>android:run</goal>
+        </goals>
+        <properties>
+            <skipTests>true</skipTests>
+        </properties>
+    </action>
+    <action>
+        <actionName>debug</actionName>
+        <goals>
+            <goal>clean</goal>
+            <goal>package</goal>
+            <goal>android:deploy</goal>
+            <goal>android:run</goal>
+        </goals>
+        <properties>
+            <skipTests>true</skipTests>
+            <android.run.debug>${jpda.attach.port}</android.run.debug>
+            <jpda.attach>true</jpda.attach>
+        </properties>
+    </action>
+    <action>
+        <actionName>CUSTOM-android-run</actionName>
+        <displayName>Run in Android</displayName>
+        <goals>
+            <goal>clean</goal>
+            <goal>package</goal>
+            <goal>android:deploy</goal>
+            <goal>android:run</goal>
+        </goals>
+        <properties>
+            <skipTests>true</skipTests>
+        </properties>
+    </action>
+</actions>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-android/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client-android/pom.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,204 @@
+<?xml version="1.0"?>
+<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>
+        <groupId>org.apidesign.demo</groupId>
+        <artifactId>chat-pom</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apidesign.demo</groupId>
+    <artifactId>chat-android</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>apk</packaging>
+
+    <name>chat Client for Android</name>
+
+    <properties>
+        <platform.version>4.1.1.4</platform.version>
+        <android.plugin.version>4.2.0</android.plugin.version>
+        <android.platform.version>19</android.platform.version>
+        <debug>false</debug>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.netbeans.html</groupId>
+                <artifactId>html4j-maven-plugin</artifactId>
+                <version>${net.java.html.version}</version>
+                <executions>
+                    <execution>
+                        <id>js-classes</id>
+                        <goals>
+                            <goal>process-js-annotations</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>          
+            <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-jar-plugin</artifactId>
+                <version>2.4</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.9</version>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <type>zip</type>
+                    <classifier>webpages</classifier>
+                    <overWrite>true</overWrite>
+                    <outputDirectory>target/generated-sources/combined-assets/pages</outputDirectory>
+                    <includes>*/**</includes>
+                </configuration>
+            </plugin>            
+            <plugin>
+                <groupId>com.filmon.maven</groupId>
+                <artifactId>image-maven-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>scale</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/res</outputDirectory>
+                            <images>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>drawable-hdpi/ic_launcher.png</destination>
+                                    <width>72</width>
+                                </image>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>drawable-mdpi/ic_launcher.png</destination>
+                                    <width>48</width>
+                                </image>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>drawable-xhdpi/ic_launcher.png</destination>
+                                    <width>96</width>
+                                </image>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>drawable-xxhdpi/ic_launcher.png</destination>
+                                    <width>144</width>
+                                </image>
+                            </images>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.simpligility.maven.plugins</groupId>
+                <artifactId>android-maven-plugin</artifactId>
+                <version>${android.plugin.version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <apkDebug>${debug}</apkDebug>
+                    <resourceDirectory>target/res</resourceDirectory>
+                    <sdk>
+                        <platform>${android.platform.version}</platform>
+                    </sdk>
+                    <apk>
+                        <metaIncludes>
+                            <metaInclude>services/org.netbeans.**</metaInclude>
+                        </metaIncludes>
+                    </apk>
+                    <extractDuplicates>true</extractDuplicates>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>apk</id>
+                        <goals>
+                            <goal>apk</goal>
+                            <goal>dex</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apidesign.demo</groupId>
+            <artifactId>chat</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.netbeans.html</groupId>
+                    <artifactId>net.java.html.boot.fx</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>android</artifactId>
+            <version>${platform.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.dukescript.presenters</groupId>
+            <artifactId>android</artifactId>
+            <version>0.9.1</version>
+            <type>jar</type> 
+            <exclusions>
+                <exclusion>
+                    <groupId>org.netbeans.html</groupId>
+                    <artifactId>net.java.html.boot</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.netbeans.html</groupId>
+                    <artifactId>net.java.html.sound</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.html</groupId>
+            <artifactId>ko4j</artifactId>
+            <version>${net.java.html.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.html</groupId>
+            <artifactId>net.java.html.boot</artifactId>
+            <version>${net.java.html.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.html</groupId>
+            <artifactId>net.java.html.sound</artifactId>
+            <version>${net.java.html.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.html</groupId>
+            <artifactId>ko-ws-tyrus</artifactId>
+            <version>${net.java.html.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>org.json-osgi</artifactId>
+                    <groupId>de.twentyeleven.skysail</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+</project>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-android/src/main/AndroidManifest.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client-android/src/main/AndroidManifest.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,59 @@
+<?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.
+
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.apidesign.demo.chat"
+    android:versionCode="1"
+    android:versionName="1.0-SNAPSHOT" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="16" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="chat"
+        android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
+        <activity android:name="com.dukescript.presenters.Android" 
+                  android:configChanges="orientation|screenSize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        
+        <!-- Configuration section. Defines: 
+           - the HTML page to load on start
+           - the class that contains the main initialization method
+           - name of the initialization method in the given class
+        -->
+        <meta-data android:name="loadPage" android:value="file:///android_asset/pages/index.html" />
+        <meta-data android:name="loadClass" android:value="org.apidesign.demo.chat.AndroidMain" />
+        <meta-data android:name="invoke" android:value="main" />
+    </application>
+    <uses-permission android:name="android.permission.INTERNET" />
+</manifest>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-android/src/main/icons/launcher.png
Binary file chat/client-android/src/main/icons/launcher.png has changed
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-android/src/main/java/org/apidesign/demo/chat/AndroidMain.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client-android/src/main/java/org/apidesign/demo/chat/AndroidMain.java	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,33 @@
+/**
+ * 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.demo.chat;
+
+public class AndroidMain {
+    private AndroidMain() {
+    }
+
+    public static void main(String... args) throws Exception {
+        ChatClient.onPageLoad();
+    }
+}
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-ios/nbactions.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client-ios/nbactions.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,93 @@
+<?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>robovm:ipad-sim</goal>
+        </goals>
+        <properties>
+            <skipTests>true</skipTests>
+        </properties>
+    </action>
+    <action>
+        <actionName>debug</actionName>
+        <goals>
+            <goal>package</goal>
+            <goal>robovm:ipad-sim</goal>
+        </goals>
+        <properties>
+            <skipTests>true</skipTests>
+            <robovm.debug>clientmode</robovm.debug>
+            <robovm.debugPort>${jpda.address}</robovm.debugPort>
+            <jpda.listen>true</jpda.listen>
+        </properties>
+    </action>
+    <action>
+        <actionName>CUSTOM-ipad-sim</actionName>
+        <displayName>Run in iPad Simulator</displayName>
+        <goals>
+            <goal>package</goal>
+            <goal>robovm:ipad-sim</goal>
+        </goals>
+        <properties>
+            <skipTests>true</skipTests>
+        </properties>
+    </action>
+    <action>
+        <actionName>CUSTOM-iphone-sim</actionName>
+        <displayName>Run in iPhone Simulator</displayName>
+        <goals>
+            <goal>package</goal>
+            <goal>robovm:iphone-sim</goal>
+        </goals>
+        <properties>
+            <skipTests>true</skipTests>
+        </properties>
+    </action>
+    <action>
+        <actionName>CUSTOM-ios-device</actionName>
+        <displayName>Run on iOS Device</displayName>
+        <goals>
+            <goal>package</goal>
+            <goal>robovm:ios-device</goal>
+        </goals>
+        <properties>
+            <skipTests>true</skipTests>
+        </properties>
+    </action>
+    <action>
+        <actionName>CUSTOM-create-ipa</actionName>
+        <displayName>Create iOS Package Archive</displayName>
+        <goals>
+            <goal>clean</goal>
+            <goal>package</goal>
+            <goal>robovm:create-ipa</goal>
+        </goals>
+    </action>
+</actions>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-ios/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client-ios/pom.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,256 @@
+<?xml version="1.0"?>
+<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>
+        <groupId>org.apidesign.demo</groupId>
+        <artifactId>chat-pom</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apidesign.demo</groupId>
+    <artifactId>chat-ios</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>chat Client for iOS</name>
+
+    <properties>
+        <project.mainclass>org.apidesign.demo.chat.iOSMain</project.mainclass>
+        <netbeans.compile.on.save>none</netbeans.compile.on.save>
+        <robovm.version>1.6.0</robovm.version>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.netbeans.html</groupId>
+                <artifactId>html4j-maven-plugin</artifactId>
+                <version>${net.java.html.version}</version>
+                <executions>
+                    <execution>
+                        <id>js-classes</id>
+                        <goals>
+                            <goal>process-js-annotations</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>          
+            <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-jar-plugin</artifactId>
+                <version>2.4</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.9</version>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <type>zip</type>
+                    <classifier>webpages</classifier>
+                    <overWrite>true</overWrite>
+                    <outputDirectory>target/web/pages</outputDirectory>
+                    <includes>*/**</includes>
+                </configuration>
+            </plugin>            
+            <plugin>
+                <groupId>com.filmon.maven</groupId>
+                <artifactId>image-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>scale</goal>
+                            <goal>crop</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/images</outputDirectory>
+                            <images>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>Icon.png</destination>
+                                    <width>57</width>
+                                </image>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>Icon@2.png</destination>
+                                    <width>114</width>
+                                </image>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>Icon-60.png</destination>
+                                    <width>60</width>
+                                </image>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>Icon-60@2.png</destination>
+                                    <width>120</width>
+                                </image>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>Icon-72.png</destination>
+                                    <width>72</width>
+                                </image>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>Icon-76.png</destination>
+                                    <width>76</width>
+                                </image>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>Default@2x.png</destination>
+                                    <width>240</width>
+                                    <cropWidth>640</cropWidth>
+                                    <cropHeight>960</cropHeight>
+                                    <color>white</color>
+                                </image>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>Default-568h@2x.png</destination>
+                                    <width>240</width>
+                                    <cropWidth>640</cropWidth>
+                                    <cropHeight>1136</cropHeight>
+                                    <color>white</color>
+                                </image>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>Default.png</destination>
+                                    <width>120</width>
+                                    <cropWidth>320</cropWidth>
+                                    <cropHeight>480</cropHeight>
+                                    <color>white</color>
+                                </image>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>Default@2x-Landscape.png</destination>
+                                    <width>240</width>
+                                    <cropWidth>960</cropWidth>
+                                    <cropHeight>640</cropHeight>
+                                    <color>white</color>
+                                </image>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>Default-568h@2x-Landscape.png</destination>
+                                    <width>240</width>
+                                    <cropWidth>1136</cropWidth>
+                                    <cropHeight>640</cropHeight>
+                                    <color>white</color>
+                                </image>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>Default-Landscape.png</destination>
+                                    <width>120</width>
+                                    <cropWidth>480</cropWidth>
+                                    <cropHeight>320</cropHeight>
+                                    <color>white</color>
+                                </image>
+                            </images>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.robovm</groupId>
+                <artifactId>robovm-maven-plugin</artifactId>
+                <version>${robovm.version}</version>
+                <configuration>
+                    <config>
+                        <mainClass>${project.mainclass}</mainClass>
+                        <forceLinkClasses>
+                            <pattern>java.util.logging.ConsoleHandler</pattern>
+                            <pattern>java.util.logging.SimpleFormatter</pattern>
+                        </forceLinkClasses>
+                        <executableName>chat</executableName>
+                        <resources>
+                            <resource>target/web/pages/</resource>
+                            <resource>
+                                <targetPath>/</targetPath>
+                                <directory>target/images/</directory>
+                                <includes>
+                                    <include>*.png</include>
+                                </includes>
+                            </resource>
+                        </resources>
+                        <os>ios</os>
+                    </config>
+                    <includeJFX>false</includeJFX>
+                </configuration>
+                <!--
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>create-ipa</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                -->
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apidesign.demo</groupId>
+            <artifactId>chat</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.netbeans.html</groupId>
+                    <artifactId>net.java.html.boot.fx</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.dukescript.presenters</groupId>
+            <artifactId>ios</artifactId>
+            <version>0.9.1</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.netbeans.html</groupId>
+                    <artifactId>net.java.html.geo</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.netbeans.html</groupId>
+                    <artifactId>net.java.html.boot</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.html</groupId>
+            <artifactId>net.java.html.geo</artifactId>
+            <version>${net.java.html.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.robovm</groupId>
+            <artifactId>robovm-cocoatouch</artifactId>
+            <version>${robovm.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.robovm</groupId>
+            <artifactId>robovm-rt</artifactId>
+            <version>${robovm.version}</version>
+            <type>jar</type>
+        </dependency>
+    </dependencies>
+</project>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-ios/src/main/icons/launcher.png
Binary file chat/client-ios/src/main/icons/launcher.png has changed
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-ios/src/main/java/org/apidesign/demo/chat/iOSMain.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client-ios/src/main/java/org/apidesign/demo/chat/iOSMain.java	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,32 @@
+/**
+ * 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.demo.chat;
+
+final class iOSMain {
+    public static void main(String... args) throws Exception {
+        Main.main(args);
+    }
+}
+
+
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-netbeans/nbactions.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client-netbeans/nbactions.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,74 @@
+<?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>nbm:cluster</goal>
+            <goal>nbm:run-platform</goal>
+        </goals>
+        <properties>
+            <skipTests>true</skipTests>
+        </properties>
+    </action>
+    <action>
+        <actionName>debug</actionName>
+        <goals>
+            <goal>package</goal>
+            <goal>nbm:cluster</goal>
+            <goal>nbm:run-platform</goal>
+        </goals>
+        <properties>
+            <skipTests>true</skipTests>
+            <jpda.listen>true</jpda.listen>
+            <netbeans.run.params.debug>-J-Xdebug -J-Xrunjdwp:transport=dt_socket,suspend=n,server=n,address=${jpda.address}</netbeans.run.params.debug>
+            <firebug.lite>true</firebug.lite>
+        </properties>
+    </action>
+    <action>
+        <actionName>CUSTOM-nbrwsr-run</actionName>
+        <displayName>Run in NetBeans</displayName>
+        <goals>
+            <goal>clean</goal>
+            <goal>package</goal>
+            <goal>nbm:cluster</goal>
+            <goal>nbm:run-ide</goal>
+        </goals>
+        <properties>
+            <skipTests>true</skipTests>
+        </properties>
+    </action>
+    <action>
+        <actionName>CUSTOM-nbrwsr-nbm</actionName>
+        <displayName>Build NetBeans NBM file</displayName>
+        <goals>
+            <goal>clean</goal>
+            <goal>install</goal>
+        </goals>
+    </action>
+</actions>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-netbeans/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client-netbeans/pom.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,221 @@
+<?xml version="1.0"?>
+<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>
+        <groupId>org.apidesign.demo</groupId>
+        <artifactId>chat-pom</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apidesign.demo</groupId>
+    <artifactId>chat-nb</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>nbm-application</packaging>
+
+    <name>chat Client for NetBeans</name>
+
+    <properties>
+        <netbeans.version>RELEASE81</netbeans.version>
+        <netbeans.compile.on.save>none</netbeans.compile.on.save>
+        <project.mainclass>org.apidesign.demo.chat.NbMain</project.mainclass>
+    </properties>
+    <repositories>
+        <repository>
+            <id>netbeans</id>
+            <name>NetBeans</name>
+            <url>http://bits.netbeans.org/maven2/</url>
+        </repository>
+        <repository>
+            <id>dev</id>
+            <name>NetBeans</name>
+            <url>http://bits.netbeans.org/nexus/content/repositories/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.netbeans.html</groupId>
+                <artifactId>html4j-maven-plugin</artifactId>
+                <version>${net.java.html.version}</version>
+                <executions>
+                    <execution>
+                        <id>js-classes</id>
+                        <goals>
+                            <goal>process-js-annotations</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <id>jar</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!-- to have the jar plugin pickup the nbm generated manifest -->
+                    <useDefaultManifestFile>true</useDefaultManifestFile>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.9</version>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <artifactItems>
+                        <artifactItem>
+                            <groupId>org.apidesign.demo</groupId>
+                            <artifactId>chat</artifactId>
+                            <version>${project.version}</version>
+                            <type>zip</type>
+                            <classifier>webpages</classifier>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${project.build.directory}/classes/org/apidesign/demo/chat</outputDirectory>
+                        </artifactItem>
+                    </artifactItems>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>nbm-maven-plugin</artifactId>
+                <version>3.14.1</version>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <id>default-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                        <configuration>
+                            <useOSGiDependencies>true</useOSGiDependencies>
+                            <brandingToken>chat</brandingToken>
+                            <cluster>chat</cluster>
+                            <verifyIntegrity>false</verifyIntegrity>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-nbm</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>nbm</goal>
+                        </goals>
+                        <configuration>
+                            <useOSGiDependencies>true</useOSGiDependencies>
+                            <cluster>extra</cluster>
+                            <verifyIntegrity>false</verifyIntegrity>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <useOSGiDependencies>true</useOSGiDependencies>
+                    <brandingToken>netbeans</brandingToken>
+                    <cluster>chat</cluster>
+                    <verifyIntegrity>false</verifyIntegrity>
+                    <nbmBuildDir>${project.build.directory}</nbmBuildDir>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.filmon.maven</groupId>
+                <artifactId>image-maven-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>scale</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/classes/org/apidesign/demo/chat</outputDirectory>
+                            <images>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>icon.png</destination>
+                                    <width>16</width>
+                                </image>
+                                <image>
+                                    <source>src/main/icons/launcher.png</source>
+                                    <destination>icon24.png</destination>
+                                    <width>24</width>
+                                </image>
+                            </images>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apidesign.demo</groupId>
+            <artifactId>chat</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.netbeans.html</groupId>
+                    <artifactId>net.java.html.boot.fx</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.html</groupId>
+            <artifactId>net.java.html.boot</artifactId>
+            <version>${net.java.html.version}</version>
+        </dependency>
+        <dependency>
+            <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.netbeans.api</groupId>
+            <artifactId>org-netbeans-api-htmlui</artifactId>
+            <version>${netbeans.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.cluster</groupId>
+            <artifactId>platform</artifactId>
+            <version>${netbeans.version}</version>
+            <type>pom</type>
+        </dependency>
+    </dependencies>
+</project>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-netbeans/src/main/icons/launcher.png
Binary file chat/client-netbeans/src/main/icons/launcher.png has changed
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-netbeans/src/main/java/org/apidesign/demo/chat/NbMain.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client-netbeans/src/main/java/org/apidesign/demo/chat/NbMain.java	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,51 @@
+/**
+ * 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.demo.chat;
+
+import org.netbeans.api.htmlui.OpenHTMLRegistration;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
+
+public class NbMain {
+    private NbMain() {
+    }
+    
+    @ActionID(
+        category = "Games",
+        id = "org.apidesign.demo.chat.OpenPage"
+    )
+    @OpenHTMLRegistration(
+        url="index.html",
+        displayName = "Open Your Page",
+        iconBase = "org/apidesign/demo/chat/icon.png"
+    )
+    @ActionReferences({
+        @ActionReference(path = "Menu/Window"),
+        @ActionReference(path = "Toolbars/Games")
+    })
+    public static void onPageLoad() throws Exception {
+        Main.onPageLoad();
+    }
+}
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-web/nbactions.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client-web/nbactions.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,76 @@
+<?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>
+        <packagings>
+            <packaging>jar</packaging>
+        </packagings>
+        <goals>
+            <goal>package</goal>
+            <goal>bck2brwsr:show</goal>
+        </goals>
+        <properties>
+            <skipTests>true</skipTests>
+        </properties>
+    </action>
+    <action>
+        <actionName>debug</actionName>
+        <packagings>
+            <packaging>jar</packaging>
+        </packagings>
+        <goals>
+            <goal>package</goal>
+            <goal>bck2brwsr:show</goal>
+        </goals>
+        <properties>
+            <skipTests>true</skipTests>
+            <bck2brwsr.obfuscationlevel>NONE</bck2brwsr.obfuscationlevel>
+            <jpda.listen>maven</jpda.listen>
+        </properties>
+    </action>
+    <action>
+        <actionName>CUSTOM-bck2brwsr-show</actionName>
+        <displayName>Run in a Browser</displayName>
+        <goals>
+            <goal>package</goal>
+            <goal>bck2brwsr:show</goal>
+        </goals>
+        <properties>
+            <skipTests>true</skipTests>
+            <bck2brwsr.obfuscationlevel>NONE</bck2brwsr.obfuscationlevel>
+        </properties>
+    </action>
+    <action>
+        <actionName>CUSTOM-bck2brwsr-web</actionName>
+        <displayName>Package for website</displayName>
+        <goals>
+            <goal>clean</goal>
+            <goal>package</goal>
+        </goals>
+    </action>
+</actions>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-web/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client-web/pom.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,189 @@
+<?xml version="1.0"?>
+<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>
+        <groupId>org.apidesign.demo</groupId>
+        <artifactId>chat-pom</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apidesign.demo</groupId>
+    <artifactId>chat-web</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>chat Client for Web</name>
+
+    <properties>
+        <netbeans.compile.on.save>none</netbeans.compile.on.save>
+        <project.mainclass>org.apidesign.demo.chat.BrowserMain</project.mainclass>
+        <browser.bootstrap>initialize bck2brwsr --&gt;
+&lt;script type="text/javascript" src="bck2brwsr.js"&gt;&lt;/script&gt;
+&lt;script&gt;
+    var vm = bck2brwsr('chat.js');
+    var c = vm.loadClass('org.apidesign.demo.chat.BrowserMain');
+    c.invoke('main');
+&lt;/script&gt;
+&lt;!-- end of initialization </browser.bootstrap>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.netbeans.html</groupId>
+                <artifactId>html4j-maven-plugin</artifactId>
+                <version>${net.java.html.version}</version>
+                <executions>
+                    <execution>
+                        <id>js-classes</id>
+                        <goals>
+                            <goal>process-js-annotations</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <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>
+                    <compilerArguments>
+                        <bootclasspath>netbeans.ignore.jdk.bootclasspath</bootclasspath>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>${project.mainclass}</mainClass>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <useUniqueVersions>false</useUniqueVersions>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apidesign.bck2brwsr</groupId>
+                <artifactId>bck2brwsr-maven-plugin</artifactId>
+                <version>${bck2brwsr.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>brwsr</goal>
+                            <goal>aot</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <obfuscation>${bck2brwsr.obfuscationlevel}</obfuscation>
+                    <directory>${project.build.directory}/${project.build.finalName}-bck2brwsr/public_html/</directory>
+                    <startpage>index.html</startpage>
+                    <classPathPrefix>lib</classPathPrefix>
+                    <mainJavaScript>${project.build.directory}/chat.js</mainJavaScript>
+                    <exports>
+                        <export>${project.mainclass}</export>
+                    </exports>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <id>distro-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/bck2brwsr.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.9</version>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <type>zip</type>
+                    <classifier>webpages</classifier>
+                    <overWrite>true</overWrite>
+                    <outputDirectory>target/web/pages</outputDirectory>
+                    <includes>*/**</includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apidesign.demo</groupId>
+            <artifactId>chat</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.netbeans.html</groupId>
+                    <artifactId>net.java.html.boot.fx</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apidesign.bck2brwsr</groupId>
+            <artifactId>emul</artifactId>
+            <version>${bck2brwsr.version}</version>
+            <classifier>rt</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.html</groupId>
+            <artifactId>net.java.html.boot</artifactId>
+            <version>${net.java.html.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>asm</artifactId>
+                    <groupId>org.ow2.asm</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apidesign.bck2brwsr</groupId>
+            <artifactId>emul</artifactId>
+            <version>${bck2brwsr.version}</version>
+            <classifier>bck2brwsr</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apidesign.demo</groupId>
+            <artifactId>chat-js</artifactId>
+            <version>${project.version}</version>
+            <classifier>bck2brwsr</classifier>
+            <scope>provided</scope>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apidesign.bck2brwsr</groupId>
+            <artifactId>ko-bck2brwsr</artifactId>
+            <version>${bck2brwsr.version}</version>
+            <classifier>bck2brwsr</classifier>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-web/src/main/assembly/bck2brwsr.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client-web/src/main/assembly/bck2brwsr.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,61 @@
+<?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>bck2brwsr</id>
+  <formats>
+      <format>zip</format>
+      <format>dir</format>
+  </formats>
+  <baseDirectory>public_html</baseDirectory>
+  <fileSets>
+      <fileSet>
+          <directory>target/web/pages</directory>
+          <outputDirectory>/</outputDirectory>
+          <excludes>
+              <exclude>index.html</exclude>
+          </excludes>
+      </fileSet>
+      <fileSet>
+          <directory>target/web/pages</directory>
+          <outputDirectory>/</outputDirectory>
+          <filtered>true</filtered>
+          <includes>
+              <include>index.html</include>
+          </includes>
+      </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>*.js</include>
+                <include>lib/*.js</include>
+            </includes>
+        </fileSet>
+  </fileSets>
+</assembly>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client-web/src/main/java/org/apidesign/demo/chat/BrowserMain.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client-web/src/main/java/org/apidesign/demo/chat/BrowserMain.java	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,33 @@
+/**
+ * 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.demo.chat;
+
+public class BrowserMain {
+    private BrowserMain() {
+    }
+
+    public static void main(String... args) throws Exception {
+        Main.onPageLoad();
+    }
+}
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client/bck2brwsr-assembly.xml
--- a/chat/client/bck2brwsr-assembly.xml	Thu Aug 14 07:51:33 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +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>bck2brwsr</id>
-  <formats>
-      <format>zip</format>
-  </formats>
-  <baseDirectory>client</baseDirectory>
-  <dependencySets>
-    <dependencySet>
-        <useProjectArtifact>false</useProjectArtifact>
-        <scope>runtime</scope>
-        <outputDirectory>lib</outputDirectory>
-        <includes>
-            <include>*:jar</include>
-            <include>*:rt</include>
-        </includes>
-    </dependencySet>
-    <dependencySet>
-        <useProjectArtifact>false</useProjectArtifact>
-        <scope>provided</scope>
-        <includes>
-            <include>*:js</include>
-        </includes>
-        <unpack>true</unpack>
-        <outputDirectory>/</outputDirectory>
-    </dependencySet>
-  </dependencySets> 
-  <files>
-    <file>
-      <source>${project.build.directory}/${project.build.finalName}.jar</source>
-      <outputDirectory>/</outputDirectory>
-    </file>
-    <file>
-      <source>${project.build.directory}/classes/org/apidesign/html/chatserver/client/chat.html</source>
-      <outputDirectory>/</outputDirectory>
-      <destName>index.html</destName>
-    </file>
-  </files>
-
-</assembly>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client/nbactions.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client/nbactions.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,57 @@
+<?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>process-classes</goal>
+            <goal>exec:exec</goal>
+        </goals>
+    </action>
+    <action>
+        <actionName>debug</actionName>
+        <goals>
+            <goal>process-classes</goal>
+            <goal>exec:exec</goal>
+        </goals>
+        <properties>
+            <jpda.listen>true</jpda.listen>
+            <exec.debug.arg>-Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address}</exec.debug.arg>
+        </properties>
+    </action>
+        <action>
+            <actionName>CUSTOM-Build Desktop App</actionName>
+            <displayName>Build Desktop App</displayName>
+            <goals>
+                <goal>clean</goal>
+                <goal>package</goal>
+            </goals>
+            <activatedProfiles>
+                <activatedProfile>desktop</activatedProfile>
+            </activatedProfiles>
+        </action>
+</actions>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client/pom.xml
--- a/chat/client/pom.xml	Thu Aug 14 07:51:33 2014 +0200
+++ b/chat/client/pom.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -1,135 +1,220 @@
-<?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">
+<?xml version="1.0"?>
+<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>chat-demo</artifactId>
-    <groupId>org.apidesign.html</groupId>
-    <version>1.0-SNAPSHOT</version>
+      <groupId>org.apidesign.demo</groupId>
+      <artifactId>chat-pom</artifactId>
+      <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apidesign.html.demo</groupId>
-  <artifactId>chat-client</artifactId>
+  <groupId>org.apidesign.demo</groupId>
+  <artifactId>chat</artifactId>
   <version>1.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
-  <name>Chat Client Bck2Brwsr</name>
-
-  <repositories>
-      <repository>
-          <id>java.net</id>
-          <name>Java.net</name>
-          <url>https://maven.java.net/content/repositories/releases/</url>
-          <snapshots>
-          </snapshots>
-      </repository>
-      <repository>
-          <id>netbeans</id>
-          <name>NetBeans</name>
-          <url>http://bits.netbeans.org/maven2/</url>
-      </repository>
-  </repositories>
-  <pluginRepositories>
-      <pluginRepository>
-          <id>java.net</id>
-          <name>Java.net</name>
-          <url>https://maven.java.net/content/repositories/releases/</url>
-          <snapshots>
-          </snapshots>
-      </pluginRepository>
-  </pluginRepositories>
+  <name>chat General Client Code</name>
 
   <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <netbeans.compile.on.save>all</netbeans.compile.on.save>
+    <project.mainclass>org.apidesign.demo.chat.Main</project.mainclass>
+    <exec.java.bin>${java.home}/bin/java</exec.java.bin>
+    <exec.debug.arg>-Ddebug=false</exec.debug.arg>
   </properties>
   <build>
       <plugins>
-         <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>
-             <artifactId>maven-assembly-plugin</artifactId>
-             <version>2.4</version>
-             <executions>
-                 <execution>
-                     <id>distro-assembly</id>
-                     <phase>package</phase>
-                     <goals>
-                         <goal>single</goal>
-                     </goals>
-                     <configuration>
-                         <descriptors>
-                             <descriptor>bck2brwsr-assembly.xml</descriptor>
-                         </descriptors>
-                     </configuration>
-                 </execution>
-             </executions>                
-         </plugin>      
+          <plugin>
+              <groupId>org.apache.felix</groupId>
+              <artifactId>maven-bundle-plugin</artifactId>
+              <version>2.4.0</version>
+              <extensions>true</extensions>
+              <configuration>
+                  <instructions>
+                      <Export-Package>org.apidesign.demo.chat</Export-Package>
+                      <Bundle-SymbolicName>org.apidesign.demo.chat</Bundle-SymbolicName>
+                  </instructions>
+              </configuration>
+          </plugin>
+          <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-jar-plugin</artifactId>
+              <version>2.4</version>
+              <configuration>
+                  <archive>
+                      <manifest>
+                          <mainClass>${project.mainclass}</mainClass>
+                          <addClasspath>true</addClasspath>
+                          <classpathPrefix>lib/</classpathPrefix>
+                          <useUniqueVersions>false</useUniqueVersions>
+                      </manifest>
+                  </archive>
+              </configuration>
+          </plugin>
+          <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>exec-maven-plugin</artifactId>
+              <version>1.2.1</version>
+                <configuration>
+                   <executable>${exec.java.bin}</executable>
+                   <classpathScope>test</classpathScope>
+                   <arguments>
+                       <argument>-classpath</argument>
+                       <classpath/>
+                       <argument>-javaagent:${project.build.directory}/springloaded.jar</argument>
+                       <argument>-noverify</argument>
+                       <argument>-Dbrowser.rootdir=${basedir}/src/main/webapp/</argument>
+                       <argument>-Dnetbeans.inspect.port=${netbeans.inspect.port}</argument>
+                       <argument>${exec.debug.arg}</argument>
+                       <argument>${project.mainclass}</argument>
+                   </arguments>
+                </configuration>
+          </plugin>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-dependency-plugin</artifactId>
+              <version>2.10</version>
+              <executions>
+                  <execution>
+                      <id>copy</id>
+                      <phase>package</phase>
+                      <goals>
+                          <goal>copy</goal>
+                      </goals>
+                      <configuration>
+                          <artifactItems>
+                              <artifactItem>
+                                  <groupId>org.springframework</groupId>
+                                  <artifactId>springloaded</artifactId>
+                                  <version>1.2.3.RELEASE</version>
+                                  <type>jar</type>
+                                  <overWrite>false</overWrite>
+                                  <destFileName>springloaded.jar</destFileName>
+                              </artifactItem>
+                          </artifactItems>
+                          <outputDirectory>${project.build.directory}</outputDirectory>
+                      </configuration>
+                  </execution>
+              </executions>
+          </plugin>
+          <plugin>
+              <artifactId>maven-assembly-plugin</artifactId>
+              <version>2.4</version>
+              <executions>
+                  <execution>
+                      <id>web-pages</id>
+                      <phase>package</phase>
+                      <goals>
+                          <goal>single</goal>
+                      </goals>
+                      <configuration>
+                          <descriptors>
+                              <descriptor>src/main/assembly/webpages.xml</descriptor>
+                          </descriptors>
+                      </configuration>
+                  </execution>
+              </executions>
+          </plugin>
       </plugins>
   </build>
-
   <dependencies>
     <dependency>
-      <groupId>org.netbeans.html</groupId>
-      <artifactId>net.java.html.json</artifactId>
-      <version>${net.java.html.version}</version>
-      <type>jar</type>
+        <groupId>org.apidesign.demo</groupId>
+        <artifactId>chat-js</artifactId>
+        <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>chat-model</artifactId>
-      <version>${project.version}</version>
+        <groupId>org.apidesign.demo</groupId>
+        <artifactId>chat-shared</artifactId>
+        <version>${project.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.netbeans.html</groupId>
+        <artifactId>net.java.html</artifactId>
+        <version>${net.java.html.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.netbeans.html</groupId>
+        <artifactId>net.java.html.json</artifactId>
+        <version>${net.java.html.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.netbeans.html</groupId>
+        <artifactId>net.java.html.boot</artifactId>
+        <version>${net.java.html.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.netbeans.html</groupId>
+        <artifactId>net.java.html.sound</artifactId>
+        <version>${net.java.html.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.netbeans.html</groupId>
+        <artifactId>ko4j</artifactId>
+        <version>${net.java.html.version}</version>
+        <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>6.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.netbeans.html</groupId>
+      <artifactId>net.java.html.boot.script</artifactId>
+      <version>${net.java.html.version}</version>
       <scope>test</scope>
       <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apidesign.bck2brwsr</groupId>
-        <artifactId>emul</artifactId>
-        <version>${bck2brwsr.version}</version>
-        <classifier>rt</classifier>
-        <scope>runtime</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.apidesign.bck2brwsr</groupId>
-        <artifactId>vm4brwsr</artifactId>
-        <version>${bck2brwsr.version}</version>
-        <type>zip</type>
-        <classifier>js</classifier>
+        <groupId>org.netbeans.html</groupId>
+        <artifactId>net.java.html.boot.fx</artifactId>
+        <version>${net.java.html.version}</version>
         <scope>provided</scope>
     </dependency>
-    <dependency>
-        <groupId>org.apidesign.bck2brwsr</groupId>
-        <artifactId>ko-bck2brwsr</artifactId>
-        <version>${bck2brwsr.version}</version>
-        <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <artifactId>ko4j</artifactId>
-      <groupId>org.netbeans.html</groupId>
-      <type>jar</type>
-      <version>${net.java.html.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <artifactId>net.java.html.boot</artifactId>
-      <groupId>org.netbeans.html</groupId>
-      <type>jar</type>
-      <version>${net.java.html.version}</version>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
+  <profiles>
+      <profile>
+          <id>desktop</id>
+          <dependencies>
+              <dependency>
+                  <groupId>org.netbeans.html</groupId>
+                  <artifactId>net.java.html.boot.fx</artifactId>
+                  <version>${net.java.html.version}</version>
+                  <scope>runtime</scope>
+              </dependency>
+          </dependencies>
+          <build>
+              <plugins>
+                  <plugin>
+                      <artifactId>maven-assembly-plugin</artifactId>
+                      <version>2.4</version>
+                      <executions>
+                          <execution>
+                              <id>distro-assembly</id>
+                              <phase>package</phase>
+                              <goals>
+                                  <goal>single</goal>
+                              </goals>
+                              <configuration>
+                                  <descriptors>
+                                      <descriptor>src/main/assembly/javafx.xml</descriptor>
+                                  </descriptors>
+                              </configuration>
+                          </execution>
+                      </executions>
+                  </plugin>
+              </plugins>
+          </build>
+      </profile>
+  </profiles>
 </project>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client/src/main/assembly/javafx.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client/src/main/assembly/javafx.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,57 @@
+<?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>javafx</id>
+  <formats>
+      <format>zip</format>
+  </formats>
+  <baseDirectory>${project.build.finalName}-app</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>
+  <fileSets>
+    <fileSet>
+       <directory>src/main/webapp/</directory>
+       <outputDirectory>/</outputDirectory>
+       <includes>
+          <include>pages/**</include>
+       </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client/src/main/assembly/webpages.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client/src/main/assembly/webpages.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,42 @@
+<?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>webpages</id>
+  <formats>
+      <format>zip</format>
+  </formats>
+  <baseDirectory>/</baseDirectory>
+  <fileSets>
+      <fileSet>
+          <directory>src/main/webapp/pages</directory>
+          <outputDirectory>/</outputDirectory>
+          <filtered>false</filtered>
+      </fileSet>
+  </fileSets>
+</assembly>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client/src/main/java/org/apidesign/demo/chat/ChatClient.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client/src/main/java/org/apidesign/demo/chat/ChatClient.java	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,107 @@
+/**
+ * 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.demo.chat;
+
+import net.java.html.json.ComputedProperty;
+import net.java.html.json.Function;
+import net.java.html.json.Model;
+import net.java.html.json.OnReceive;
+import net.java.html.json.Property;
+import org.apidesign.demo.chat.shared.Message;
+import org.apidesign.demo.chat.shared.Query;
+
+/**
+ *
+ * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ */
+@Model(className = "ChatModel", targetId = "", properties = {
+    @Property(name = "user", type = String.class),
+    @Property(name = "comment", type = String.class),
+    @Property(name = "url", type = String.class),
+    @Property(name = "msgs", type = Message.class, array = true)
+})
+class ChatClient {
+    @ComputedProperty
+    static boolean sendEnabled(String user, String comment) {
+        boolean res = user != null && comment != null && !user.isEmpty() && !comment.isEmpty();
+        return res;
+    }
+    
+    @Function
+    static void submit(ChatModel m) {
+        if (!sendEnabled(m.getUser(), m.getComment())) {
+            return;
+        }
+        Message msg = new Message();
+        msg.setUser(m.getUser());
+        msg.setComment(m.getComment());
+        m.postComment(m.getUrl(), msg);
+    }
+    
+    static void cantChat(ChatModel model, Exception err) {
+        model.getMsgs().add(new Message("System", err.getMessage(), 0));
+    }
+    
+    
+    @OnReceive(url = "{url}/chat", method = "POST", data = Message.class, onError = "cantChat")
+    static void postComment(ChatModel m, Message addedMessage) {
+        if (addedMessage.getComment().equals(m.getComment())) {
+            m.setComment("");
+        }
+    }
+    
+    @OnReceive(url = "{url}/chat?since=0")
+    static void initialRead(ChatModel m, Query q) {
+        m.getMsgs().clear();
+        m.getMsgs().addAll(q.getMessages());
+        moreMessages(m);
+    }
+    
+    @OnReceive(url = "{url}/chat?since={since}")
+    static void updateMsgs(ChatModel m, Query q) {
+        m.getMsgs().addAll(q.getMessages());
+        moreMessages(m);
+    }
+    
+    private static void moreMessages(ChatModel m) {
+        long now = 0;
+        for (Message msg : m.getMsgs()) {
+            if (now < msg.getSince()) {
+                now = msg.getSince();
+            }
+        }
+        m.updateMsgs(m.getUrl(), "" + (now + 1));
+    }
+    
+    public static void onPageLoad() {
+        ChatModel chm = new ChatModel();
+        chm.setUrl("http://localhost:8080");
+        Message m = new Message();
+        m.setComment("Waiting for messages from the server...");
+        m.setUser("system");
+        chm.getMsgs().add(m);
+        chm.applyBindings();
+        chm.initialRead(chm.getUrl());        
+    }
+}
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client/src/main/java/org/apidesign/demo/chat/Main.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client/src/main/java/org/apidesign/demo/chat/Main.java	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,48 @@
+/**
+ * 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.demo.chat;
+
+import net.java.html.boot.BrowserBuilder;
+
+public final class Main {
+    private Main() {
+    }
+
+    public static void main(String... args) throws Exception {
+        BrowserBuilder.newBrowser().
+            loadPage("pages/index.html").
+            loadClass(Main.class).
+            invoke("onPageLoad", args).
+            showAndWait();
+        System.exit(0);
+    }
+
+    /**
+     * Called when the page is ready.
+     */
+    public static void onPageLoad() throws Exception {
+        ChatClient.onPageLoad();
+    }
+
+}
diff -r 0e2b05057c97 -r a0f15cb8c730 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	Thu Aug 14 07:51:33 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +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.chatserver.client;
-
-import net.java.html.json.ComputedProperty;
-import net.java.html.json.Function;
-import net.java.html.json.Model;
-import net.java.html.json.OnReceive;
-import net.java.html.json.Property;
-import org.apidesign.html.chatserver.model.Message;
-import org.apidesign.html.chatserver.model.Query;
-
-/**
- *
- * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- */
-@Model(className = "ChatModel", properties = {
-    @Property(name = "user", type = String.class),
-    @Property(name = "comment", type = String.class),
-    @Property(name = "msgs", type = Message.class, array = true)
-})
-class ChatClient {
-    @ComputedProperty
-    static boolean sendEnabled(String user, String comment) {
-        boolean res = user != null && comment != null && !user.isEmpty() && !comment.isEmpty();
-        return res;
-    }
-    
-    @Function
-    static void submit(ChatModel m) {
-        if (!sendEnabled(m.getUser(), m.getComment())) {
-            return;
-        }
-        Message msg = new Message();
-        msg.setUser(m.getUser());
-        msg.setComment(m.getComment());
-        m.postComment(msg);
-    }
-    
-    @OnReceive(url = "/chat", method = "POST", data = Message.class)
-    static void postComment(ChatModel m, Message addedMessage) {
-        if (addedMessage.getComment().equals(m.getComment())) {
-            m.setComment("");
-        }
-    }
-    
-    @OnReceive(url = "/chat?since=0")
-    static void initialRead(ChatModel m, Query q) {
-        m.getMsgs().clear();
-        m.getMsgs().addAll(q.getMessages());
-        moreMessages(m);
-    }
-    
-    @OnReceive(url = "/chat?since={since}")
-    static void updateMsgs(ChatModel m, Query q) {
-        m.getMsgs().addAll(q.getMessages());
-        moreMessages(m);
-    }
-    
-    private static void moreMessages(ChatModel m) {
-        long now = 0;
-        for (Message msg : m.getMsgs()) {
-            if (now < msg.getSince()) {
-                now = msg.getSince();
-            }
-        }
-        m.updateMsgs("" + (now + 1));
-    }
-}
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client/src/main/java/org/apidesign/html/chatserver/client/Main.java
--- a/chat/client/src/main/java/org/apidesign/html/chatserver/client/Main.java	Thu Aug 14 07:51:33 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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.chatserver.client;
-
-import org.apidesign.html.chatserver.model.Message;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class Main {
-    private Main() {
-    }
-    
-    static {
-        ChatModel chm = new ChatModel();
-        Message m = new Message();
-        m.setComment("Waiting for messages from the server...");
-        m.setUser("system");
-        chm.getMsgs().add(m);
-        chm.applyBindings();
-        chm.initialRead();
-    }
-}
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client/src/main/resources/org/apidesign/html/chatserver/client/chat.html
--- a/chat/client/src/main/resources/org/apidesign/html/chatserver/client/chat.html	Thu Aug 14 07:51:33 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +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.
-
--->
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Chat via Jersey Server</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>
-        <div>Username:</div>
-        <input data-bind="value: user, valueUpdate: 'afterkeydown'"/>
-        <div>Message:</div>
-        <input data-bind="value: comment, valueUpdate: 'afterkeydown'"/>
-        <button data-bind="enable: sendEnabled, click: submit">Send</button>
-        
-        <ul data-bind="foreach: msgs">
-            <li>
-                <b data-bind="text: user"></b>@<em data-bind="text: at"></em>
-                :
-                <span data-bind="text: comment"></span>
-            </li>
-        </ul>
-        
-        <script src="bck2brwsr.js"></script>
-        <script type="text/javascript">
-            var vm = bck2brwsr('chat-client-1.0-SNAPSHOT.jar');
-            vm.loadClass('org.apidesign.html.chatserver.client.Main');
-        </script>
-        
-    </body>
-</html>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client/src/main/webapp/pages/index.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client/src/main/webapp/pages/index.html	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,49 @@
+<!--
+
+    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.
+
+-->
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Chat via Jersey Server</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head>
+    <body>
+        <div>Username:</div>
+        <input data-bind="value: user, valueUpdate: 'afterkeydown'"/>
+        <div>Message:</div>
+        <input data-bind="value: comment, valueUpdate: 'afterkeydown'"/>
+        <button data-bind="enable: sendEnabled, click: submit">Send</button>
+        
+        <ul data-bind="foreach: msgs">
+            <li>
+                <b data-bind="text: user"></b>@<em data-bind="text: at"></em>
+                :
+                <span data-bind="text: comment"></span>
+            </li>
+        </ul>
+                
+<!-- ${browser.bootstrap} -->
+    </body>
+</html>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/client/src/test/java/org/apidesign/demo/chat/ChatClientTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/client/src/test/java/org/apidesign/demo/chat/ChatClientTest.java	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,50 @@
+/**
+ * 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.demo.chat;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ */
+public class ChatClientTest {
+    public ChatClientTest() {
+    }
+    
+    @Test public void hasSendEnabled() {
+        ChatModel m = new ChatModel();
+        assertFalse(m.isSendEnabled(), "By default disabled");
+        m.setComment("some msg");
+        m.setUser("by me");
+        assertTrue(m.isSendEnabled(), "Now it is enabled");
+        m.setUser(null);
+        assertFalse(m.isSendEnabled(), "No user means disabled");
+        m.setUser("by him");
+        assertTrue(m.isSendEnabled(), "Again enabled");
+        m.setComment("");
+        assertFalse(m.isSendEnabled(), "Empty text means disabled");
+    }
+}
diff -r 0e2b05057c97 -r a0f15cb8c730 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	Thu Aug 14 07:51:33 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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.chatserver.client;
-
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- */
-public class ChatClientTest {
-    public ChatClientTest() {
-    }
-    
-    @Test public void hasSendEnabled() {
-        ChatModel m = new ChatModel();
-        assertFalse(m.isSendEnabled(), "By default disabled");
-        m.setComment("some msg");
-        m.setUser("by me");
-        assertTrue(m.isSendEnabled(), "Now it is enabled");
-        m.setUser(null);
-        assertFalse(m.isSendEnabled(), "No user means disabled");
-        m.setUser("by him");
-        assertTrue(m.isSendEnabled(), "Again enabled");
-        m.setComment("");
-        assertFalse(m.isSendEnabled(), "Empty text means disabled");
-    }
-}
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/js/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/js/pom.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,92 @@
+<?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>
+  <parent>
+      <groupId>org.apidesign.demo</groupId>
+      <artifactId>chat-pom</artifactId>
+      <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apidesign.demo</groupId>
+  <artifactId>chat-js</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+
+  <name>chat JavaScript Libraries</name>
+
+  <properties>
+    <netbeans.compile.on.save>none</netbeans.compile.on.save>
+  </properties>
+  <build>
+      <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.4.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.apidesign.demo.chat.js</Export-Package>
+                        <Bundle-SymbolicName>org.apidesign.demo.chat.js</Bundle-SymbolicName>
+                    </instructions>
+                </configuration>                
+            </plugin>
+          <plugin>
+              <groupId>org.netbeans.html</groupId>
+              <artifactId>html4j-maven-plugin</artifactId>
+              <version>${net.java.html.version}</version>
+              <executions>
+                  <execution>
+                      <id>js-classes</id>
+                      <goals>
+                          <goal>process-js-annotations</goal>
+                      </goals>
+                  </execution>
+              </executions>
+          </plugin>          
+          <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.apidesign.bck2brwsr</groupId>
+              <artifactId>bck2brwsr-maven-plugin</artifactId>
+              <version>0.16</version>
+              <executions>
+                  <execution>
+                      <goals>
+                          <goal>library</goal>
+                      </goals>
+                  </execution>
+              </executions>
+              <configuration>
+                  <obfuscation>NONE</obfuscation>
+              </configuration>
+          </plugin>
+      </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+        <groupId>org.netbeans.html</groupId>
+        <artifactId>net.java.html.boot</artifactId>
+        <version>${net.java.html.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.netbeans.html</groupId>
+      <artifactId>net.java.html.boot.script</artifactId>
+      <version>${net.java.html.version}</version>
+      <scope>test</scope>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
+</project>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/js/src/main/java/org/apidesign/demo/chat/js/Dialogs.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/js/src/main/java/org/apidesign/demo/chat/js/Dialogs.java	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,45 @@
+/**
+ * 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.demo.chat.js;
+
+public final class Dialogs {
+    private Dialogs() {
+    }
+    
+    /** Shows confirmation dialog to the user.
+     * 
+     * @param msg the message
+     * @param callback called back when the use accepts (can be null)
+     * @return true or false
+     */
+    @net.java.html.js.JavaScriptBody(
+        args = { "msg", "callback" }, 
+        javacall = true, 
+        body = 
+            "var ret = confirm(msg);" +
+            "if (ret && callback) callback.@java.lang.Runnable::run()();" +
+            "return ret;"
+    )
+    public static native boolean confirm(String msg, Runnable callback);
+}
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/js/src/test/java/org/apidesign/demo/chat/js/JsInteractionTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/js/src/test/java/org/apidesign/demo/chat/js/JsInteractionTest.java	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,64 @@
+/**
+ * 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.demo.chat.js;
+
+import java.io.Closeable;
+import net.java.html.boot.script.Scripts;
+import org.netbeans.html.boot.spi.Fn;
+import static org.testng.Assert.assertEquals;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/** Tests for behavior of @JavaScriptBody methods. Set your JavaScript 
+ * environment up (for example define <code>alert</code> or use some
+ * emulation library like <em>env.js</em>), register script presenter 
+ * and then you can call methods that deal with JavaScript in your tests.
+ */
+public class JsInteractionTest {
+    private Closeable jsEngine;
+    @BeforeMethod public void initializeJSEngine() throws Exception {
+        jsEngine = Fn.activate(Scripts.createPresenter());
+    }
+    
+    @AfterMethod public void shutdownJSEngine() throws Exception {
+        jsEngine.close();
+    }
+    
+    @Test public void testCallbackFromJavaScript() throws Exception {
+        class R implements Runnable {
+            int called;
+
+            @Override
+            public void run() {
+                called++;
+            }
+        }
+        R callback = new R();
+        
+        Dialogs.confirm("Hello", callback);
+        
+        assertEquals(callback.called, 1, "One immediate callback");
+    }
+  }
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/model/pom.xml
--- a/chat/model/pom.xml	Thu Aug 14 07:51:33 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apidesign.html</groupId>
-    <artifactId>chat-demo</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apidesign.html.demo</groupId>
-  <artifactId>chat-model</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>Shared Model of a Message</name>
-  <url>http://maven.apache.org</url>
-    <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.netbeans.html</groupId>
-      <artifactId>net.java.html.json</artifactId>
-      <version>${net.java.html.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <version>6.5.2</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/model/src/main/java/org/apidesign/html/chatserver/model/MessageImpl.java
--- a/chat/model/src/main/java/org/apidesign/html/chatserver/model/MessageImpl.java	Thu Aug 14 07:51:33 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +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.chatserver.model;
-
-import net.java.html.json.ComputedProperty;
-import net.java.html.json.Model;
-import net.java.html.json.Property;
-
-/** Generic model of communication between browser and a chat server.
- * The same code is then used on the server, on the client and even in unit 
- * tests.
- * 
- * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- */
-@Model(className = "Message", properties = {
-    @Property(name = "user", type = String.class),
-    @Property(name = "comment", type = String.class),
-    @Property(name = "since", type = long.class)    
-})
-class MessageImpl {
-    @ComputedProperty static String at(long since) {
-        long delta = since / 1000;
-        if (delta <= 0) {
-            return "Boot-time";
-        }
-        if (delta < 60) {
-            return delta + "s";
-        }
-        delta /= 60;
-        return delta + "min";
-    }
-
-    @Model(className = "Query", properties = {
-        @Property(name = "messages", type = Message.class, array = true)
-    })
-    class QryMsgs {
-    }
-}
diff -r 0e2b05057c97 -r a0f15cb8c730 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	Thu Aug 14 07:51:33 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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.chatserver.model;
-
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- */
-public class MessageImplTest {
-    
-    @Test public void properlyConvertedToSeconds() {
-        Message msg = new Message();
-        msg.setSince(5143);
-        assertEquals(msg.getAt(), "5s");
-    }
-    @Test public void properlyConvertedToMinutes() {
-        Message msg = new Message();
-        msg.setSince(63564);
-        assertEquals(msg.getAt(), "1min");
-    }
-}
\ No newline at end of file
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/pom.xml
--- a/chat/pom.xml	Thu Aug 14 07:51:33 2014 +0200
+++ b/chat/pom.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -1,38 +1,68 @@
-<?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>
+<?xml version="1.0"?>
+<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.demo</groupId>
+  <artifactId>chat-pom</artifactId>
+  <version>1.0-SNAPSHOT</version>
   <parent>
-    <artifactId>demo</artifactId>
-    <groupId>org.apidesign.html</groupId>
-    <version>1.0-SNAPSHOT</version>
+      <artifactId>demo</artifactId>
+      <groupId>org.apidesign.html</groupId>
+      <version>1.0-SNAPSHOT</version>
   </parent>
-  <groupId>org.apidesign.html</groupId>
-  <artifactId>chat-demo</artifactId>
-  <version>1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>Chat Server with Jersey and Bck2Brwsr</name>
-  <properties>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <bck2brwsr.obfuscationlevel>MINIMAL</bck2brwsr.obfuscationlevel>
-  </properties>
-  <modules>
-    <module>model</module>
-    <module>client</module>
-    <module>server</module>
-  </modules>
-  <build>
-      <pluginManagement>
-          <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>
-          </plugins>
-      </pluginManagement>
-  </build>
-</project>
\ No newline at end of file
+
+  <name>chat</name>
+
+    <modules>
+        <module>shared</module>
+        <module>client</module>
+        <module>client-web</module>
+        <module>client-android</module>
+        <module>client-ios</module>
+        <module>server</module>
+        <module>js</module>
+    </modules>
+    <properties>
+        <net.java.html.version>1.3</net.java.html.version>
+        <bck2brwsr.version>0.16</bck2brwsr.version>
+        <bck2brwsr.obfuscationlevel>FULL</bck2brwsr.obfuscationlevel>
+        <jersey.version>2.13</jersey.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <scope>test</scope>
+                <version>6.8.8</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <build>
+        <plugins>
+            <!--
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.3.1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <DependencyConvergence/>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>              
+            </plugin>
+            -->
+        </plugins>
+    </build>
+</project>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/server/nbactions.xml
--- a/chat/server/nbactions.xml	Thu Aug 14 07:51:33 2014 +0200
+++ b/chat/server/nbactions.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -32,4 +32,14 @@
             <goal>exec:java</goal>
         </goals>
     </action>
+    <action>
+        <actionName>debug</actionName>
+        <goals>
+            <goal>process-classes</goal>
+            <goal>exec:java</goal>
+        </goals>
+        <properties>
+            <jpda.listen>maven</jpda.listen>
+        </properties>
+    </action>
 </actions>
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/server/pom.xml
--- a/chat/server/pom.xml	Thu Aug 14 07:51:33 2014 +0200
+++ b/chat/server/pom.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -1,130 +1,99 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apidesign.html</groupId>
-    <artifactId>chat-demo</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apidesign.html.demo</groupId>
-  <artifactId>chat-server</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>Chat Server Using @Model</name>
-  <url>http://maven.apache.org</url>
-  <build>
-      <plugins>
+<?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>
+    <parent>
+      <groupId>org.apidesign.demo</groupId>
+      <artifactId>chat-pom</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>chat-server</artifactId>
+    <packaging>jar</packaging>
+    <name>chat Jersey based Server</name>
+    <properties>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.netbeans.html</groupId>
+            <artifactId>net.java.html.json</artifactId>
+            <version>${net.java.html.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>html-json</artifactId>
+            <version>${jersey.version}</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <!-- use explicitly specified versions -->
+                <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>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.connectors</groupId>
+            <artifactId>jersey-grizzly-connector</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-grizzly2-http</artifactId>
+            <version>${jersey.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-common</artifactId>
+            <version>${jersey.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <artifactId>ko-ws-tyrus</artifactId>
+            <groupId>org.netbeans.html</groupId>
+            <type>jar</type>
+            <version>${net.java.html.version}</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <!-- use explicitly specified versions -->
+                <exclusion>
+                    <groupId>org.glassfish.grizzly</groupId>
+                    <artifactId>grizzly-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish.grizzly</groupId>
+                    <artifactId>grizzly-http-server</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apidesign.demo</groupId>
+            <artifactId>chat-shared</artifactId>
+            <version>${project.version}</version>
+            <type>jar</type>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
           <plugin>
               <groupId>org.codehaus.mojo</groupId>
               <artifactId>exec-maven-plugin</artifactId>
               <version>1.2.1</version>
               <configuration>
-                  <mainClass>org.apidesign.bck2brwsr.demo.chatserver.impl.Main</mainClass>
+                  <mainClass>org.apidesign.demo.chat.server.Main</mainClass>
               </configuration>
-          </plugin>
-         <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-dependency-plugin</artifactId>
-             <version>2.7</version>
-             <executions>
-                 <execution>
-                    <phase>process-resources</phase>
-                    <id>unpack-client-code</id>
-                    <goals>
-                        <goal>unpack</goal>
-                    </goals>
-                    <configuration>
-                        <artifactItems>
-                            <artifactItem>
-                                <groupId>org.apidesign.html.demo</groupId>
-                                <artifactId>chat-client</artifactId>
-                                <version>1.0-SNAPSHOT</version>
-                                <type>zip</type>
-                                <classifier>bck2brwsr</classifier>
-                            </artifactItem>
-                        </artifactItems>
-                        <outputDirectory>${project.build.directory}/classes/org/apidesign/bck2brwsr/demo/chatserver/impl/</outputDirectory>
-                    </configuration>
-                 </execution>
-             </executions>
-             
-         </plugin>
-      </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.netbeans.html</groupId>
-      <artifactId>net.java.html.json</artifactId>
-      <version>${net.java.html.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.media</groupId>
-      <artifactId>html-json</artifactId>
-      <version>2.6</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <version>6.5.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.connectors</groupId>
-      <artifactId>jersey-grizzly-connector</artifactId>
-      <version>2.4.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.containers</groupId>
-      <artifactId>jersey-container-grizzly2-http</artifactId>
-      <version>2.6</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.grizzly</groupId>
-      <artifactId>grizzly-http-server</artifactId>
-      <version>2.3.8</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apidesign.html.demo</groupId>
-      <artifactId>chat-model</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <artifactId>javax.ws.rs-api</artifactId>
-      <groupId>javax.ws.rs</groupId>
-      <type>jar</type>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.core</groupId>
-      <artifactId>jersey-common</artifactId>
-      <version>2.6</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.grizzly</groupId>
-      <artifactId>grizzly-framework</artifactId>
-      <version>2.3.8</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <artifactId>ko-ws-tyrus</artifactId>
-      <groupId>org.netbeans.html</groupId>
-      <type>jar</type>
-      <version>${net.java.html.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-</project>
+          </plugin>      
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff -r 0e2b05057c97 -r a0f15cb8c730 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	Thu Aug 14 07:51:33 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +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.bck2brwsr.demo.chatserver.impl;
-
-import java.util.ArrayList;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-import javax.inject.Singleton;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.MediaType;
-import org.apidesign.html.chatserver.model.Message;
-import org.apidesign.html.chatserver.model.Query;
-
-/** Server side of the chat application.*/
-@Path("/chat/") @Singleton
-public final class ChatServerResource {
-    private static final Logger LOG = Logger.getLogger(ChatServerResource.class.getName());
-    private static final long started = System.currentTimeMillis() - 10;
-    
-    private List<Message> msgs = new ArrayList<>();
-    {
-        Message welcome = new Message();
-        welcome.setUser("system");
-        welcome.setComment("Welcome and enjoy!");
-        welcome.setSince(10);
-        msgs.add(welcome);
-    }
-    
-    private final Map<AsyncResponse, Long> awaiting = new IdentityHashMap<>();
-    
-    @Produces(MediaType.APPLICATION_JSON)
-    @GET public synchronized void getResources(
-        @QueryParam("since") @DefaultValue("0") long since,
-        @Suspended AsyncResponse ar
-    ) {
-        Query q = new Query();
-        for (Message m : msgs) {
-            if (m.getSince()>= since) {
-                q.getMessages().add(m);
-            }
-        }
-        if (!q.getMessages().isEmpty()) {
-            ar.resume(q);
-        } else {
-            awaiting.put(ar, since);
-        }
-    }
-    
-    private void handleAwaiting(long newest) {
-        assert Thread.holdsLock(this);
-        AGAIN: for (;;) {
-            for (Map.Entry<AsyncResponse, Long> entry : awaiting.entrySet()) {
-                AsyncResponse ar = entry.getKey();
-                Long since = entry.getValue();
-                if (since <= newest) {
-                    awaiting.remove(ar);
-                    getResources(since, ar);
-                    continue AGAIN;
-                }
-            }
-            return;
-        }
-    }
-    
-    @POST @Consumes(value = MediaType.APPLICATION_JSON)
-    public synchronized Message publish(Message msg) {
-        msg.setSince(System.currentTimeMillis() - started);
-        msgs.add(msg);
-        handleAwaiting(msg.getSince());
-        return msg;
-    }
-}
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/server/src/main/java/org/apidesign/bck2brwsr/demo/chatserver/impl/ClientPagesResource.java
--- a/chat/server/src/main/java/org/apidesign/bck2brwsr/demo/chatserver/impl/ClientPagesResource.java	Thu Aug 14 07:51:33 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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.bck2brwsr.demo.chatserver.impl;
-
-import java.io.InputStream;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-
-/**
- *
- * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- */
-@Path("/")
-public final class ClientPagesResource {
-    @GET public InputStream indexHtml() {
-        return clientData("index.html");
-    }
-    
-    @GET @Path("{resource:.*}")
-    public InputStream clientData(@PathParam("resource") String res) {
-        return ClientPagesResource.class.getResourceAsStream("client/" + res);
-    }
-}
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/server/src/main/java/org/apidesign/bck2brwsr/demo/chatserver/impl/Main.java
--- a/chat/server/src/main/java/org/apidesign/bck2brwsr/demo/chatserver/impl/Main.java	Thu Aug 14 07:51:33 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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.bck2brwsr.demo.chatserver.impl;
-
-import java.awt.Desktop;
-import java.io.IOException;
-import java.net.URI;
-import org.glassfish.grizzly.http.server.HttpServer;
-import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
-import org.glassfish.jersey.server.ResourceConfig;
-
-/** Starts chat server based on Jersey.
- *
- * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- */
-final class Main {
-    public static void main(String... args) throws Exception {
-        ResourceConfig rc = new ResourceConfig(
-            ChatServerResource.class, ClientPagesResource.class
-        );
-        URI u = new URI("http://localhost:8080/");
-        HttpServer server = GrizzlyHttpServerFactory.createHttpServer(u, rc);
-        System.err.println("Server running at " + u);
-        try {
-            System.err.println("Launching browser");
-            Desktop.getDesktop().browse(u);
-        } catch (IOException ex) {
-            System.err.println("Launching failed: " + ex.getMessage());
-        }
-        System.err.println("Press Enter to shutdown the server");
-        System.in.read();
-        server.stop();
-    }
-    
-}
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/server/src/main/java/org/apidesign/demo/chat/server/ChatServerResource.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/server/src/main/java/org/apidesign/demo/chat/server/ChatServerResource.java	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,103 @@
+/**
+ * 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.demo.chat.server;
+
+import java.util.ArrayList;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.container.Suspended;
+import javax.ws.rs.core.MediaType;
+import org.apidesign.demo.chat.shared.Message;
+import org.apidesign.demo.chat.shared.Query;
+
+/** Server side of the chat application.*/
+@Path("/chat/") @Singleton
+public final class ChatServerResource {
+    private static final Logger LOG = Logger.getLogger(ChatServerResource.class.getName());
+    private static final long started = System.currentTimeMillis() - 10;
+    
+    private List<Message> msgs = new ArrayList<>();
+    {
+        Message welcome = new Message();
+        welcome.setUser("system");
+        welcome.setComment("Welcome and enjoy!");
+        welcome.setSince(10);
+        msgs.add(welcome);
+    }
+    
+    private final Map<AsyncResponse, Long> awaiting = new IdentityHashMap<>();
+    
+    @Produces(MediaType.APPLICATION_JSON)
+    @GET public synchronized void getResources(
+        @QueryParam("since") @DefaultValue("0") long since,
+        @Suspended AsyncResponse ar
+    ) {
+        Query q = new Query();
+        for (Message m : msgs) {
+            if (m.getSince()>= since) {
+                q.getMessages().add(m);
+            }
+        }
+        if (!q.getMessages().isEmpty()) {
+            ar.resume(q);
+        } else {
+            awaiting.put(ar, since);
+        }
+    }
+    
+    private void handleAwaiting(long newest) {
+        assert Thread.holdsLock(this);
+        AGAIN: for (;;) {
+            for (Map.Entry<AsyncResponse, Long> entry : awaiting.entrySet()) {
+                AsyncResponse ar = entry.getKey();
+                Long since = entry.getValue();
+                if (since <= newest) {
+                    awaiting.remove(ar);
+                    getResources(since, ar);
+                    continue AGAIN;
+                }
+            }
+            return;
+        }
+    }
+    
+    @POST @Consumes(value = MediaType.APPLICATION_JSON)
+    public synchronized Message publish(Message msg) {
+        msg.setSince(System.currentTimeMillis() - started);
+        msgs.add(msg);
+        handleAwaiting(msg.getSince());
+        return msg;
+    }
+}
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/server/src/main/java/org/apidesign/demo/chat/server/Main.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/server/src/main/java/org/apidesign/demo/chat/server/Main.java	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,79 @@
+/**
+ * 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.demo.chat.server;
+
+import java.io.IOException;
+import java.net.Inet4Address;
+import java.net.InterfaceAddress;
+import java.net.NetworkInterface;
+import java.net.URI;
+import java.util.Enumeration;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import org.glassfish.grizzly.http.server.HttpServer;
+import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
+import org.glassfish.jersey.server.ResourceConfig;
+
+/** Starts REST server based on Jersey.
+ */
+final class Main implements ContainerResponseFilter {
+    public static void main(String... args) throws Exception {
+        ResourceConfig rc = new ResourceConfig(
+            ChatServerResource.class, Main.class
+        );
+        URI u = new URI("http://0.0.0.0:8080/");
+        HttpServer server = GrizzlyHttpServerFactory.createHttpServer(u, rc);
+        System.err.println("Server running on following IP addresses:");
+        dumpIPs();
+        System.err.println("Press Enter to shutdown the server");
+        System.in.read();
+        server.stop();
+    }
+
+    @Override
+    public void filter(
+        ContainerRequestContext requestContext, 
+        ContainerResponseContext r
+    ) throws IOException {
+        r.getHeaders().add("Access-Control-Allow-Origin", "*");
+        r.getHeaders().add("Access-Control-Allow-Credentials", "true");
+        r.getHeaders().add("Access-Control-Allow-Headers", "Content-Type");
+        r.getHeaders().add("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT");
+    }    
+    
+    private static void dumpIPs() throws Exception {
+        Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces();
+        while (en.hasMoreElements()) {
+            NetworkInterface n = en.nextElement();
+            if (n.isUp()) {
+                for (InterfaceAddress i : n.getInterfaceAddresses()) {
+                    if (i.getAddress() instanceof Inet4Address) {
+                        System.err.println(n.getName() + ": " + i.getAddress());
+                    }
+                }
+            }
+        }
+    }
+}
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/shared/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/shared/pom.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,45 @@
+<?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>
+    <parent>
+      <groupId>org.apidesign.demo</groupId>
+      <artifactId>chat-pom</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>chat-shared</artifactId>
+    <packaging>bundle</packaging>
+    <name>chat Shared Client Server Data Structures</name>
+    <dependencies>
+        <dependency>
+            <groupId>org.netbeans.html</groupId>
+            <artifactId>net.java.html.json</artifactId>
+            <version>${net.java.html.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.4.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.apidesign.demo.chat.shared</Export-Package>
+                        <Bundle-SymbolicName>org.apidesign.demo.chat.shared</Bundle-SymbolicName>
+                    </instructions>
+                </configuration>                
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/shared/src/main/java/org/apidesign/demo/chat/shared/MessageImpl.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/shared/src/main/java/org/apidesign/demo/chat/shared/MessageImpl.java	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,59 @@
+/**
+ * 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.demo.chat.shared;
+
+import net.java.html.json.ComputedProperty;
+import net.java.html.json.Model;
+import net.java.html.json.Property;
+
+/** Generic model of communication between browser and a chat server.
+ * The same code is then used on the server, on the client and even in unit 
+ * tests.
+ * 
+ * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ */
+@Model(className = "Message", properties = {
+    @Property(name = "user", type = String.class),
+    @Property(name = "comment", type = String.class),
+    @Property(name = "since", type = long.class)    
+})
+class MessageImpl {
+    @ComputedProperty static String at(long since) {
+        long delta = since / 1000;
+        if (delta <= 0) {
+            return "Boot-time";
+        }
+        if (delta < 60) {
+            return delta + "s";
+        }
+        delta /= 60;
+        return delta + "min";
+    }
+
+    @Model(className = "Query", properties = {
+        @Property(name = "messages", type = Message.class, array = true)
+    })
+    class QryMsgs {
+    }
+}
diff -r 0e2b05057c97 -r a0f15cb8c730 chat/shared/src/test/java/org/apidesign/demo/chat/shared/MessageImplTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/shared/src/test/java/org/apidesign/demo/chat/shared/MessageImplTest.java	Fri Apr 22 05:56:47 2016 +0200
@@ -0,0 +1,45 @@
+/**
+ * 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.demo.chat.shared;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ */
+public class MessageImplTest {
+    
+    @Test public void properlyConvertedToSeconds() {
+        Message msg = new Message();
+        msg.setSince(5143);
+        assertEquals(msg.getAt(), "5s");
+    }
+    @Test public void properlyConvertedToMinutes() {
+        Message msg = new Message();
+        msg.setSince(63564);
+        assertEquals(msg.getAt(), "1min");
+    }
+}
\ No newline at end of file
diff -r 0e2b05057c97 -r a0f15cb8c730 minesweeper/Info.plist.xml
--- a/minesweeper/Info.plist.xml	Thu Aug 14 07:51:33 2014 +0200
+++ b/minesweeper/Info.plist.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -1,4 +1,29 @@
 <?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.
+
+-->
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
     <dict>
diff -r 0e2b05057c97 -r a0f15cb8c730 pom.xml
--- a/pom.xml	Thu Aug 14 07:51:33 2014 +0200
+++ b/pom.xml	Fri Apr 22 05:56:47 2016 +0200
@@ -83,5 +83,14 @@
               </configuration>
           </plugin>
       </plugins>
+      <pluginManagement>
+          <plugins>
+              <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-compiler-plugin</artifactId>
+                  <version>2.5.1</version>
+              </plugin>
+          </plugins>
+      </pluginManagement>
   </build>
 </project>