From bd992ae9e0f067ddc45bd0d6a6f6c34c20df5303 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sat, 12 Dec 2015 00:44:24 +0700
Subject: [PATCH] IDEMPIERE-2969:update to use zk8-osgi library servlet-mapping
 of zk already defind in zk_x.x.x.jar bundle jetty don't allow dupplicate
 servlet mapping so use overrider-web.xml to overrider default mapping
 configuration of zk

---
 org.adempiere.ui.zk/WEB-INF/override-web.xml | 37 ++++++++++++++
 org.adempiere.ui.zk/WEB-INF/web.xml          | 53 --------------------
 2 files changed, 37 insertions(+), 53 deletions(-)
 create mode 100644 org.adempiere.ui.zk/WEB-INF/override-web.xml

diff --git a/org.adempiere.ui.zk/WEB-INF/override-web.xml b/org.adempiere.ui.zk/WEB-INF/override-web.xml
new file mode 100644
index 0000000000..6c8c48e3f8
--- /dev/null
+++ b/org.adempiere.ui.zk/WEB-INF/override-web.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+	
+	<!-- //// -->
+	<!-- ZK -->
+	<servlet>
+		<description>ZK loader for ZUML pages</description>
+		<servlet-name>zkLoader</servlet-name>
+		<servlet-class>
+			org.adempiere.webui.session.WebUIServlet
+		</servlet-class>
+		<!-- Must. Specifies URI of the update engine (DHtmlUpdateServlet).
+			It must be the same as <url-pattern> for the update engine.
+		-->
+		<init-param>
+			<param-name>update-uri</param-name>
+			<param-value>/zkau</param-value>
+		</init-param>
+		<init-param>
+			<param-name>compress</param-name>
+			<param-value>false</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>zkLoader</servlet-name>
+		<url-pattern>*.zul</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>zkLoader</servlet-name>
+		<url-pattern>*.zhtml</url-pattern>
+	</servlet-mapping>
+	<!-- //// -->
+</web-app>
diff --git a/org.adempiere.ui.zk/WEB-INF/web.xml b/org.adempiere.ui.zk/WEB-INF/web.xml
index ba50fb3e09..610cc58220 100644
--- a/org.adempiere.ui.zk/WEB-INF/web.xml
+++ b/org.adempiere.ui.zk/WEB-INF/web.xml
@@ -56,15 +56,6 @@
 
 	<!-- //// -->
 	<!-- ZK -->
-	<listener>
-		<description>
-			Used to cleanup when a session is destroyed
-		</description>
-		<display-name>ZK Session Cleaner</display-name>
-		<listener-class>
-			org.zkoss.zk.ui.http.HttpSessionListener
-		</listener-class>
-	</listener>
 	<listener>
 		<description>
 			Used to track the session currently used
@@ -75,50 +66,6 @@
 		</listener-class>
 	</listener>
 
-	<servlet>
-		<description>ZK loader for ZUML pages</description>
-		<servlet-name>zkLoader</servlet-name>
-		<servlet-class>
-			org.adempiere.webui.session.WebUIServlet
-		</servlet-class>
-		<!-- Must. Specifies URI of the update engine (DHtmlUpdateServlet).
-			It must be the same as <url-pattern> for the update engine.
-		-->
-		<init-param>
-			<param-name>update-uri</param-name>
-			<param-value>/zkau</param-value>
-		</init-param>
-		<init-param>
-			<param-name>compress</param-name>
-			<param-value>false</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>zkLoader</servlet-name>
-		<url-pattern>*.zul</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>zkLoader</servlet-name>
-		<url-pattern>*.zhtml</url-pattern>
-	</servlet-mapping>
-	<servlet>
-		<description>The asynchronous update engine for ZK</description>
-		<servlet-name>auEngine</servlet-name>
-		<servlet-class>
-			org.zkoss.zk.au.http.DHtmlUpdateServlet
-		</servlet-class>
-		<init-param>
-			<param-name>compress</param-name>
-			<param-value>false</param-value>
-		</init-param>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>auEngine</servlet-name>
-		<url-pattern>/zkau/*</url-pattern>
-	</servlet-mapping>
-	<!-- //// -->
-
 	<!-- /////////// -->
 	<!-- Miscellaneous -->
 	<session-config>