WICKET-5167 Depend on Servlet API 3.0 Move the code from WicketStuff-Servlet3
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c2d271be Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c2d271be Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c2d271be Branch: refs/heads/wicket-4774 Commit: c2d271beed55a875e41a6257be09aec4758c19d9 Parents: 5746249 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed May 1 10:59:50 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu May 2 15:56:46 2013 +0200 ---------------------------------------------------------------------- .../apache/wicket/protocol/http/WicketFilter.java | 37 +++++++++++---- 1 files changed, 27 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c2d271be/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java index 0ce7a2a..8b46792 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java @@ -26,6 +26,8 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.annotation.WebFilter; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -465,10 +467,6 @@ public class WicketFilter implements Filter */ protected String getFilterPathFromAnnotation(boolean isServlet) { - // @formatter:off - /* TODO JAVA6,SERVLET3.0 - * the code below is disabled because servlet 3.0 requires java 6 and wicket still supports java 5 - * for now the code below will go into a wicket-stuff module String[] patterns = null; if (isServlet) @@ -476,7 +474,14 @@ public class WicketFilter implements Filter WebServlet servlet = getClass().getAnnotation(WebServlet.class); if (servlet != null) { - patterns = servlet.urlPatterns(); + if (servlet.urlPatterns().length > 0) + { + patterns = servlet.urlPatterns(); + } + else + { + patterns = servlet.value(); + } } } else @@ -484,22 +489,34 @@ public class WicketFilter implements Filter WebFilter filter = getClass().getAnnotation(WebFilter.class); if (filter != null) { - patterns = filter.urlPatterns(); + if (filter.urlPatterns().length > 0) + { + patterns = filter.urlPatterns(); + } + else + { + patterns = filter.value(); + } } } + if (patterns != null && patterns.length > 0) { String pattern = patterns[0]; if (patterns.length > 1) { log.warn( - "Multiple url patterns defined for Wicket filter/servlet, using the first: {}", - pattern); + "Multiple url patterns defined for Wicket filter/servlet, using the first: {}", + pattern); + } + + if ("/*".equals(pattern)) + { + pattern = ""; } + return pattern; } - */ - // @formatter:on return null; }
