You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2015/05/13 19:34:12 UTC
[2/2] tomee git commit: TOMEE-1572 fix "CDI Conversation Filter"
support
TOMEE-1572 fix "CDI Conversation Filter" support
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9304f7d8
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9304f7d8
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9304f7d8
Branch: refs/heads/fb_tomee2_owb16
Commit: 9304f7d88369e5729234aff28511c8ea1798343f
Parents: 2dce7c1
Author: Mark Struberg <st...@apache.org>
Authored: Wed May 13 19:32:53 2015 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Wed May 13 19:32:53 2015 +0200
----------------------------------------------------------------------
.../apache/tomee/catalina/OpenEJBContextConfig.java | 11 +++++++++++
.../apache/tomee/catalina/TomcatWebAppBuilder.java | 14 +-------------
2 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/9304f7d8/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 753b021..c9169d3 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
@@ -59,6 +59,7 @@ import org.apache.tomee.common.NamingUtil;
import org.apache.tomee.common.ResourceFactory;
import org.apache.tomee.jasper.TomEEJasperInitializer;
import org.apache.tomee.loader.TomcatHelper;
+import org.apache.webbeans.web.context.WebConversationFilter;
import org.apache.xbean.finder.IAnnotationFinder;
import javax.servlet.ServletContainerInitializer;
@@ -365,6 +366,16 @@ public class OpenEJBContextConfig extends ContextConfig {
webXml.addFilterMapping(mapping);
}
+ {
+ 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(WebConversationFilter.class.getName());
+ webXml.addFilter(filter);
+ }
+
return webXml;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/9304f7d8/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
index 2ef7d8c..8137673 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
@@ -1076,19 +1076,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare
@Override
public void start(final StandardContext standardContext) {
- final WebContext webContext = WebContext.class.cast(standardContext.getServletContext().getAttribute("openejb.web.context"));
- if (webContext == null) {
- return;
- }
- for (final FilterMap map : standardContext.findFilterMaps()) {
- if ("CDI Conversation Filter".equals(map.getFilterName()) && webContext.getWebBeansContext() != null) {
- ContextsService contextsService = webContext.getWebBeansContext().getContextsService();
- if (contextsService != null) {
- contextsService.setSupportConversations(false);
- }
- break;
- }
- }
+ // nothing to do for now
}
/**