Author: dblevins
Date: Sun Sep 16 01:11:04 2012
New Revision: 1385203
URL: http://svn.apache.org/viewvc?rev=1385203&view=rev
Log:
Changes for OWB-701
Modified:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/RequestScopeArquillianStandaloneTest.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
Modified:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/RequestScopeArquillianStandaloneTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/RequestScopeArquillianStandaloneTest.java?rev=1385203&r1=1385202&r2=1385203&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/RequestScopeArquillianStandaloneTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/RequestScopeArquillianStandaloneTest.java
Sun Sep 16 01:11:04 2012
@@ -47,7 +47,7 @@ public class RequestScopeArquillianStand
@Test
public void checkInjections() {
assertNotNull(bean);
-
assertTrue(WebBeansContext.currentInstance().getJavassistProxyFactory().isProxyInstance(bean));
+
assertTrue(WebBeansContext.currentInstance().getProxyFactory().isProxyInstance(bean));
}
@RequestScoped
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=1385203&r1=1385202&r2=1385203&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
Sun Sep 16 01:11:04 2012
@@ -24,6 +24,7 @@ import org.apache.webbeans.container.Bea
import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.decorator.DelegateHandler;
import org.apache.webbeans.decorator.WebBeansDecoratorConfig;
+import org.apache.webbeans.proxy.ProxyFactory;
import javax.enterprise.context.spi.Context;
import javax.enterprise.context.spi.CreationalContext;
@@ -106,14 +107,16 @@ public class CdiInterceptor implements S
if (bean.getDecoratorStack().size() > 0) {
- Class<?> proxyClass =
webBeansContext.getJavassistProxyFactory().getInterceptorProxyClasses().get((InjectionTargetBean<?>)
bean);
+ final ProxyFactory proxyFactory =
webBeansContext.getProxyFactory();
+
+ Class<?> proxyClass =
proxyFactory.getInterceptorProxyClasses().get((InjectionTargetBean<?>) bean);
if (proxyClass == null) {
- proxyClass =
webBeansContext.getJavassistProxyFactory().createProxyClass(bean);
-
webBeansContext.getJavassistProxyFactory().getInterceptorProxyClasses().put((InjectionTargetBean<?>)
bean, proxyClass);
+ proxyClass = proxyFactory.createProxyClass(bean);
+
proxyFactory.getInterceptorProxyClasses().put((InjectionTargetBean<?>) bean,
proxyClass);
}
- Object delegate = proxyClass.newInstance();
- DelegateHandler delegateHandler = new DelegateHandler(bean,
ejbContext);
- ((ProxyObject) delegate).setHandler(delegateHandler);
+
+ final DelegateHandler delegateHandler = new DelegateHandler(bean,
ejbContext);
+ final Object delegate = proxyFactory.createDecoratorDelegate(bean,
delegateHandler);
// Gets component decorator stack
List<Object> decorators =
WebBeansDecoratorConfig.getDecoratorStack(bean, instance, delegate,
(CreationalContextImpl<?>) context);
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java?rev=1385203&r1=1385202&r2=1385203&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
Sun Sep 16 01:11:04 2012
@@ -106,7 +106,7 @@ public class CdiPlugin extends AbstractO
webBeansContext.getBeanManagerImpl().getInjectionResolver().clearCaches();
// Delte proxies
- webBeansContext.getJavassistProxyFactory().clear();
+ webBeansContext.getProxyFactory().clear();
// Delete AnnotateTypeCache
webBeansContext.getAnnotatedElementFactory().clear();
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java?rev=1385203&r1=1385202&r2=1385203&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
Sun Sep 16 01:11:04 2012
@@ -448,7 +448,7 @@ public class OpenEJBLifecycle implements
beanManager.getInjectionResolver().clearCaches();
//Delte proxies
- webBeansContext.getJavassistProxyFactory().clear();
+ webBeansContext.getProxyFactory().clear();
//Delete AnnotateTypeCache
webBeansContext.getAnnotatedElementFactory().clear();
