diff options
| author | Artur Signell <artur@vaadin.com> | 2015-03-18 16:22:08 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-04-02 13:08:42 +0000 |
| commit | dad7ac2309a550de6b02614c3a9be93d84e843e0 (patch) | |
| tree | afe822155f91155a17f55d291f621366c2c650cf /WebContent | |
| parent | 99882e2958e5692fbe52bd478a5c84ac65266ce6 (diff) | |
| download | vaadin-framework-dad7ac2309a550de6b02614c3a9be93d84e843e0.tar.gz vaadin-framework-dad7ac2309a550de6b02614c3a9be93d84e843e0.zip | |
Support JSR-356 websockets (#16738, #14432)
* Initialize Atmosphere in a context listener as JSR-356 requires
* Do not run JSR-356 or websocket tests on servers without support
* Adds /run-jsr356/ for testing JSR-356 websockets with uitest.war
* Change push path to /PUSH (from /PUSH/) to be compatible with JSR 356
endpoint mappings in Atmosphere (#14381)
Change-Id: Iec43f26df8c7b2bd347a713623a5298cc9e7b2cd
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index ef60364202..51ac907843 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -87,6 +87,17 @@ </servlet> <servlet> + <servlet-name>VaadinApplicationRunnerWithJSR356</servlet-name> + <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> + <!-- Force web sockets to use JSR 356 standard --> + <init-param> + <param-name>org.atmosphere.cpr.asyncSupport</param-name> + <param-value>org.atmosphere.container.JSR356AsyncSupport</param-value> + </init-param> + <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 --> @@ -149,6 +160,11 @@ </servlet-mapping> <servlet-mapping> + <servlet-name>VaadinApplicationRunnerWithJSR356</servlet-name> + <url-pattern>/run-jsr356/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> <servlet-name>IntegrationTest</servlet-name> <url-pattern>/integration/*</url-pattern> </servlet-mapping> |