Modified: tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java?rev=1734805&r1=1734804&r2=1734805&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java (original) +++ tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java Sun Mar 13 13:37:40 2016 @@ -23,8 +23,9 @@ import java.util.Enumeration; import java.util.List; import java.util.StringTokenizer; +import javax.servlet.Filter; import javax.servlet.FilterChain; -import javax.servlet.GenericFilter; +import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -38,9 +39,7 @@ import javax.servlet.http.HttpServletRes * @author Amy Roh * @author Dmitri Valdin */ -public class CompressionFilter extends GenericFilter { - - private static final long serialVersionUID = 1L; +public class CompressionFilter implements Filter { /** * Minimal reasonable threshold. @@ -72,14 +71,21 @@ public class CompressionFilter extends G */ private int debug = 0; + /** + * Place this filter into service. + * + * @param filterConfig The filter configuration object + */ @Override - public void init() { - String str = getInitParameter("debug"); - if (str != null) { - debug = Integer.parseInt(str); + public void init(FilterConfig filterConfig) { + + if (filterConfig != null) { + String value = filterConfig.getInitParameter("debug"); + if (value!=null) { + debug = Integer.parseInt(value); } - str = getInitParameter("compressionThreshold"); + String str = filterConfig.getInitParameter("compressionThreshold"); if (str != null) { compressionThreshold = Integer.parseInt(str); if (compressionThreshold != 0 && compressionThreshold < minThreshold) { @@ -91,7 +97,7 @@ public class CompressionFilter extends G } } - str = getInitParameter("compressionBuffer"); + str = filterConfig.getInitParameter("compressionBuffer"); if (str != null) { compressionBuffer = Integer.parseInt(str); if (compressionBuffer < minBuffer) { @@ -103,7 +109,7 @@ public class CompressionFilter extends G } } - str = getInitParameter("compressionMimeTypes"); + str = filterConfig.getInitParameter("compressionMimeTypes"); if (str != null) { List<String> values = new ArrayList<>(); StringTokenizer st = new StringTokenizer(str, ","); @@ -129,6 +135,15 @@ public class CompressionFilter extends G } } + } + + /** + * Take this filter out of service. + */ + @Override + public void destroy() { + } + /** * The <code>doFilter</code> method of the Filter is called by the container * each time a request/response pair is passed through the chain due
Modified: tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java?rev=1734805&r1=1734804&r2=1734805&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java (original) +++ tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java Sun Mar 13 13:37:40 2016 @@ -20,8 +20,9 @@ package filters; import java.io.IOException; +import javax.servlet.Filter; import javax.servlet.FilterChain; -import javax.servlet.GenericFilter; +import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -42,10 +43,10 @@ import javax.servlet.ServletResponse; * * @author Craig McClanahan */ -public final class ExampleFilter extends GenericFilter { +public final class ExampleFilter implements Filter { - private static final long serialVersionUID = 1L; + // ----------------------------------------------------- Instance Variables /** @@ -55,6 +56,28 @@ public final class ExampleFilter extends /** + * The filter configuration object we are associated with. If this value + * is null, this filter instance is not currently configured. + */ + private FilterConfig filterConfig = null; + + + // --------------------------------------------------------- Public Methods + + + /** + * Take this filter out of service. + */ + @Override + public void destroy() { + + this.attribute = null; + this.filterConfig = null; + + } + + + /** * Time the processing that is performed by all subsequent filters in the * current filter stack, including the ultimately invoked servlet. * @@ -66,7 +89,8 @@ public final class ExampleFilter extends * @exception ServletException if a servlet error occurs */ @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { // Store ourselves as a request attribute (if requested) @@ -77,14 +101,22 @@ public final class ExampleFilter extends long startTime = System.currentTimeMillis(); chain.doFilter(request, response); long stopTime = System.currentTimeMillis(); - getServletContext().log(this.toString() + ": " + (stopTime - startTime) + + filterConfig.getServletContext().log + (this.toString() + ": " + (stopTime - startTime) + " milliseconds"); } + /** + * Place this filter into service. + * + * @param fConfig The filter configuration object + */ @Override - public void init() throws ServletException { - this.attribute = getInitParameter("attribute"); + public void init(FilterConfig fConfig) throws ServletException { + + this.filterConfig = fConfig; + this.attribute = fConfig.getInitParameter("attribute"); } @@ -93,8 +125,11 @@ public final class ExampleFilter extends */ @Override public String toString() { + + if (filterConfig == null) + return ("TimingFilter()"); StringBuilder sb = new StringBuilder("TimingFilter("); - sb.append(getFilterConfig()); + sb.append(filterConfig); sb.append(")"); return (sb.toString()); } Modified: tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java?rev=1734805&r1=1734804&r2=1734805&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java (original) +++ tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java Sun Mar 13 13:37:40 2016 @@ -23,7 +23,9 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.PushBuilder; + +import org.apache.catalina.connector.Request; +import org.apache.catalina.core.ApplicationPushBuilder; public class SimpleImagePush extends HttpServlet { @@ -33,7 +35,7 @@ public class SimpleImagePush extends Htt protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - PushBuilder pb = req.getPushBuilder().path("servlets/images/code.gif"); + ApplicationPushBuilder pb = ((Request) req).getPushBuilder().path("servlets/images/code.gif"); pb.push(); resp.setCharacterEncoding("UTF-8"); Modified: tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java?rev=1734805&r1=1734804&r2=1734805&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java (original) +++ tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java Sun Mar 13 13:37:40 2016 @@ -22,6 +22,11 @@ import javax.servlet.ServletContextListe public final class DrawboardContextListener implements ServletContextListener { @Override + public void contextInitialized(ServletContextEvent sce) { + // NO-OP + } + + @Override public void contextDestroyed(ServletContextEvent sce) { // Shutdown our room. Room room = DrawboardEndpoint.getRoom(false); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org