Repository: tomee Updated Branches: refs/heads/master 29e5c0c88 -> 9b0b8ddf0
adding CDI Conversation Filter - ATM just a noop filter Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9b0b8ddf Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9b0b8ddf Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9b0b8ddf Branch: refs/heads/master Commit: 9b0b8ddf0e450838bd01a0f99df89731eb70383f Parents: 29e5c0c Author: Romain Manni-Bucau <[email protected]> Authored: Sat Mar 14 20:15:23 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Sat Mar 14 20:15:23 2015 +0100 ---------------------------------------------------------------------- .../tomee/catalina/OpenEJBContextConfig.java | 33 ++++++++++++++++++++ 1 file changed, 33 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/9b0b8ddf/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java index 26bcdb1..8887a63 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java @@ -61,8 +61,14 @@ import org.apache.tomee.jasper.TomEEJasperInitializer; import org.apache.tomee.loader.TomcatHelper; import org.apache.xbean.finder.IAnnotationFinder; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; import javax.servlet.ServletContainerInitializer; import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.HttpServlet; import javax.ws.rs.core.Application; import java.io.ByteArrayInputStream; @@ -366,6 +372,16 @@ public class OpenEJBContextConfig extends ContextConfig { webXml.addFilterMapping(mapping); } + { // CDI spec forces it, TODO: use it to replace org.apache.openejb.cdi.CdiAppContextsService conversation boot logic + final FilterDef filter = new FilterDef(); + filter.setAsyncSupported("true"); + filter.setDescription("CDI Conversation Filter"); + filter.setDisplayName("CDI Conversation Filter"); + filter.setFilterName("CDI Conversation Filter"); + filter.setFilterClass(NoopFilter.class.getName()); + webXml.addFilter(filter); + } + return webXml; } @@ -699,4 +715,21 @@ public class OpenEJBContextConfig extends ContextConfig { } return false; } + + public static class NoopFilter implements Filter { + @Override + public void init(final FilterConfig filterConfig) throws ServletException { + // no-op + } + + @Override + public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) throws IOException, ServletException { + chain.doFilter(request, response); + } + + @Override + public void destroy() { + // no-op + } + } }
