[webbeans-commits] Webbeans SVN: r3720 - in ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean: builder and 1 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Tue Sep 22 08:17:39 EDT 2009
Author: kabir.khan at jboss.com
Date: 2009-09-22 08:17:38 -0400 (Tue, 22 Sep 2009)
New Revision: 3720
Modified:
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractReceiverBean.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethod.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ManagedBean.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/NewManagedBean.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/NewSessionBean.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ProducerField.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethod.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/SerializableBeanInstance.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/SessionBean.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractBeanBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractClassBeanBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/DisposalMethodBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ManagedBeanBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewManagedBeanBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewSessionBeanBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ProducerFieldBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ProducerMethodBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/SessionBeanBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ee/EEResourceProducerField.java
Log:
More encapsulation, everything is final and private in the beans. Log creation of beans in builders.
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -34,8 +34,6 @@
import org.jboss.webbeans.introspector.WBAnnotated;
import org.jboss.webbeans.introspector.WBField;
import org.jboss.webbeans.introspector.WBParameter;
-import org.jboss.webbeans.log.Log;
-import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.metadata.cache.MergedStereotypes;
import org.jboss.webbeans.metadata.cache.MetaAnnotationStore;
import org.jboss.webbeans.util.Reflections;
@@ -53,9 +51,6 @@
{
private final boolean proxyable;
- // Logger
- private final Log log = Logging.getLog(AbstractBean.class);
-
// The binding types
private final Set<Annotation> bindings;
@@ -84,7 +79,7 @@
// If the type a primitive?
private final boolean primitive;
// The Web Beans manager
- protected final BeanManagerImpl manager;
+ private final BeanManagerImpl manager;
private final boolean serializable;
@@ -326,11 +321,6 @@
return serializable && checkInjectionPointsAreSerializable();
}
-// protected void initSerializable()
-// {
-// _serializable = Reflections.isSerializable(type);
-// }
-
/**
* Gets a string representation
*
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -57,7 +57,7 @@
private static final LogProvider log = Logging.getLogProvider(AbstractClassBean.class);
// The item representation
- protected final WBClass<T> annotatedItem;
+ private final WBClass<T> annotatedItem;
// The injectable fields
private final Set<FieldInjectionPoint<?, ?>> injectableFields;
@@ -341,6 +341,4 @@
{
return preDestroy;
}
-
-
}
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -37,8 +37,6 @@
import org.jboss.webbeans.BeanManagerImpl;
import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.introspector.WBMember;
-import org.jboss.webbeans.log.LogProvider;
-import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.metadata.cache.MergedStereotypes;
import org.jboss.webbeans.metadata.cache.MetaAnnotationStore;
import org.jboss.webbeans.util.Beans;
@@ -56,8 +54,6 @@
*/
public abstract class AbstractProducerBean<T, S extends Member> extends AbstractReceiverBean<T, S> implements Producer<T>
{
- private static final LogProvider log = Logging.getLogProvider(AbstractProducerBean.class);
-
/**
* Constructor
*
@@ -155,12 +151,12 @@
}
else if (instance != null)
{
- boolean passivating = manager.getServices().get(MetaAnnotationStore.class).getScopeModel(getScope()).isPassivating();
+ boolean passivating = getManager().getServices().get(MetaAnnotationStore.class).getScopeModel(getScope()).isPassivating();
if (passivating && !Reflections.isSerializable(instance.getClass()))
{
throw new IllegalProductException("Producers cannot declare passivating scope and return a non-serializable class");
}
- InjectionPoint injectionPoint = manager.getCurrentInjectionPoint();
+ InjectionPoint injectionPoint = getManager().getCurrentInjectionPoint();
if (injectionPoint == null)
{
return;
@@ -194,12 +190,6 @@
}
}
- @Override
- public boolean isSerializable()
- {
- return true;
- }
-
/**
* Creates an instance of the bean
*
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractReceiverBean.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractReceiverBean.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/AbstractReceiverBean.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -84,7 +84,7 @@
return creationalContextImpl.getIncompleteInstance(getDeclaringBean());
}
}
- return manager.getReference(getDeclaringBean(), Object.class, creationalContext);
+ return getManager().getReference(getDeclaringBean(), Object.class, creationalContext);
}
}
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethod.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethod.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethod.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -19,7 +19,6 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
-import java.util.Collections;
import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
@@ -43,7 +42,7 @@
public class DisposalMethod<T> extends AbstractReceiverBean<T, Method>
{
- protected MethodInjectionPoint<T, ?> disposalMethodInjectionPoint;
+ private MethodInjectionPoint<T, ?> disposalMethodInjectionPoint;
private final String id;
protected DisposalMethod(BeanManagerImpl manager,
@@ -86,18 +85,6 @@
@Override
- public String getName()
- {
- return null;
- }
-
- @Override
- public Class<? extends Annotation> getScope()
- {
- return null;
- }
-
- @Override
public String toString()
{
return disposalMethodInjectionPoint.toString();
@@ -110,19 +97,6 @@
return false;
}
- @Override
- public boolean isSerializable()
- {
- // Not relevant
- return false;
- }
-
- @Override
- public boolean isProxyable()
- {
- return true;
- }
-
public T create(CreationalContext<T> creationalContext)
{
// Not Relevant
@@ -131,15 +105,15 @@
public void invokeDisposeMethod(Object instance)
{
- CreationalContext<T> creationalContext = manager.createCreationalContext(this);
+ CreationalContext<T> creationalContext = getManager().createCreationalContext(this);
Object receiverInstance = getReceiver(creationalContext);
if (receiverInstance == null)
{
- disposalMethodInjectionPoint.invokeWithSpecialValue(null, Disposes.class, instance, manager, creationalContext, IllegalArgumentException.class);
+ disposalMethodInjectionPoint.invokeWithSpecialValue(null, Disposes.class, instance, getManager(), creationalContext, IllegalArgumentException.class);
}
else
{
- disposalMethodInjectionPoint.invokeOnInstanceWithSpecialValue(receiverInstance, Disposes.class, instance, manager, creationalContext, IllegalArgumentException.class);
+ disposalMethodInjectionPoint.invokeOnInstanceWithSpecialValue(receiverInstance, Disposes.class, instance, getManager(), creationalContext, IllegalArgumentException.class);
}
creationalContext.release();
}
@@ -194,12 +168,6 @@
}
@Override
- public Class<T> getType()
- {
- return type;
- }
-
- @Override
protected String getDefaultName()
{
return disposalMethodInjectionPoint.getPropertyName();
@@ -222,16 +190,4 @@
// Doesn't support specialization
return null;
}
-
-// @Override
-// protected void initScopeType()
-// {
-// // Disposal methods aren't scoped
-// }
-
- public Set<Class<? extends Annotation>> getStereotypes()
- {
- return Collections.emptySet();
- }
-
}
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ManagedBean.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ManagedBean.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ManagedBean.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -153,7 +153,7 @@
public T produce(CreationalContext<T> ctx)
{
- T instance = constructor.newInstance(manager, ctx);
+ T instance = constructor.newInstance(getManager(), ctx);
if (!hasDecorators())
{
// This should be safe, but needs verification PLM
@@ -225,7 +225,7 @@
{
throw new DefinitionException("Managed bean " + type + " must be @Dependent");
}
- boolean passivating = manager.getServices().get(MetaAnnotationStore.class).getScopeModel(scopeType).isPassivating();
+ boolean passivating = getManager().getServices().get(MetaAnnotationStore.class).getScopeModel(scopeType).isPassivating();
if (passivating && !Reflections.isSerializable(getBeanClass()))
{
throw new DefinitionException("Simple bean declaring a passivating scope must have a serializable implementation class " + toString());
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/NewManagedBean.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/NewManagedBean.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/NewManagedBean.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -17,17 +17,14 @@
package org.jboss.webbeans.bean;
import java.lang.annotation.Annotation;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.enterprise.context.Dependent;
import javax.enterprise.inject.spi.Decorator;
import org.jboss.webbeans.BeanManagerImpl;
import org.jboss.webbeans.introspector.WBClass;
import org.jboss.webbeans.introspector.WBMethod;
-import org.jboss.webbeans.literal.NewLiteral;
import org.jboss.webbeans.metadata.cache.MergedStereotypes;
/**
@@ -65,8 +62,6 @@
proxyClassForDecorators, postConstruct, preDestroy, specializedBean);
}
- private Set<Annotation> bindings;
-
/**
* Protected constructor
*
@@ -90,47 +85,9 @@
{
super(type, manager, name, mergedStereotypes, scopeType, decorators, policy, proxyable, bindings, dependencies,
proxyClassForDecorators, postConstruct, preDestroy, specializedBean);
- this.bindings = new HashSet<Annotation>();
- this.bindings.add(new NewLiteral()
- {
-
- public Class<?> value()
- {
- return type.getJavaClass();
- }
-
- });
}
- /**
- * Gets the scope type
- *
- * @return @Dependent
- */
@Override
- public Class<? extends Annotation> getScope()
- {
- return Dependent.class;
- }
-
- @Override
- public boolean isAlternative()
- {
- return false;
- }
-
- /**
- * Gets the name of the bean
- *
- * @return null
- */
- @Override
- public String getName()
- {
- return null;
- }
-
- @Override
public boolean isSpecializing()
{
return false;
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/NewSessionBean.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/NewSessionBean.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/NewSessionBean.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -18,18 +18,15 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.enterprise.context.Dependent;
import javax.enterprise.inject.spi.Decorator;
import org.jboss.webbeans.BeanManagerImpl;
import org.jboss.webbeans.ejb.InternalEjbDescriptor;
import org.jboss.webbeans.introspector.WBClass;
import org.jboss.webbeans.introspector.WBMethod;
-import org.jboss.webbeans.literal.NewLiteral;
import org.jboss.webbeans.metadata.cache.MergedStereotypes;
import org.jboss.webbeans.resources.ClassTransformer;
@@ -71,8 +68,6 @@
proxyClassForDecorators, postConstruct, preDestroy, proxyClass, specializedBean);
}
- private Set<Annotation> bindings;
-
/**
* Protected constructor
*
@@ -98,48 +93,10 @@
SessionBean<?> specializedBean)
{
super(type, ejbDescriptor, manager, name, types, mergedStereotypes, scopeType, decorators, policy, proxyable, bindings, dependencies,
- proxyClassForDecorators, postConstruct, preDestroy, proxyClass, specializedBean);
- this.bindings = new HashSet<Annotation>();
- this.bindings.add(new NewLiteral()
- {
-
- public Class<?> value()
- {
- return type.getJavaClass();
- }
-
- });
+ proxyClassForDecorators, postConstruct, preDestroy, proxyClass, specializedBean);
}
- /**
- * Gets the scope type
- *
- * @return @Dependent
- */
@Override
- public Class<? extends Annotation> getScope()
- {
- return Dependent.class;
- }
-
- @Override
- public boolean isAlternative()
- {
- return false;
- }
-
- /**
- * Gets the name of the bean
- *
- * @return null
- */
- @Override
- public String getName()
- {
- return null;
- }
-
- @Override
public boolean isSpecializing()
{
return false;
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ProducerField.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ProducerField.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ProducerField.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -19,7 +19,6 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
-import java.util.Collections;
import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
@@ -167,10 +166,4 @@
{
return id;
}
-
- public Set<Class<? extends Annotation>> getStereotypes()
- {
- return Collections.emptySet();
- }
-
}
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethod.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethod.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethod.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -107,11 +107,11 @@
Object receiver = getReceiver(creationalContext);
if (receiver != null)
{
- return method.invokeOnInstance(receiver, manager, creationalContext, CreationException.class);
+ return method.invokeOnInstance(receiver, getManager(), creationalContext, CreationException.class);
}
else
{
- return method.invoke(receiver, manager, creationalContext, CreationException.class);
+ return method.invoke(receiver, getManager(), creationalContext, CreationException.class);
}
}
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/SerializableBeanInstance.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/SerializableBeanInstance.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/SerializableBeanInstance.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -36,7 +36,6 @@
this.instance = instance;
}
- @SuppressWarnings("unchecked")
public T getBean()
{
return (T) manager.getRiBeans().get(beanId);
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/SessionBean.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/SessionBean.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/SessionBean.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -310,7 +310,7 @@
*/
protected void checkObserverMethods()
{
- for (WBMethod<?, ?> method : this.annotatedItem.getWBDeclaredMethodsWithAnnotatedParameters(Observes.class))
+ for (WBMethod<?, ?> method : super.getAnnotatedItem().getWBDeclaredMethodsWithAnnotatedParameters(Observes.class))
{
if (!method.isStatic())
{
@@ -343,7 +343,7 @@
public SessionObjectReference createReference()
{
- return manager.getServices().get(EjbServices.class).resolveEjb(getEjbDescriptor().delegate());
+ return getManager().getServices().get(EjbServices.class).resolveEjb(getEjbDescriptor().delegate());
}
public Set<Class<? extends Annotation>> getStereotypes()
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractBeanBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractBeanBuilder.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractBeanBuilder.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -280,7 +280,10 @@
void registerSpecializedBean(Bean<T> bean)
{
if (isSpecializing())
+ {
+ log.trace("Registering " + bean + " as specializing " + getSpecializedBean());
manager.getSpecializedBeans().put(getSpecializedBean(), bean);
+ }
}
/**
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractClassBeanBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractClassBeanBuilder.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractClassBeanBuilder.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -164,7 +164,6 @@
{
decoratorStackPosition.set(++i);
- @SuppressWarnings("unchecked")
DecoratorImpl<Object> decoratorBean = (DecoratorImpl<Object>) decorator;
Object decoratorInstance = getManager().getReference(ip, decorator, creationalContext);
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/DisposalMethodBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/DisposalMethodBuilder.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/DisposalMethodBuilder.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -23,7 +23,6 @@
import java.util.HashSet;
import java.util.Set;
-import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
@@ -37,6 +36,8 @@
import org.jboss.webbeans.bean.SessionBean;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.introspector.WBMethod;
+import org.jboss.webbeans.log.Log;
+import org.jboss.webbeans.log.Logging;
/**
*
@@ -45,7 +46,10 @@
*/
class DisposalMethodBuilder<T> extends AbstractReceiverBeanBuilder<T, Method>
{
+ // Logger
+ private final Log log = Logging.getLog(DisposalMethodBuilder.class);
+
protected WBMethod<T, ?> disposalMethod;
private final String id;
@@ -235,6 +239,7 @@
DisposalMethod<T> createBean()
{
+ log.trace("Building disposal method bean for " + disposalMethod);
DisposalMethod<T> bean = DisposalMethod.of(getManager(),
getName(),
disposalMethod,
@@ -248,6 +253,7 @@
bean.initialize();
registerSpecializedBean(bean);
+ log.trace("Built " + bean);
return bean;
}
}
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ManagedBeanBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ManagedBeanBuilder.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ManagedBeanBuilder.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -181,6 +181,8 @@
}
}
+
+
/**
* Gets a string representation
*
@@ -218,6 +220,7 @@
@Override
ManagedBean<T> createBean()
{
+ log.trace("Building managed bean for " + getType());
ManagedBean<T> bean = ManagedBean.of(
getAnnotatedItem(),
getManager(),
@@ -236,6 +239,7 @@
bean.initialize();
registerSpecializedBean(bean);
+ log.trace("Built " + bean);
return bean;
}
}
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewManagedBeanBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewManagedBeanBuilder.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewManagedBeanBuilder.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -26,6 +26,8 @@
import org.jboss.webbeans.bean.NewManagedBean;
import org.jboss.webbeans.introspector.WBClass;
import org.jboss.webbeans.literal.NewLiteral;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
/**
* Builder for a @New simple bean
@@ -35,6 +37,7 @@
*/
class NewManagedBeanBuilder<T> extends ManagedBeanBuilder<T>
{
+ private static LogProvider log = Logging.getLogProvider(NewManagedBeanBuilder.class);
/**
* Creates an instance of a NewSimpleBean from an annotated class
@@ -119,6 +122,7 @@
@Override
NewManagedBean<T> createBean()
{
+ log.trace("Building @New managed bean for " + getType());
NewManagedBean<T> bean = NewManagedBean.of(
getAnnotatedItem(),
getManager(),
@@ -137,6 +141,7 @@
bean.initialize();
registerSpecializedBean(bean);
+ log.trace("Built " + bean);
return bean;
}
}
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewSessionBeanBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewSessionBeanBuilder.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewSessionBeanBuilder.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -27,6 +27,8 @@
import org.jboss.webbeans.ejb.InternalEjbDescriptor;
import org.jboss.webbeans.introspector.WBClass;
import org.jboss.webbeans.literal.NewLiteral;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.resources.ClassTransformer;
/**
@@ -37,6 +39,7 @@
*/
class NewSessionBeanBuilder<T> extends SessionBeanBuilder<T>
{
+ private static LogProvider log = Logging.getLogProvider(NewSessionBeanBuilder.class);
/**
* Creates an instance of a NewEnterpriseBean from an annotated class
@@ -128,6 +131,7 @@
@Override
NewSessionBean<T> createBean()
{
+ log.trace("Building @New session bean for " + getType());
NewSessionBean<T> bean = NewSessionBean.of(getEjbDescriptor(),
getManager(),
getName(),
@@ -147,6 +151,7 @@
bean.initialize();
registerSpecializedBean(bean);
+ log.trace("Built " + bean);
return bean;
}
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ProducerFieldBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ProducerFieldBuilder.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ProducerFieldBuilder.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -30,6 +30,8 @@
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.ejb.EJBApiAbstraction;
import org.jboss.webbeans.introspector.WBField;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.persistence.PersistenceApiAbstraction;
import org.jboss.webbeans.util.Names;
import org.jboss.webbeans.ws.WSApiAbstraction;
@@ -44,6 +46,8 @@
*/
class ProducerFieldBuilder<T> extends AbstractProducerBeanBuilder<T, Field>
{
+ private static LogProvider log = Logging.getLogProvider(ProducerFieldBuilder.class);
+
// The underlying field
private WBField<T, ?> field;
private final String id;
@@ -158,6 +162,7 @@
public ProducerField<T> createBean()
{
+ log.trace("Building producer field bean for " + field);
ProducerField<T> bean = null;
if (isPersistenceContextProducerField(field))
{
@@ -204,6 +209,7 @@
}
bean.initialize();
+ log.trace("Built " + bean);
return bean;
}
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ProducerMethodBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ProducerMethodBuilder.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ProducerMethodBuilder.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -34,6 +34,8 @@
import org.jboss.webbeans.bean.SessionBean;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.introspector.WBMethod;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.util.Names;
/**
@@ -46,6 +48,8 @@
*/
class ProducerMethodBuilder<T> extends AbstractProducerBeanBuilder<T, Method>
{
+ private static LogProvider log = Logging.getLogProvider(ProducerMethodBuilder.class);
+
// The underlying method
private WBMethod<T, ?> method;
@@ -246,6 +250,7 @@
public ProducerMethod<T> createBean()
{
+ log.trace("Building producer method bean for " + method);
ProducerMethod<T> bean = ProducerMethod.of(method,
getDeclaringBean(),
getManager(),
@@ -262,6 +267,7 @@
bean.initialize();
registerSpecializedBean(bean);
+ log.trace("Built " + bean);
return bean;
}
}
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/SessionBeanBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/SessionBeanBuilder.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/SessionBeanBuilder.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -43,6 +43,8 @@
import org.jboss.webbeans.ejb.spi.BusinessInterfaceDescriptor;
import org.jboss.webbeans.introspector.WBClass;
import org.jboss.webbeans.introspector.WBMethod;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.resources.ClassTransformer;
import org.jboss.webbeans.util.Proxies;
@@ -56,6 +58,8 @@
*/
class SessionBeanBuilder<T> extends AbstractClassBeanBuilder<T>
{
+ private static LogProvider log = Logging.getLogProvider(SessionBeanBuilder.class);
+
// The EJB descriptor
private InternalEjbDescriptor<T> ejbDescriptor;
@@ -310,6 +314,7 @@
@Override
SessionBean<T> createBean()
{
+ log.trace("Building @New session bean for " + getType());
SessionBean<T> bean = SessionBean.of(getEjbDescriptor(),
getManager(),
getName(),
@@ -329,6 +334,7 @@
bean.initialize();
registerSpecializedBean(bean);
+ log.trace("Built " + bean);
return bean;
}
}
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ee/EEResourceProducerField.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ee/EEResourceProducerField.java 2009-09-22 11:00:43 UTC (rev 3719)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/ee/EEResourceProducerField.java 2009-09-22 12:17:38 UTC (rev 3720)
@@ -24,7 +24,6 @@
import org.jboss.webbeans.BeanManagerImpl;
import org.jboss.webbeans.bean.AbstractClassBean;
import org.jboss.webbeans.bean.ProducerField;
-import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.ejb.EJBApiAbstraction;
import org.jboss.webbeans.introspector.WBField;
import org.jboss.webbeans.metadata.cache.MergedStereotypes;
@@ -88,9 +87,9 @@
protected void checkEEResource()
{
- EJBApiAbstraction ejbApiAbstraction = manager.getServices().get(EJBApiAbstraction.class);
- PersistenceApiAbstraction persistenceApiAbstraction = manager.getServices().get(PersistenceApiAbstraction.class);
- WSApiAbstraction wsApiAbstraction = manager.getServices().get(WSApiAbstraction.class);
+ EJBApiAbstraction ejbApiAbstraction = getManager().getServices().get(EJBApiAbstraction.class);
+ PersistenceApiAbstraction persistenceApiAbstraction = getManager().getServices().get(PersistenceApiAbstraction.class);
+ WSApiAbstraction wsApiAbstraction = getManager().getServices().get(WSApiAbstraction.class);
if (!(getAnnotatedItem().isAnnotationPresent(ejbApiAbstraction.RESOURCE_ANNOTATION_CLASS) || getAnnotatedItem().isAnnotationPresent(persistenceApiAbstraction.PERSISTENCE_CONTEXT_ANNOTATION_CLASS) || getAnnotatedItem().isAnnotationPresent(persistenceApiAbstraction.PERSISTENCE_UNIT_ANNOTATION_CLASS) || getAnnotatedItem().isAnnotationPresent(ejbApiAbstraction.EJB_ANNOTATION_CLASS)) || getAnnotatedItem().isAnnotationPresent(wsApiAbstraction.WEB_SERVICE_REF_ANNOTATION_CLASS))
{
throw new IllegalStateException("Tried to create an EEResourceProducerField, but no @Resource, @PersistenceContext, @PersistenceUnit, @WebServiceRef or @EJB is present " + getAnnotatedItem());
More information about the weld-commits
mailing list