diff options
| author | Henrik Paul <henrik@vaadin.com> | 2013-11-26 14:49:12 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-12-03 13:35:56 +0000 |
| commit | 26b5b672df0aa3bdefdced81ed4619c11f3e945a (patch) | |
| tree | 2a82389c617d0ba8715a695f3aa95b143c73cb5d /WebContent/WEB-INF | |
| parent | 25fc48c52067237faa208cea849a775a7aa1668c (diff) | |
| download | vaadin-framework-26b5b672df0aa3bdefdced81ed4619c11f3e945a.tar.gz vaadin-framework-26b5b672df0aa3bdefdced81ed4619c11f3e945a.zip | |
Timeout redirect timer is reset on server activity (#12446)
Change-Id: Iec2e3de627bc1cf5c7d39bf98715b1bf343e7519
Diffstat (limited to 'WebContent/WEB-INF')
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 15 |
1 files changed, 15 insertions, 0 deletions
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 @@ -77,6 +77,16 @@ </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> <init-param> @@ -117,6 +127,11 @@ </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> </servlet-mapping> |