diff -r f784d803f065 -r a0f15cb8c730 chat/client/pom.xml
--- a/chat/client/pom.xml	Tue May 20 06:05:56 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>