Author: dblevins
Date: Thu Feb 24 17:50:12 2011
New Revision: 1074233
URL: http://svn.apache.org/viewvc?rev=1074233&view=rev
Log:
Cleanup around static usage. Has unconvered some init issues but they are
mostly inline now, still a little more poking to do
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java?rev=1074233&r1=1074232&r2=1074233&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java
Thu Feb 24 17:50:12 2011
@@ -184,10 +184,10 @@ public class BeansDeployer {
{
logger.debug("Validation of injection points has started.");
-
WebBeansContext.getInstance().getDecoratorsManager().validateDecoratorClasses();
-
WebBeansContext.getInstance().getInterceptorsManager().validateInterceptorClasses();
+ webBeansContext.getDecoratorsManager().validateDecoratorClasses();
+ webBeansContext.getInterceptorsManager().validateInterceptorClasses();
- BeanManagerImpl manager =
WebBeansContext.getInstance().getBeanManagerImpl();
+ BeanManagerImpl manager = webBeansContext.getBeanManagerImpl();
Set<Bean<?>> beans = new HashSet<Bean<?>>();
//Adding decorators to validate
@@ -234,7 +234,7 @@ public class BeansDeployer {
*/
private void validate(Set<Bean<?>> beans)
{
- BeanManagerImpl manager =
WebBeansContext.getInstance().getBeanManagerImpl();
+ BeanManagerImpl manager = webBeansContext.getBeanManagerImpl();
if (beans != null && beans.size() > 0) {
Stack<String> beanNames = new Stack<String>();
@@ -272,7 +272,7 @@ public class BeansDeployer {
manager.validate(injectionPoint);
} else {
if
(!bean.getBeanClass().isAnnotationPresent(javax.decorator.Decorator.class)
- &&
!WebBeansContext.getInstance().getBeanManagerImpl().containsCustomDecoratorClass(bean.getBeanClass()))
{
+ &&
!webBeansContext.getBeanManagerImpl().containsCustomDecoratorClass(bean.getBeanClass()))
{
throw new WebBeansConfigurationException(
"Delegate injection points can not
defined by beans that are not decorator. Injection point : "
+ injectionPoint);
@@ -431,7 +431,7 @@ public class BeansDeployer {
protected void checkXMLSpecializations()
{
// Check XML specializations
- Set<Class<?>> clazzes =
WebBeansContext.getInstance().getxMLSpecializesManager().getXMLSpecializationClasses();
+ Set<Class<?>> clazzes =
webBeansContext.getxMLSpecializesManager().getXMLSpecializationClasses();
Iterator<Class<?>> it = clazzes.iterator();
Class<?> superClass = null;
Class<?> specialClass = null;
@@ -465,7 +465,7 @@ public class BeansDeployer {
if (marker.isPassivationCapable()) {
validate = true;
}
- } else if
(WebBeansContext.getInstance().getBeanManagerImpl().isPassivatingScope(beanObj.getScope()))
{
+ } else if
(webBeansContext.getBeanManagerImpl().isPassivatingScope(beanObj.getScope())) {
if (WebBeansUtil.isPassivationCapable(beanObj) == null) {
if (!(beanObj instanceof AbstractProducerBean)) {
throw new WebBeansConfigurationException("Passivation
scoped defined bean must be passivation capable, " +
@@ -502,10 +502,10 @@ public class BeansDeployer {
if (beanClass.isAnnotation()) {
Class<? extends Annotation> stereoClass = (Class<? extends
Annotation>) beanClass;
if (annotationManager.isStereoTypeAnnotation(stereoClass))
{
- if
(!WebBeansContext.getInstance().getxMLAnnotationTypeManager().hasStereoType(stereoClass))
{
+ if
(!webBeansContext.getxMLAnnotationTypeManager().hasStereoType(stereoClass)) {
WebBeansUtil.checkStereoTypeClass(stereoClass);
StereoTypeModel model = new
StereoTypeModel(webBeansContext, stereoClass);
-
WebBeansContext.getInstance().getStereoTypeManager().addStereoTypeModel(model);
+
webBeansContext.getStereoTypeManager().addStereoTypeModel(model);
}
}
}
@@ -539,7 +539,7 @@ public class BeansDeployer {
protected <T> boolean defineManagedBean(Class<T> clazz,
ProcessAnnotatedTypeImpl<T> processAnnotatedEvent)
{
//Bean manager
- BeanManagerImpl manager =
WebBeansContext.getInstance().getBeanManagerImpl();
+ BeanManagerImpl manager = webBeansContext.getBeanManagerImpl();
//Create an annotated type
AnnotatedType<T> annotatedType =
processAnnotatedEvent.getAnnotatedType();
@@ -607,8 +607,8 @@ public class BeansDeployer {
webBeansContext.getWebBeansUtil().defineInterceptor(managedBeanCreator,
processInjectionTargetEvent);
}
} else {
- if
(WebBeansContext.getInstance().getBeanManagerImpl().containsCustomDecoratorClass(annotatedType.getJavaClass())
||
-
WebBeansContext.getInstance().getBeanManagerImpl().containsCustomInterceptorClass(annotatedType.getJavaClass()))
{
+ if
(webBeansContext.getBeanManagerImpl().containsCustomDecoratorClass(annotatedType.getJavaClass())
||
+
webBeansContext.getBeanManagerImpl().containsCustomInterceptorClass(annotatedType.getJavaClass()))
{
return false;
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java?rev=1074233&r1=1074232&r2=1074233&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
Thu Feb 24 17:50:12 2011
@@ -32,8 +32,8 @@ import java.util.List;
public class CdiEjbBean<T> extends BaseEjbBean<T> {
private final BeanContext beanContext;
- public CdiEjbBean(BeanContext beanContext) {
- super(beanContext.getBeanClass(),
toSessionType(beanContext.getComponentType()), WebBeansContext.getInstance());
+ public CdiEjbBean(BeanContext beanContext, WebBeansContext
webBeansContext) {
+ super(beanContext.getBeanClass(),
toSessionType(beanContext.getComponentType()), webBeansContext);
this.beanContext = beanContext;
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java?rev=1074233&r1=1074232&r2=1074233&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java
Thu Feb 24 17:50:12 2011
@@ -48,11 +48,13 @@ public class CdiInterceptor implements S
private final CdiEjbBean<Object> bean;
private final BeanManagerImpl manager;
private final CdiAppContextsService contextService;
+ private final WebBeansContext webBeansContext;
public CdiInterceptor(CdiEjbBean<Object> bean, BeanManagerImpl manager,
CdiAppContextsService contextService) {
this.bean = bean;
this.manager = manager;
this.contextService = contextService;
+ this.webBeansContext = bean.getWebBeansContext();
}
@AroundInvoke
@@ -112,11 +114,11 @@ public class CdiInterceptor implements S
if (bean.getDecoratorStack().size() > 0) {
- Class<?> proxyClass =
WebBeansContext.getInstance().getJavassistProxyFactory().getInterceptorProxyClasses().get((InjectionTargetBean<?>)
bean);
+ Class<?> proxyClass =
webBeansContext.getJavassistProxyFactory().getInterceptorProxyClasses().get((InjectionTargetBean<?>)
bean);
if (proxyClass == null) {
- ProxyFactory delegateFactory =
WebBeansContext.getInstance().getJavassistProxyFactory().createProxyFactory(bean);
- proxyClass =
WebBeansContext.getInstance().getJavassistProxyFactory().getProxyClass(delegateFactory);
-
WebBeansContext.getInstance().getJavassistProxyFactory().getInterceptorProxyClasses().put((InjectionTargetBean<?>)
bean, proxyClass);
+ ProxyFactory delegateFactory =
webBeansContext.getJavassistProxyFactory().createProxyFactory(bean);
+ proxyClass =
webBeansContext.getJavassistProxyFactory().getProxyClass(delegateFactory);
+
webBeansContext.getJavassistProxyFactory().getInterceptorProxyClasses().put((InjectionTargetBean<?>)
bean, proxyClass);
}
Object delegate = proxyClass.newInstance();
DelegateHandler delegateHandler = new DelegateHandler(bean,
ejbContext);
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java?rev=1074233&r1=1074232&r2=1074233&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
Thu Feb 24 17:50:12 2011
@@ -58,9 +58,10 @@ public class CdiScanner implements Scann
AppInfo appInfo = startupObject.getAppInfo();
ClassLoader classLoader =
startupObject.getAppContext().getClassLoader();
- final AlternativesManager alternativesManager =
WebBeansContext.getInstance().getAlternativesManager();
- final DecoratorsManager decoratorsManager =
WebBeansContext.getInstance().getDecoratorsManager();
- final InterceptorsManager interceptorsManager =
WebBeansContext.getInstance().getInterceptorsManager();
+ WebBeansContext webBeansContext = WebBeansContext.getInstance();
+ final AlternativesManager alternativesManager =
webBeansContext.getAlternativesManager();
+ final DecoratorsManager decoratorsManager =
webBeansContext.getDecoratorsManager();
+ final InterceptorsManager interceptorsManager =
webBeansContext.getInterceptorsManager();
final HashSet<String> ejbClasses = new HashSet<String>();
@@ -70,7 +71,7 @@ public class CdiScanner implements Scann
}
}
- final AnnotationManager annotationManager =
WebBeansContext.getInstance().getAnnotationManager();
+ final AnnotationManager annotationManager =
webBeansContext.getAnnotationManager();
for (EjbJarInfo ejbJar : appInfo.ejbJars) {
final BeansInfo beans = ejbJar.beans;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java?rev=1074233&r1=1074232&r2=1074233&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
Thu Feb 24 17:50:12 2011
@@ -188,7 +188,7 @@ public class OpenEJBLifecycle implements
continue;
}
- CdiEjbBean<Object> bean = new CdiEjbBean<Object>(beanContext);
+ CdiEjbBean<Object> bean = new CdiEjbBean<Object>(beanContext,
webBeansContext);
beanContext.set(CdiEjbBean.class, bean);
