summaryrefslogtreecommitdiffstats
path: root/WebContent/WEB-INF/web.xml
diff options
context:
space:
mode:
Diffstat (limited to 'WebContent/WEB-INF/web.xml')
-rw-r--r--WebContent/WEB-INF/web.xml22
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>