From d6954f86e401566456a64418ae80e2f8853a5e43 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 10 Jun 2013 21:32:57 +0300 Subject: Include TestBench 3.1.1 in the project (#12572) * Jetty is updated to 8.1.9.v20130131 to avoid conflicts with TestBench dependencies * The new jetty dependens on servlet 3.0 Change-Id: Ibbbc8f5838feb4c132ee2b6f7d7f3f630e95dd68 --- uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'uitest/src/com/vaadin/launcher') diff --git a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java index 5ab2134cdb..a8d639cbc8 100644 --- a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java +++ b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java @@ -24,10 +24,12 @@ import java.net.ServerSocket; import java.net.Socket; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.EnumSet; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; +import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -181,7 +183,8 @@ public class DevelopmentServerLauncher { String[] paths = serverArgs.get("slowdown").split(","); for (String p : paths) { System.out.println("Slowing down: " + p); - webappcontext.addFilter(SlowFilter.class, p, 1); + webappcontext.addFilter(SlowFilter.class, p, + EnumSet.of(DispatcherType.REQUEST)); } } // --cache=/run/APP/PUBLISHED/*,/other/path/asd.jpg @@ -190,7 +193,8 @@ public class DevelopmentServerLauncher { String[] paths = serverArgs.get("cache").split(","); for (String p : paths) { System.out.println("Enabling cache for: " + p); - webappcontext.addFilter(CacheFilter.class, p, 1); + webappcontext.addFilter(CacheFilter.class, p, + EnumSet.of(DispatcherType.REQUEST)); } } -- cgit v1.2.3