Remove scan removal hacks as we are now using VoidAnnotationParser

Change-Id: I28af87d84039c511e2378a67bccb9d0c34c55989

diff --git a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
index f00a05e810edc63cb51d1ef6abcf0dd23cffca87..871111ad8b6e0aa1b9bbe504d0ec143d740aaea8 100644 (file)
--- a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -48,7 +48,6 @@ import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.server.ssl.SslSocketConnector;
-import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.Scanner;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.webapp.WebAppContext;
@@ -257,7 +256,6 @@ public class DevelopmentServerLauncher {
                         webappcontext.stop();
                         server.stop();
                         webappcontext.start();
-                        disableAtmosphereAnnotationScan(webappcontext);
                         server.start();
                     }
                 });
@@ -278,8 +276,6 @@ public class DevelopmentServerLauncher {
         // Read web.xml to find all configured servlets
         webappcontext.start();
 
-        disableAtmosphereAnnotationScan(webappcontext);
-
         try {
             server.start();
 
@@ -351,19 +347,6 @@ public class DevelopmentServerLauncher {
         return "http://localhost:" + port + serverArgs.get("context");
     }
 
-    private static void disableAtmosphereAnnotationScan(
-            WebAppContext webappcontext) {
-        // Reconfigure all servlets to avoid startup delay
-        for (ServletHolder servletHolder : webappcontext.getServletHandler()
-                .getServlets()) {
-            if (servletHolder
-                    .getInitParameter("org.atmosphere.cpr.scanClassPath") == null) {
-                servletHolder.setInitParameter(
-                        "org.atmosphere.cpr.scanClassPath", "false");
-            }
-        }
-    }
-
     /**
      * Assign default value for given key.
      *