From 735f0748344d7ee594c4e52a715d867dfdb23cb1 Mon Sep 17 00:00:00 2001
From: Tapio Aali <tapio@vaadin.com>
Date: Mon, 9 Feb 2015 15:37:41 +0200
Subject: 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
---
 WebContent/WEB-INF/web.xml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'WebContent')

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>
@@ -148,6 +159,11 @@
         <url-pattern>/run-push/*</url-pattern>
     </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>
-- 
cgit v1.2.3