summaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-04-05 17:43:45 +0300
committerVaadin Code Review <review@vaadin.com>2013-04-08 16:01:46 +0000
commit57bded97d986b4dde78f1f6d42432273c13a43f3 (patch)
tree72bc6a12ee2caac7e05886c7fa0a7f70cea0d0c9 /WebContent
parente27d5dc6bf3d219316c1adb5e08d0d044b56b0f1 (diff)
downloadvaadin-framework-57bded97d986b4dde78f1f6d42432273c13a43f3.tar.gz
vaadin-framework-57bded97d986b4dde78f1f6d42432273c13a43f3.zip
Added /run-push to tests to be able to test with push enabled (#11494)
Change-Id: I5b7ce3406017e02ca7494d95090dbbaf9e3836e1
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/WEB-INF/web.xml14
1 files changed, 14 insertions, 0 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 57207d7f18..3915898293 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -67,6 +67,15 @@
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>VaadinApplicationRunnerWithPush</servlet-name>
+ <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
+ <init-param>
+ <param-name>pushmode</param-name>
+ <param-value>automatic</param-value>
+ </init-param>
+ </servlet>
+
<!-- For testing GAE - the deployment script changes this to use GAEVaadinServlet -->
<servlet>
<servlet-name>IntegrationTest</servlet-name>
@@ -97,6 +106,11 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>VaadinApplicationRunnerWithPush</servlet-name>
+ <url-pattern>/run-push/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>IntegrationTest</servlet-name>
<url-pattern>/integration/*</url-pattern>
</servlet-mapping>