summaryrefslogtreecommitdiffstats
path: root/WebContent/WEB-INF
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2013-05-02 09:58:19 +0300
committerHenri Sara <hesara@vaadin.com>2013-05-02 09:58:19 +0300
commita4e9ec1ea692107864c2e7945a2dc8503a16c50d (patch)
tree3405f0c14e1f9f324921055ad3660ebed17fe992 /WebContent/WEB-INF
parenta50cc42cb3b727118044b4dd7d7529dec06c09fe (diff)
downloadvaadin-framework-a4e9ec1ea692107864c2e7945a2dc8503a16c50d.tar.gz
vaadin-framework-a4e9ec1ea692107864c2e7945a2dc8503a16c50d.zip
Fix order in web.xml to pass validation (#11688, #11672)
Change-Id: I84ae6cbded5982da9e9a67b58e9ff9a1617627b8
Diffstat (limited to 'WebContent/WEB-INF')
-rw-r--r--WebContent/WEB-INF/web.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 4f0d8e073a..848baea318 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -75,22 +75,22 @@
<servlet>
<servlet-name>VaadinApplicationRunnerWithPush</servlet-name>
<servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
- <async-supported>true</async-supported>
<init-param>
<param-name>pushmode</param-name>
<param-value>automatic</param-value>
</init-param>
+ <async-supported>true</async-supported>
</servlet>
<!-- For testing GAE - the deployment script changes this to use GAEVaadinServlet -->
<servlet>
<servlet-name>IntegrationTest</servlet-name>
<servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
- <async-supported>true</async-supported>
<init-param>
<param-name>UI</param-name>
<param-value>com.vaadin.tests.integration.IntegrationTestUI</param-value>
</init-param>
+ <async-supported>true</async-supported>
</servlet>
<servlet-mapping>
<servlet-name>Embed App 1</servlet-name>