Merge branch 'master' into bael-16656

java-websocket/src/main/webapp/websocket.js

@@ -0,0 +1,26 @@
+var ws;
+
+function connect() {
+    var username = document.getElementById("username").value;
+    
+    var host = document.location.host;
+    var pathname = document.location.pathname;
+    
+    ws = new WebSocket("ws://" +host  + pathname + "chat/" + username);
+
+    ws.onmessage = function(event) {
+    var log = document.getElementById("log");
+        console.log(event.data);
+        var message = JSON.parse(event.data);
+        log.innerHTML += message.from + " : " + message.content + "\n";
+    };
+}
+
+function send() {
+    var content = document.getElementById("msg").value;
+    var json = JSON.stringify({
+        "content":content
+    });
+
+    ws.send(json);
+}