From 26b5b672df0aa3bdefdced81ed4619c11f3e945a Mon Sep 17 00:00:00 2001
From: Henrik Paul <henrik@vaadin.com>
Date: Tue, 26 Nov 2013 14:49:12 +0200
Subject: Timeout redirect timer is reset on server activity (#12446)

Change-Id: Iec2e3de627bc1cf5c7d39bf98715b1bf343e7519
---
 WebContent/WEB-INF/web.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'WebContent/WEB-INF')

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 8a917966a1..f98b7c78d1 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -76,6 +76,16 @@
         <async-supported>true</async-supported>
     </servlet>
 
+    <servlet>
+        <!-- 
+            This servlet is a separate instance for the sole purpose of 
+            testing #12446 (com.vaadin.tests.components.ui.TimeoutRedirectResetsOnActivity) 
+            because it modifies the VaadinService timeout parameters 
+        -->
+        <servlet-name>VaadinApplicationRunnerWithTimeoutRedirect</servlet-name>
+        <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
+    </servlet>
+    
     <servlet>
         <servlet-name>VaadinApplicationRunnerWithPush</servlet-name>
         <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
@@ -116,6 +126,11 @@
         <url-pattern>/run/*</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>VaadinApplicationRunnerWithTimeoutRedirect</servlet-name>
+        <url-pattern>/12446/*</url-pattern>
+    </servlet-mapping>
+
     <servlet-mapping>
         <servlet-name>VaadinApplicationRunnerWithPush</servlet-name>
         <url-pattern>/run-push/*</url-pattern>
-- 
cgit v1.2.3