diff options
| author | Tapio Aali <tapio@vaadin.com> | 2015-02-09 15:37:41 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-02-18 14:44:27 +0000 |
| commit | 735f0748344d7ee594c4e52a715d867dfdb23cb1 (patch) | |
| tree | a1a940c03cb1595e30486ddaa5cb1f64d61e412f /WebContent/WEB-INF | |
| parent | d23382ad25b0a9f1ab1bf864f8fd3746e5b1c320 (diff) | |
| download | vaadin-framework-735f0748344d7ee594c4e52a715d867dfdb23cb1.tar.gz vaadin-framework-735f0748344d7ee594c4e52a715d867dfdb23cb1.zip | |
Make push path configurable (#14432).
In order to use websockets with Weblogic 12.1.2 or later, push path 'ws'
needs to be used instead of 'PUSH'.
Change-Id: Ia90d11c20a375cef9cf4a53986a70d616a83db06
Diffstat (limited to 'WebContent/WEB-INF')
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index ef60364202..c1102f4682 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -87,9 +87,9 @@ </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 --> + <!-- 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> @@ -115,6 +115,17 @@ <async-supported>true</async-supported> </servlet> + <!-- For testing custom push path with, for example, Weblogic 12.1.2 --> + <servlet> + <servlet-name>VaadinApplicationRunnerWithPushPathTest</servlet-name> + <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> + <init-param> + <param-name>pushPath</param-name> + <param-value>ws</param-value> + </init-param> + <async-supported>true</async-supported> + </servlet> + <servlet-mapping> <servlet-name>Embed App 1</servlet-name> <url-pattern>/embed1/*</url-pattern> @@ -149,6 +160,11 @@ </servlet-mapping> <servlet-mapping> + <servlet-name>VaadinApplicationRunnerWithPushPathTest</servlet-name> + <url-pattern>/run-pushpath/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> <servlet-name>IntegrationTest</servlet-name> <url-pattern>/integration/*</url-pattern> </servlet-mapping> |