summaryrefslogtreecommitdiffstats
path: root/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2014-09-04 13:09:59 +0300
committerVaadin Code Review <review@vaadin.com>2014-09-04 11:40:25 +0000
commitb914468e90f5aafb573f1769d8b2de7deedbb814 (patch)
treeb9596c6a691c69b9dc7e11fc720b589b95dd8f30 /uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
parent0d7a43769fe4d906d35e020abc8ce92928f45a09 (diff)
downloadvaadin-framework-b914468e90f5aafb573f1769d8b2de7deedbb814.tar.gz
vaadin-framework-b914468e90f5aafb573f1769d8b2de7deedbb814.zip
Don't scan classpath for any development servlet (#14604)
Change-Id: If3db4a35609260beff1079cbaafa8827643d9271
Diffstat (limited to 'uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java')
-rw-r--r--uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
index e6e54a57a6..22b075b890 100644
--- a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -48,6 +48,7 @@ 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;
@@ -273,6 +274,19 @@ public class DevelopmentServerLauncher {
}
}
+ // Read web.xml to find all configured servlets
+ webappcontext.start();
+
+ // 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");
+ }
+ }
+
try {
server.start();