aboutsummaryrefslogtreecommitdiffstats
path: root/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
diff options
context:
space:
mode:
Diffstat (limited to 'uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java')
-rw-r--r--uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java24
1 files changed, 15 insertions, 9 deletions
diff --git a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
index 22b075b890..f00a05e810 100644
--- a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -257,6 +257,7 @@ public class DevelopmentServerLauncher {
webappcontext.stop();
server.stop();
webappcontext.start();
+ disableAtmosphereAnnotationScan(webappcontext);
server.start();
}
});
@@ -277,15 +278,7 @@ 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");
- }
- }
+ disableAtmosphereAnnotationScan(webappcontext);
try {
server.start();
@@ -358,6 +351,19 @@ 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.
*