diff options
| author | Artur Signell <artur@vaadin.com> | 2015-09-04 15:05:27 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-09-04 15:05:27 +0300 |
| commit | f46be1b2792755cb7d9b111068dd6cf202398c4a (patch) | |
| tree | 74f7098faee688cc1f1ca1b6ffe9e912338bbcaf /WebContent/WEB-INF | |
| parent | e603ea3cf91e5dd0893b766f27d400947527fba9 (diff) | |
| parent | ebceef4d44bcd61605fa92fcf7be8d3678537599 (diff) | |
| download | vaadin-framework-f46be1b2792755cb7d9b111068dd6cf202398c4a.tar.gz vaadin-framework-f46be1b2792755cb7d9b111068dd6cf202398c4a.zip | |
Merge remote-tracking branch 'origin/master' into reconnect-dialog
Change-Id: Ie622160a83116c83b255a26bec297f73f3223ac7
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 c097fcf1b7..1879175109 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -128,6 +128,16 @@ <async-supported>true</async-supported> </servlet> + <servlet> + <servlet-name>VaadinApplicationRunnerWithPushTimeout</servlet-name> + <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> + <init-param> + <param-name>pushLongPollingSuspendTimeout</param-name> + <param-value>10000</param-value> + </init-param> + <async-supported>true</async-supported> + </servlet> + <!-- For testing GAE - the deployment script changes this to use GAEVaadinServlet --> <servlet> <servlet-name>IntegrationTest</servlet-name> @@ -173,6 +183,11 @@ </servlet-mapping> <servlet-mapping> + <servlet-name>VaadinApplicationRunnerWithPushTimeout</servlet-name> + <url-pattern>/run-push-timeout/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> <servlet-name>VaadinApplicationRunnerWithJSR356</servlet-name> <url-pattern>/run-jsr356/*</url-pattern> </servlet-mapping> |