diff options
| author | Artur Signell <artur@vaadin.com> | 2014-08-20 22:13:40 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-08-21 09:52:52 +0000 |
| commit | e482897e0c4296c0b74f03abccdc7449afffd222 (patch) | |
| tree | dcb3534a4969b5de106e80fce9a45df292ef1b19 /WebContent | |
| parent | 033174a9d7395baabe97d6cfbca60ed3ea6928eb (diff) | |
| download | vaadin-framework-e482897e0c4296c0b74f03abccdc7449afffd222.tar.gz vaadin-framework-e482897e0c4296c0b74f03abccdc7449afffd222.zip | |
Use a separate servlet instance for static files during testing
There is something strange going on in Tomcat 8 and/or Atmosphere where
the websocket endpoint is deployed for /VAADIN/* and not for /run/* when
the same servlet is used
Change-Id: If0f5d7b87e410feeb53d1407919fa30cc794468a
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 9ca5be2bdf..18c06795c0 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -67,6 +67,11 @@ </servlet> <servlet> + <servlet-name>VaadinStaticFiles</servlet-name> + <servlet-class>com.vaadin.server.VaadinServlet</servlet-class> + <async-supported>false</async-supported> + </servlet> + <servlet> <servlet-name>VaadinApplicationRunner</servlet-name> <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> <!-- Non-default values for testing purposes --> @@ -98,11 +103,9 @@ </servlet> <servlet> - <!-- - This servlet is a separate instance for the sole purpose of + <!-- 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 - --> + because it modifies the VaadinService timeout parameters --> <servlet-name>VaadinApplicationRunnerWithTimeoutRedirect</servlet-name> <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> <init-param> @@ -110,7 +113,7 @@ <param-value>false</param-value> </init-param> </servlet> - + <servlet> <servlet-name>VaadinApplicationRunnerWithPush</servlet-name> <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> @@ -179,7 +182,7 @@ </servlet-mapping> <servlet-mapping> - <servlet-name>VaadinApplicationRunner</servlet-name> + <servlet-name>VaadinStaticFiles</servlet-name> <url-pattern>/VAADIN/*</url-pattern> </servlet-mapping> |