diff options
| author | Artur Signell <artur@vaadin.com> | 2015-03-19 09:49:32 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-03-25 11:37:42 +0000 |
| commit | 140844eaff3de1b926460081405eb7d53ec811f8 (patch) | |
| tree | 22df06e4607937bbbb8b299beb05d6f4acb8de16 /WebContent | |
| parent | 1c569304b3f10960854c2045030d907408978d05 (diff) | |
| download | vaadin-framework-140844eaff3de1b926460081405eb7d53ec811f8.tar.gz vaadin-framework-140844eaff3de1b926460081405eb7d53ec811f8.zip | |
Revert "Make push path configurable (#14432)."
Breaks long polling fallback when implemented this way
This reverts commit 735f0748344d7ee594c4e52a715d867dfdb23cb1.
Conflicts:
push/build.xml
push/ivy.xml
server/src/com/vaadin/server/Constants.java
uitest/src/com/vaadin/tests/push/PushPathTest.java
Change-Id: I07f6fedafc648b0ee403865ccb322017d2a8d571
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index c1102f4682..ef60364202 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,17 +115,6 @@ <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> @@ -160,11 +149,6 @@ </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> |