diff options
| author | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-26 11:45:23 +0300 |
|---|---|---|
| committer | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-26 11:46:08 +0300 |
| commit | 6327a7ea520aa314fc416d2ba94ab99d0e27dcab (patch) | |
| tree | 80157093d6c2bdcc133850a16ac9e42671a2e314 /WebContent | |
| parent | 2701ad52c4824e815200784464e8341e1fd135ed (diff) | |
| parent | 9a84fb14f2b7fc3c405f1446a007d5b9cd796c97 (diff) | |
| download | vaadin-framework-6327a7ea520aa314fc416d2ba94ab99d0e27dcab.tar.gz vaadin-framework-6327a7ea520aa314fc416d2ba94ab99d0e27dcab.zip | |
Merge branch 'master' into valo
Change-Id: I9f804f3ba10922a3d59999df06a23f2daa4cd4e8
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 7d86cf7cc2..268fe1ea66 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -24,8 +24,11 @@ <param-name>application</param-name> <param-value>com.vaadin.tests.components.button.Buttons</param-value> </init-param> + <init-param> + <param-name>org.atmosphere.cpr.scanClassPath</param-name> + <param-value>false</param-value> + </init-param> <async-supported>true</async-supported> - <load-on-startup>1</load-on-startup> </servlet> <servlet> <servlet-name>Embed App 2</servlet-name> @@ -34,8 +37,11 @@ <param-name>UI</param-name> <param-value>com.vaadin.tests.components.label.MarginsInLabels</param-value> </init-param> + <init-param> + <param-name>org.atmosphere.cpr.scanClassPath</param-name> + <param-value>false</param-value> + </init-param> <async-supported>true</async-supported> - <load-on-startup>2</load-on-startup> </servlet> <servlet> <servlet-name>UI provider app</servlet-name> @@ -48,8 +54,11 @@ <param-name>UI</param-name> <param-value>com.vaadin.tests.VerifyAssertionsEnabled</param-value> </init-param> + <init-param> + <param-name>org.atmosphere.cpr.scanClassPath</param-name> + <param-value>false</param-value> + </init-param> <async-supported>true</async-supported> - <load-on-startup>3</load-on-startup> </servlet> <servlet> @@ -61,6 +70,10 @@ <param-value>false</param-value> </init-param> <init-param> + <param-name>org.atmosphere.cpr.scanClassPath</param-name> + <param-value>false</param-value> + </init-param> + <init-param> <param-name>heartbeatInterval</param-name> <param-value>301</param-value> </init-param> @@ -77,7 +90,6 @@ <param-value>42</param-value> </init-param> <async-supported>true</async-supported> - <load-on-startup>4</load-on-startup> </servlet> <servlet> @@ -88,7 +100,10 @@ --> <servlet-name>VaadinApplicationRunnerWithTimeoutRedirect</servlet-name> <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> - <load-on-startup>5</load-on-startup> + <init-param> + <param-name>org.atmosphere.cpr.scanClassPath</param-name> + <param-value>false</param-value> + </init-param> </servlet> <servlet> @@ -99,7 +114,10 @@ <param-value>automatic</param-value> </init-param> <async-supported>true</async-supported> - <load-on-startup>6</load-on-startup> + <init-param> + <param-name>org.atmosphere.cpr.scanClassPath</param-name> + <param-value>false</param-value> + </init-param> </servlet> <!-- For testing GAE - the deployment script changes this to use GAEVaadinServlet --> @@ -111,7 +129,10 @@ <param-value>com.vaadin.tests.integration.ServletIntegrationUI</param-value> </init-param> <async-supported>true</async-supported> - <load-on-startup>7</load-on-startup> + <init-param> + <param-name>org.atmosphere.cpr.scanClassPath</param-name> + <param-value>false</param-value> + </init-param> </servlet> <servlet-mapping> <servlet-name>Embed App 1</servlet-name> @@ -149,7 +170,7 @@ </servlet-mapping> <servlet-mapping> - <servlet-name>IntegrationTest</servlet-name> + <servlet-name>VaadinApplicationRunner</servlet-name> <url-pattern>/VAADIN/*</url-pattern> </servlet-mapping> |