Author: dblevins
Date: Sat Sep 15 08:41:29 2012
New Revision: 1385030
URL: http://svn.apache.org/viewvc?rev=1385030&view=rev
Log:
OWB-701: Remove Javassist
Renamed JavassistProxyFactor to ProxyFactory
Added:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java
(contents, props changed)
- copied, changed from r1385029,
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
Removed:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java?rev=1385030&r1=1385029&r2=1385030&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java
(original)
+++
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java
Sat Sep 15 08:41:29 2012
@@ -489,7 +489,7 @@ public class OpenWebBeansEjbInterceptor
delegateHandler = new DelegateHandler(this.contextual, ejbContext);
final Object delegate =
-
webBeansContext.getJavassistProxyFactory().createDecoratorDelegate(injectionTarget,
delegateHandler);
+
webBeansContext.getProxyFactory().createDecoratorDelegate(injectionTarget,
delegateHandler);
// Gets component decorator stack
decorators =
WebBeansDecoratorConfig.getDecoratorStack(injectionTarget, instance, delegate,
(CreationalContextImpl<?>)this.cc);
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java?rev=1385030&r1=1385029&r2=1385030&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
Sat Sep 15 08:41:29 2012
@@ -51,7 +51,7 @@ import javax.enterprise.inject.spi.Inter
import org.apache.webbeans.intercept.InvocationContextImpl;
import org.apache.webbeans.intercept.webbeans.WebBeansInterceptor;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
-import org.apache.webbeans.proxy.JavassistProxyFactory;
+import org.apache.webbeans.proxy.ProxyFactory;
import org.apache.webbeans.spi.ResourceInjectionService;
import org.apache.webbeans.util.WebBeansUtil;
@@ -136,7 +136,7 @@ public abstract class AbstractInjectionT
boolean isDependentProxy = false;
if(getScope() == Dependent.class && !(this instanceof
EnterpriseBeanMarker))
{
- final JavassistProxyFactory proxyFactory =
getWebBeansContext().getJavassistProxyFactory();
+ final ProxyFactory proxyFactory =
getWebBeansContext().getProxyFactory();
T result = (T) proxyFactory.createDependentScopedBeanProxy(this,
instance, creationalContext);
//Means that Dependent Bean has interceptor/decorator
if(proxyFactory.isProxyInstance(result))
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java?rev=1385030&r1=1385029&r2=1385030&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java
Sat Sep 15 08:41:29 2012
@@ -204,18 +204,18 @@ public abstract class BuildInOwbBean<T>
return actualInstance;
}
- T proxy = (T)
webBeansContext.getJavassistProxyFactory().createBuildInBeanProxy(this);
+ T proxy = (T)
webBeansContext.getProxyFactory().createBuildInBeanProxy(this);
if (handlerClassName.equals(PROXY_HANDLER_VALUE_DEFAULT))
{
final MethodHandler handler = new BuildInBeanMethodHandler(this,
actualInstance);
- webBeansContext.getJavassistProxyFactory().setHandler(proxy,
handler);
+ webBeansContext.getProxyFactory().setHandler(proxy, handler);
return proxy;
}
else if (handlerContructor != null)
{
try
{
- webBeansContext.getJavassistProxyFactory().setHandler(proxy,
+ webBeansContext.getProxyFactory().setHandler(proxy,
(MethodHandler)
(handlerContructor.newInstance(this, actualInstance)));
return proxy;
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java?rev=1385030&r1=1385029&r2=1385030&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
Sat Sep 15 08:41:29 2012
@@ -96,7 +96,7 @@ public class ManagedBean<T> extends Abst
//If this is an abstract Decorator, we need to set the handler on the
Proxy instance
if(isAbstractDecorator)
{
- webBeansContext.getJavassistProxyFactory().setHandler(instance,
new AbstractDecoratorMethodHandler());
+ webBeansContext.getProxyFactory().setHandler(instance, new
AbstractDecoratorMethodHandler());
}
return instance;
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java?rev=1385030&r1=1385029&r2=1385030&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
Sat Sep 15 08:41:29 2012
@@ -54,8 +54,8 @@ public class ResourceBean<X, T extends A
return instance;
}
- X proxyInstance = (X)
getWebBeansContext().getJavassistProxyFactory().getResourceBeanProxyClass(this).newInstance();
-
webBeansContext.getJavassistProxyFactory().setHandler(proxyInstance, new
ResourceProxyHandler(this,instance));
+ X proxyInstance = (X)
getWebBeansContext().getProxyFactory().getResourceBeanProxyClass(this).newInstance();
+ webBeansContext.getProxyFactory().setHandler(proxyInstance, new
ResourceProxyHandler(this,instance));
return proxyInstance;
}
catch (Exception e)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java?rev=1385030&r1=1385029&r2=1385030&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
Sat Sep 15 08:41:29 2012
@@ -44,7 +44,7 @@ import org.apache.webbeans.intercept.ejb
import org.apache.webbeans.plugins.PluginLoader;
import org.apache.webbeans.portable.AnnotatedElementFactory;
import org.apache.webbeans.portable.events.ExtensionLoader;
-import org.apache.webbeans.proxy.JavassistProxyFactory;
+import org.apache.webbeans.proxy.ProxyFactory;
import org.apache.webbeans.proxy.javassist.OpenWebBeansClassLoaderProvider;
import org.apache.webbeans.service.DefaultLoaderService;
import org.apache.webbeans.spi.ContextsService;
@@ -77,7 +77,7 @@ public class WebBeansContext
private final ExtensionLoader extensionLoader = new ExtensionLoader(this);
private final InterceptorsManager interceptorsManager = new
InterceptorsManager(this);
private final WebBeansInterceptorConfig webBeansInterceptorConfig = new
WebBeansInterceptorConfig(this);
- private final JavassistProxyFactory javassistProxyFactory;
+ private final ProxyFactory proxyFactory;
private final OpenWebBeansConfiguration openWebBeansConfiguration;
private final PluginLoader pluginLoader = new PluginLoader();
private final SerializableBeanVault serializableBeanVault = new
SerializableBeanVault();
@@ -136,9 +136,9 @@ public class WebBeansContext
loaderService = getService(LoaderService.class);
securityService = getService(SecurityService.class);
- javassistProxyFactory =
serviceMap.containsKey(JavassistProxyFactory.class)
- ? (JavassistProxyFactory)
serviceMap.get(JavassistProxyFactory.class)
- : new JavassistProxyFactory();
+ proxyFactory = serviceMap.containsKey(ProxyFactory.class)
+ ? (ProxyFactory) serviceMap.get(ProxyFactory.class)
+ : new ProxyFactory();
OpenWebBeansClassLoaderProvider.initProxyFactoryClassLoaderProvider();
// Allow the WebBeansContext itself to be looked up
@@ -153,7 +153,7 @@ public class WebBeansContext
managerMap.put(DecoratorsManager.class, decoratorsManager);
managerMap.put(ExtensionLoader.class, extensionLoader);
managerMap.put(InterceptorsManager.class, interceptorsManager);
- managerMap.put(JavassistProxyFactory.class, javassistProxyFactory);
+ managerMap.put(ProxyFactory.class, proxyFactory);
managerMap.put(OpenWebBeansConfiguration.class,
openWebBeansConfiguration);
managerMap.put(PluginLoader.class, pluginLoader);
managerMap.put(SerializableBeanVault.class, serializableBeanVault);
@@ -340,9 +340,9 @@ public class WebBeansContext
return extensionLoader;
}
- public JavassistProxyFactory getJavassistProxyFactory()
+ public ProxyFactory getProxyFactory()
{
- return javassistProxyFactory;
+ return proxyFactory;
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1385030&r1=1385029&r2=1385030&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
Sat Sep 15 08:41:29 2012
@@ -838,7 +838,7 @@ public class BeanManagerImpl implements
if (instance == null)
{
//Create Managed Bean Proxy
- instance =
webBeansContext.getJavassistProxyFactory().createNormalScopedBeanProxy((AbstractOwbBean<?>)bean,creationalContext);
+ instance =
webBeansContext.getProxyFactory().createNormalScopedBeanProxy((AbstractOwbBean<?>)bean,creationalContext);
//Cached instance
cacheProxies.put(bean, instance);
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java?rev=1385030&r1=1385029&r2=1385030&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
Sat Sep 15 08:41:29 2012
@@ -359,7 +359,7 @@ public class WebBeansDecorator<T> extend
WebBeansContext webBeansContext = wrappedBean.getWebBeansContext();
Context context =
webBeansContext.getBeanManagerImpl().getContext(getScope());
Object actualInstance = context.get((Bean<Object>) wrappedBean,
(CreationalContext<Object>)creationalContext);
- T proxy = (T)
webBeansContext.getJavassistProxyFactory().createDependentScopedBeanProxy(wrappedBean,
actualInstance, creationalContext);
+ T proxy = (T)
webBeansContext.getProxyFactory().createDependentScopedBeanProxy(wrappedBean,
actualInstance, creationalContext);
return proxy;
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java?rev=1385030&r1=1385029&r2=1385030&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
Sat Sep 15 08:41:29 2012
@@ -45,7 +45,7 @@ import org.apache.webbeans.decorator.Del
import org.apache.webbeans.decorator.WebBeansDecoratorConfig;
import org.apache.webbeans.decorator.WebBeansDecoratorInterceptor;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
-import org.apache.webbeans.proxy.JavassistProxyFactory;
+import org.apache.webbeans.proxy.ProxyFactory;
import org.apache.webbeans.util.ClassUtil;
/**
@@ -346,9 +346,9 @@ public abstract class InterceptorHandler
if (decoratorDelegateHandler == null)
{
final DelegateHandler newDelegateHandler = new
DelegateHandler(bean);
- final JavassistProxyFactory javassistProxyFactory =
webBeansContext.getJavassistProxyFactory();
+ final ProxyFactory proxyFactory =
webBeansContext.getProxyFactory();
- final Object delegate =
javassistProxyFactory.createDecoratorDelegate(bean, newDelegateHandler);
+ final Object delegate = proxyFactory.createDecoratorDelegate(bean,
newDelegateHandler);
// Gets component decorator stack
List<Object> decorators =
WebBeansDecoratorConfig.getDecoratorStack(injectionTarget, instance, delegate,
ownerCreationalContext);
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java?rev=1385030&r1=1385029&r2=1385030&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
Sat Sep 15 08:41:29 2012
@@ -280,7 +280,7 @@ public class WebBeansInterceptor<T> exte
{
Context context =
webBeansContext.getBeanManagerImpl().getContext(getScope());
Object actualInstance = context.get((Bean<Object>) delegateBean,
(CreationalContext<Object>)creationalContext);
- T proxy = (T)
webBeansContext.getJavassistProxyFactory().createDependentScopedBeanProxy(delegateBean,
actualInstance, creationalContext);
+ T proxy = (T)
webBeansContext.getProxyFactory().createDependentScopedBeanProxy(delegateBean,
actualInstance, creationalContext);
return proxy;
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java?rev=1385030&r1=1385029&r2=1385030&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
Sat Sep 15 08:41:29 2012
@@ -169,7 +169,7 @@ public abstract class AbstractLifeCycle
injectionResolver.clearCaches();
//Delte proxies
- webBeansContext.getJavassistProxyFactory().clear();
+ webBeansContext.getProxyFactory().clear();
//Delete AnnotateTypeCache
webBeansContext.getAnnotatedElementFactory().clear();
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java?rev=1385030&r1=1385029&r2=1385030&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java
Sat Sep 15 08:41:29 2012
@@ -27,7 +27,7 @@ import org.apache.webbeans.component.Ent
import org.apache.webbeans.component.InjectionTargetBean;
import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.inject.AbstractInjectable;
-import org.apache.webbeans.proxy.JavassistProxyFactory;
+import org.apache.webbeans.proxy.ProxyFactory;
/**
* InjectionTargetProducer implementation.
@@ -83,7 +83,7 @@ public class InjectionTargetProducer<T>
//injection will be occured on Proxy instances that are
//not correct. Injection must be on actual dependent
//instance,so not necessary to inject on proxy
- final JavassistProxyFactory proxyFactory =
this.bean.getWebBeansContext().getJavassistProxyFactory();
+ final ProxyFactory proxyFactory =
this.bean.getWebBeansContext().getProxyFactory();
if(bean.getScope() == Dependent.class &&
proxyFactory.isProxyInstance(instance))
{
return;
Copied:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java
(from r1385029,
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java&r1=1385029&r2=1385030&rev=1385030&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java
Sat Sep 15 08:41:29 2012
@@ -51,7 +51,7 @@ import org.apache.webbeans.proxy.javassi
import org.apache.webbeans.util.ClassUtil;
import org.apache.webbeans.util.WebBeansUtil;
-public final class JavassistProxyFactory
+public final class ProxyFactory
{
private ConcurrentMap<OwbBean<?>, Class<?>> buildInBeanProxyClasses = new
ConcurrentHashMap<OwbBean<?>, Class<?>>();
private ConcurrentMap<OwbBean<?>, Class<?>> normalScopedBeanProxyClasses =
new ConcurrentHashMap<OwbBean<?>, Class<?>>();
@@ -62,12 +62,12 @@ public final class JavassistProxyFactory
private ConcurrentMap<OwbBean<?>, ConcurrentMap<Class<?>, Class<?>>>
ejbProxyClasses = new ConcurrentHashMap<OwbBean<?>, ConcurrentMap<Class<?>,
Class<?>>>();
private Factory factory;
- public JavassistProxyFactory()
+ public ProxyFactory()
{
this(new JavassistFactory());
}
- public JavassistProxyFactory(Factory factory)
+ public ProxyFactory(Factory factory)
{
this.factory = factory;
}
Propchange:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1385030&r1=1385029&r2=1385030&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Sat Sep 15 08:41:29 2012
@@ -2588,7 +2588,7 @@ public final class WebBeansUtil
}
//X TODO move proxy instance creation into JavassistProxyFactory!
- Class clazz =
webBeansContext.getJavassistProxyFactory().createAbstractDecoratorProxyClass(bean);
+ Class clazz =
webBeansContext.getProxyFactory().createAbstractDecoratorProxyClass(bean);
bean.setConstructor(defineConstructor(clazz));
bean.setIsAbstractDecorator(true);
@@ -2970,7 +2970,7 @@ public final class WebBeansUtil
ManagedBean<T> bean = defineManagedBean(type);
//X TODO move proxy instance creation into JavassistProxyFactory!
- Class clazz =
webBeansContext.getJavassistProxyFactory().createAbstractDecoratorProxyClass(bean);
+ Class clazz =
webBeansContext.getProxyFactory().createAbstractDecoratorProxyClass(bean);
bean.setConstructor(defineConstructor(clazz));
bean.setIsAbstractDecorator(true);
Modified:
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java?rev=1385030&r1=1385029&r2=1385030&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
(original)
+++
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
Sat Sep 15 08:41:29 2012
@@ -171,7 +171,7 @@ public final class JmsUtil
final Class<?>[] interfaces = {Closable.class, Serializable.class,
intf};
- return
WebBeansContext.getInstance().getJavassistProxyFactory().createProxy(handler,
interfaces);
+ return
WebBeansContext.getInstance().getProxyFactory().createProxy(handler,
interfaces);
}
catch (Exception e)
