gistfile1.diff

Index: container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
===================================================================
--- container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java	(revision 1569653)
+++ container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java	(working copy)
@@ -16,7 +16,6 @@
  */
 package org.apache.openejb.assembler.classic;
 
-import org.apache.catalina.LifecycleException;
 import org.apache.geronimo.connector.GeronimoBootstrapContext;
 import org.apache.geronimo.connector.outbound.AbstractConnectionManager;
 import org.apache.geronimo.connector.work.GeronimoWorkManager;
Index: container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
===================================================================
--- container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java	(revision 1569653)
+++ container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java	(working copy)
@@ -29,6 +29,7 @@
 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 @@
                     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());
             }
Index: container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
===================================================================
--- container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java	(revision 1569653)
+++ container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java	(working copy)
@@ -299,7 +299,7 @@
         @Override
         public InjectionTarget<T> createInjectionTarget(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);
             }
Index: pom.xml
===================================================================
--- pom.xml	(revision 1569653)
+++ pom.xml	(working copy)
@@ -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>
@@ -541,6 +541,17 @@
     </profile>
   </profiles>
   <repositories>
+    <repository>
+      <id>owb-staging</id>
+      <name>OWB Staging</name>
+      <url>https://repository.apache.org/content/repositories/orgapacheopenwebbeans-1001/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
     <!--<repository>-->
     <!--<id>codehaus-snapshot</id>-->
     <!--<name>CodeHaus SNAPSHOT repository</name>-->