You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/12/19 12:19:05 UTC
tomee git commit: validating interceptor/decorator for ejbs
Repository: tomee
Updated Branches:
refs/heads/develop 0e83d9768 -> 222977136
validating interceptor/decorator for ejbs
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/22297713
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/22297713
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/22297713
Branch: refs/heads/develop
Commit: 222977136d65810d45eec69071ecd4380656567e
Parents: 0e83d97
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Dec 19 12:16:50 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Dec 19 12:16:50 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/cdi/CdiEjbBean.java | 9 ++++++++-
.../src/main/java/org/apache/openejb/cdi/CdiPlugin.java | 4 ++++
tck/cdi-embedded/src/test/resources/failing.xml | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/22297713/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
index 4149397..e29b8be 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
@@ -27,10 +27,12 @@ import org.apache.openejb.util.proxy.ProxyManager;
import org.apache.webbeans.component.BeanAttributesImpl;
import org.apache.webbeans.component.InterceptedMarker;
import org.apache.webbeans.component.creation.BeanAttributesBuilder;
+import org.apache.webbeans.config.DeploymentValidationService;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.InjectionTargetFactoryImpl;
import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.ejb.common.component.BaseEjbBean;
+import org.apache.webbeans.intercept.InterceptorResolutionService;
import org.apache.webbeans.portable.InjectionTargetImpl;
import javax.ejb.NoSuchEJBException;
@@ -60,7 +62,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
-public class CdiEjbBean<T> extends BaseEjbBean<T> implements InterceptedMarker {
+public class CdiEjbBean<T> extends BaseEjbBean<T> implements InterceptedMarker, DeploymentValidationService.BeanInterceptorInfoProvider {
private final Map<Integer, Object> dependentSFSBToBeRemoved = new ConcurrentHashMap<Integer, Object>();
private final BeanContext beanContext;
@@ -84,6 +86,11 @@ public class CdiEjbBean<T> extends BaseEjbBean<T> implements InterceptedMarker {
isDependentAndStateful = getScope().equals(Dependent.class) && BeanType.STATEFUL.equals(beanContext.getComponentType());
}
+ @Override
+ public InterceptorResolutionService.BeanInterceptorInfo interceptorInfo() {
+ return EjbInjectionTargetImpl.class.cast(getInjectionTarget()).getInterceptorInfo();
+ }
+
public BeanContext getBeanContext() {
return this.beanContext;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/22297713/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
index c62a0a3..389823e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
@@ -37,6 +37,8 @@ import org.apache.webbeans.config.WebBeansFinder;
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.event.ObserverMethodImpl;
import org.apache.webbeans.exception.WebBeansConfigurationException;
+import org.apache.webbeans.intercept.InterceptorResolutionService;
+import org.apache.webbeans.portable.InjectionTargetImpl;
import org.apache.webbeans.portable.events.discovery.BeforeShutdownImpl;
import org.apache.webbeans.portable.events.generics.GProcessSessionBean;
import org.apache.webbeans.proxy.NormalScopeProxyFactory;
@@ -59,7 +61,9 @@ import javax.enterprise.inject.spi.AnnotatedField;
import javax.enterprise.inject.spi.AnnotatedMethod;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.Decorator;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.Interceptor;
import javax.enterprise.inject.spi.ObserverMethod;
import javax.enterprise.inject.spi.PassivationCapable;
import javax.enterprise.inject.spi.Producer;
http://git-wip-us.apache.org/repos/asf/tomee/blob/22297713/tck/cdi-embedded/src/test/resources/failing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/resources/failing.xml b/tck/cdi-embedded/src/test/resources/failing.xml
index 83b1d24..d72a513 100644
--- a/tck/cdi-embedded/src/test/resources/failing.xml
+++ b/tck/cdi-embedded/src/test/resources/failing.xml
@@ -18,7 +18,7 @@
<suite name="CDI TCK" verbose="0">
<test name="CDI TCK">
<classes>
- <class name="org.jboss.cdi.tck.tests.context.jms.MessageDrivenBeanContextTest"/>
+ <class name="org.jboss.cdi.tck.tests.context.passivating.broken.decorator.enterprise.EnterpriseBeanWithNonPassivatingDecoratorTest"/>
</classes>
</test>
</suite>