svn commit: r1570989 - in /tomee/tomee/trunk: container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java pom.xml

[rm...@apache.org]

Author: rmannibucau
Date: Sun Feb 23 09:40:18 2014
New Revision: 1570989

URL: http://svn.apache.org/r1570989
Log:
TOMEE-1131 owb 1.2.2

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
    tomee/tomee/trunk/pom.xml

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java?rev=1570989&r1=1570988&r2=1570989&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java Sun Feb 23 09:40:18 2014
@@ -299,7 +299,7 @@ public class CdiEjbBean<T> extends BaseE
         @Override
         public InjectionTarget<T> createInjectionTarget(final Bean<T> bean) {
             final EjbInjectionTargetImpl<T> injectionTarget = new EjbInjectionTargetImpl<T>(getAnnotatedType(), createInjectionPoints(bean), getWebBeansContext());
-            final InjectionTarget<T> it = getWebBeansContext().getWebBeansUtil().fireProcessInjectionTargetEvent(injectionTarget, getAnnotatedType()).getCompleteInjectionTarget();
+            final InjectionTarget<T> it = getWebBeansContext().getWebBeansUtil().fireProcessInjectionTargetEvent(injectionTarget, getAnnotatedType()).getInjectionTarget();
             if (!EjbInjectionTargetImpl.class.isInstance(it)) {
                 return new EjbInjectionTargetImpl<T>(injectionTarget, it);
             }

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java?rev=1570989&r1=1570988&r2=1570989&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java Sun Feb 23 09:40:18 2014
@@ -29,6 +29,7 @@ import org.apache.webbeans.config.WebBea
 import org.apache.webbeans.config.WebBeansFinder;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.intercept.InterceptorResolutionService;
+import org.apache.webbeans.portable.AbstractProducer;
 import org.apache.webbeans.portable.InjectionTargetImpl;
 import org.apache.webbeans.portable.events.discovery.BeforeShutdownImpl;
 import org.apache.webbeans.spi.ContainerLifecycle;
@@ -194,7 +195,9 @@ public class OpenEJBLifecycle implements
                     continue;
                 }
 
-                cdiEjbBean.defineBeanInterceptorStack();
+                if (AbstractProducer.class.isInstance(cdiEjbBean)) {
+                    AbstractProducer.class.cast(cdiEjbBean).defineInterceptorStack(cdiEjbBean, cdiEjbBean.getAnnotatedType(), cdiEjbBean.getWebBeansContext());
+                }
                 bc.mergeOWBAndOpenEJBInfo();
                 bc.set(InterceptorResolutionService.BeanInterceptorInfo.class, InjectionTargetImpl.class.cast(cdiEjbBean.getInjectionTarget()).getInterceptorInfo());
             }

Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1570989&r1=1570988&r2=1570989&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Sun Feb 23 09:40:18 2014
@@ -94,7 +94,7 @@
     <tomee.version>1.6.1-SNAPSHOT</tomee.version>
 
     <openjpa.version>2.3.0</openjpa.version>
-    <org.apache.openwebbeans.version>1.2.1</org.apache.openwebbeans.version>
+    <org.apache.openwebbeans.version>1.2.2</org.apache.openwebbeans.version>
 
     <!-- Maven module versions -->
     <maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version>