From 9e19a95d1419a9f6b2e583f0b6f1245d6643d6cf Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 5 Nov 2015 18:40:18 +1100 Subject: [PATCH] PushSessionCacheFilter --- .../src/main/java/org/eclipse/jetty/embedded/Http2Server.java | 4 +++- .../src/main/java/org/eclipse/jetty/webapp/WebAppContext.java | 3 ++- .../test-jetty-webapp/src/main/java/com/acme/Dump.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java index 8d984bf2d1a..8e19c0a20ee 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java @@ -55,6 +55,7 @@ import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.servlets.PushCacheFilter; import org.eclipse.jetty.servlets.PushSessionCacheFilter; import org.eclipse.jetty.util.ssl.SslContextFactory; @@ -74,7 +75,8 @@ public class Http2Server ServletContextHandler context = new ServletContextHandler(server, "/",ServletContextHandler.SESSIONS); context.setResourceBase("src/main/resources/docroot"); - context.addFilter(PushSessionCacheFilter.class,"/*",EnumSet.of(DispatcherType.REQUEST)); + context.addFilter(PushCacheFilter.class,"/*",EnumSet.of(DispatcherType.REQUEST)); + // context.addFilter(PushSessionCacheFilter.class,"/*",EnumSet.of(DispatcherType.REQUEST)); context.addFilter(PushedTilesFilter.class,"/*",EnumSet.of(DispatcherType.REQUEST)); context.addServlet(new ServletHolder(servlet), "/test/*"); context.addServlet(DefaultServlet.class, "/").setInitParameter("maxCacheSize","81920"); diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java index f899d9809ed..534d1076a1d 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java @@ -125,7 +125,8 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL "org.eclipse.jetty.util.log.", // webapp should use server log "org.eclipse.jetty.servlet.DefaultServlet", // webapp cannot change default servlets "org.eclipse.jetty.jsp.JettyJspServlet", //webapp cannot change jetty jsp servlet - "org.eclipse.jetty.servlets.PushCacheFilter" //must be loaded by container classpath + "org.eclipse.jetty.servlets.PushCacheFilter", //must be loaded by container classpath + "org.eclipse.jetty.servlets.PushSessionCacheFilter" //must be loaded by container classpath } ; // Server classes are classes that are hidden from being diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java index 6887c10b329..3a6b918239e 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java +++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java @@ -118,7 +118,7 @@ public class Dump extends HttpServlet } catch(ServletException se) { - se.printStackTrace(); + getServletContext().log(se.toString()); } }