diff options
Diffstat (limited to 'uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java')
| -rw-r--r-- | uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java index f00a05e810..871111ad8b 100644 --- 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. * |