1 files changed, 29 insertions, 1 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index f98b7c78d1..268fe1ea66 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -24,6 +24,10 @@
             <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>
     </servlet>
     <servlet>
@@ -33,6 +37,10 @@
             <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>
     </servlet>
     <servlet>
@@ -46,6 +54,10 @@
             <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>
     </servlet>
 
@@ -58,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>
@@ -84,6 +100,10 @@
         -->
         <servlet-name>VaadinApplicationRunnerWithTimeoutRedirect</servlet-name>
         <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
+        <init-param>
+            <param-name>org.atmosphere.cpr.scanClassPath</param-name>
+            <param-value>false</param-value>
+        </init-param>
     </servlet>
     
     <servlet>
@@ -94,6 +114,10 @@
             <param-value>automatic</param-value>
         </init-param>
         <async-supported>true</async-supported>
+        <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 -->
@@ -105,6 +129,10 @@
             <param-value>com.vaadin.tests.integration.ServletIntegrationUI</param-value>
         </init-param>
         <async-supported>true</async-supported>
+        <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>
@@ -142,7 +170,7 @@
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>IntegrationTest</servlet-name>
+        <servlet-name>VaadinApplicationRunner</servlet-name>
         <url-pattern>/VAADIN/*</url-pattern>
     </servlet-mapping>