diff -r a0f15cb8c730 -r 2d0750864a98 chat/server/pom.xml
--- a/chat/server/pom.xml	Fri Apr 22 05:56:47 2016 +0200
+++ b/chat/server/pom.xml	Fri Apr 22 08:53:13 2016 +0200
@@ -8,82 +8,89 @@
     </parent>
     <artifactId>chat-server</artifactId>
     <packaging>jar</packaging>
-    <name>chat Jersey based Server</name>
+    <name>Chat WebSocket Server</name>
     <properties>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
+        <grizzly.version>2.3.8</grizzly.version>
     </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>
+  <dependencies>
+    <!-- compile + runtime -->
+    <dependency>
+      <groupId>org.netbeans.html</groupId>
+      <artifactId>net.java.html</artifactId>
+      <version>${net.java.html.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.netbeans.html</groupId>
+      <artifactId>net.java.html.json</artifactId>
+      <version>${net.java.html.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <artifactId>javax.websocket-api</artifactId>
+      <groupId>javax.websocket</groupId>
+      <type>jar</type>
+      <version>1.0</version>
+    </dependency>
+
+    <!-- tyrus runtime -->
+    <dependency>
+        <groupId>org.glassfish.tyrus</groupId>
+        <artifactId>tyrus-client</artifactId>
+        <version>1.3.1</version>
+        <scope>runtime</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.glassfish.tyrus</groupId>
+        <artifactId>tyrus-container-grizzly-client</artifactId>
+        <version>1.3.1</version>
+        <scope>runtime</scope>
+    </dependency>
+
+
+
+    <!-- test only deps -->
+    <dependency>
+      <groupId>org.netbeans.html</groupId>
+      <artifactId>ko4j</artifactId>
+      <version>${net.java.html.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.grizzly</groupId>
+      <artifactId>grizzly-http-server-core</artifactId>
+      <version>${grizzly.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.grizzly</groupId>
+      <artifactId>grizzly-websockets-server</artifactId>
+      <version>${grizzly.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.grizzly</groupId>
+      <artifactId>grizzly-http-server</artifactId>
+      <version>${grizzly.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.glassfish.grizzly</groupId>
+        <artifactId>grizzly-http-servlet</artifactId>
+        <version>${grizzly.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>3.1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>chat-shared</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
     <build>
         <plugins>
           <plugin>