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 2012/09/14 09:53:12 UTC
svn commit: r1384674 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java pom.xml

Author: rmannibucau
Date: Fri Sep 14 07:53:11 2012
New Revision: 1384674

URL: http://svn.apache.org/viewvc?rev=1384674&view=rev
Log:
making tck running before IT + using new OWB API

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

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java?rev=1384674&r1=1384673&r2=1384674&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java Fri Sep 14 07:53:11 2012
@@ -16,7 +16,6 @@
  */
 package org.apache.openejb.cdi;
 
-import javassist.util.proxy.ProxyFactory;
 import javassist.util.proxy.ProxyObject;
 import org.apache.openejb.core.ivm.IntraVmArtifact;
 import org.apache.webbeans.component.InjectionTargetBean;
@@ -26,8 +25,6 @@ import org.apache.webbeans.context.creat
 import org.apache.webbeans.decorator.DelegateHandler;
 import org.apache.webbeans.decorator.WebBeansDecoratorConfig;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.interceptor.AroundInvoke;
@@ -111,8 +108,7 @@ public class CdiInterceptor implements S
 
             Class<?> proxyClass = webBeansContext.getJavassistProxyFactory().getInterceptorProxyClasses().get((InjectionTargetBean<?>) bean);
             if (proxyClass == null) {
-                ProxyFactory delegateFactory = webBeansContext.getJavassistProxyFactory().createProxyFactory(bean);
-                proxyClass = webBeansContext.getJavassistProxyFactory().getProxyClass(delegateFactory);
+                proxyClass = webBeansContext.getJavassistProxyFactory().createProxyClass(bean);
                 webBeansContext.getJavassistProxyFactory().getInterceptorProxyClasses().put((InjectionTargetBean<?>) bean, proxyClass);
             }
             Object delegate = proxyClass.newInstance();

Modified: openejb/trunk/openejb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1384674&r1=1384673&r2=1384674&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Fri Sep 14 07:53:11 2012
@@ -330,11 +330,11 @@
         <module>server</module>
         <module>examples</module>
         <module>assembly</module>
+        <module>tck</module>
         <module>arquillian</module>
         <module>utils</module>
         <module>tomee</module>
         <module>osgi</module>
-        <module>tck</module>
       </modules>
     </profile>
     <profile>