From d04bf27c65284674e6785c03ae689e62c2ab8568 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Tue, 24 Sep 2019 11:20:06 +0200
Subject: [PATCH] Backed out changeset 067ecd1dc47e - IDEMPIERE-3840 Use web
 socket for server push - set websocket as the default

---
 .../WEB-INF/zk-websocket-serverpush.xml             | 13 -------------
 org.adempiere.ui.zk/WEB-INF/zk.xml                  |  4 ++++
 2 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 org.adempiere.ui.zk/WEB-INF/zk-websocket-serverpush.xml

diff --git a/org.adempiere.ui.zk/WEB-INF/zk-websocket-serverpush.xml b/org.adempiere.ui.zk/WEB-INF/zk-websocket-serverpush.xml
deleted file mode 100644
index 5a6e8430af..0000000000
--- a/org.adempiere.ui.zk/WEB-INF/zk-websocket-serverpush.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE zk>
-
-	<!--
-		zk.xml Copyright (C) 2006 Potix Corporation. All Rights Reserved.
-	-->
-
-<zk>
-	<device-config>
- 		<device-type>ajax</device-type>
-      	<server-push-class>org.idempiere.ui.zk.websocket.WebSocketServerPush</server-push-class>
-	</device-config>
-</zk>
\ No newline at end of file
diff --git a/org.adempiere.ui.zk/WEB-INF/zk.xml b/org.adempiere.ui.zk/WEB-INF/zk.xml
index f32f278638..10eb855cce 100644
--- a/org.adempiere.ui.zk/WEB-INF/zk.xml
+++ b/org.adempiere.ui.zk/WEB-INF/zk.xml
@@ -61,6 +61,10 @@
  		<device-type>ajax</device-type>
       	<server-push-class>fi.jawsy.jawwa.zk.atmosphere.AtmosphereServerPush</server-push-class>
 	</device-config>
+	<!-- device-config>
+ 		<device-type>ajax</device-type>
+      	<server-push-class>org.idempiere.ui.zk.websocket.WebSocketServerPush</server-push-class>
+	</device-config -->
 
 	<!-- true for better performance and lower resource usage -->
 	<system-config>