November 2009 - weld-commits - Jboss List Archives

Weld SVN: r4707 - in core/trunk/impl: src/main/java/org/jboss/weld and 15 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-11-05 19:13:45 -0500 (Thu, 05 Nov 2009) New Revision: 4707 Added: core/trunk/impl/src/main/java/org/jboss/weld/logging/ core/trunk/impl/src/main/java/org/jboss/weld/logging/MessageConveyorFactory.java core/trunk/impl/src/main/java/org/jboss/weld/logging/MessageId.java core/trunk/impl/src/main/java/org/jboss/weld/logging/WeldMessageConveyerFactory.java core/trunk/impl/src/main/java/org/jboss/weld/logging/WeldMessageConveyor.java core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/VersionMessage.java core/trunk/impl/src/main/resources/org/jboss/weld/messages/version_en.properties Removed: core/trunk/impl/src/main/java/org/jboss/weld/logging/IMessageConveyerFactory.java core/trunk/impl/src/main/java/org/jboss/weld/logging/Message.java core/trunk/impl/src/main/java/org/jboss/weld/logging/MessageConveyerFactoryLoader.java core/trunk/impl/src/main/java/org/jboss/weld/messages/ core/trunk/impl/src/main/java/org/jboss/weld/util/log/ Modified: core/trunk/impl/pom.xml core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/AbstractFacadeBean.java core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseBeanProxyMethodHandler.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java core/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java core/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java core/trunk/impl/src/main/java/org/jboss/weld/context/DependentInstancesStore.java core/trunk/impl/src/main/java/org/jboss/weld/context/beanstore/AbstractAttributeBackedBeanStore.java core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java core/trunk/impl/src/main/java/org/jboss/weld/conversation/ConversationEntry.java core/trunk/impl/src/main/java/org/jboss/weld/conversation/ConversationImpl.java core/trunk/impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java core/trunk/impl/src/main/java/org/jboss/weld/logging/Category.java core/trunk/impl/src/main/java/org/jboss/weld/logging/LoggerFactory.java core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanMessage.java core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BootstrapMessage.java core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ContextMessage.java core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ConversationMessage.java core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/EventMessage.java core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/JsfMessage.java core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ReflectionMessage.java core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ServletMessage.java core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/UtilMessage.java core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/AnnotationModel.java core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/ScopeModel.java core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/StereotypeModel.java core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java core/trunk/impl/src/main/java/org/jboss/weld/util/Reflections.java core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties Log: WELD-263 Modified: core/trunk/impl/pom.xml =================================================================== --- core/trunk/impl/pom.xml 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/pom.xml 2009-11-06 00:13:45 UTC (rev 4707) @@ -128,15 +128,16 @@ <configuration> <enumTypes>  - <enumType>org.jboss.weld.messages.BeanMessage</enumType> - <enumType>org.jboss.weld.messages.BootstrapMessage</enumType> - <enumType>org.jboss.weld.messages.ContextMessage</enumType> - <enumType>org.jboss.weld.messages.ConversationMessage</enumType> - <enumType>org.jboss.weld.messages.EventMessage</enumType> - <enumType>org.jboss.weld.messages.JsfMessage</enumType> - <enumType>org.jboss.weld.messages.ReflectionMessage</enumType> - <enumType>org.jboss.weld.messages.UtilMessage</enumType> - <enumType>org.jboss.weld.messages.ServletMessage</enumType> + <enumType>org.jboss.weld.logging.messages.BeanMessage</enumType> + <enumType>org.jboss.weld.logging.messages.BootstrapMessage</enumType> + <enumType>org.jboss.weld.logging.messages.ContextMessage</enumType> + <enumType>org.jboss.weld.logging.messages.ConversationMessage</enumType> + <enumType>org.jboss.weld.logging.messages.EventMessage</enumType> + <enumType>org.jboss.weld.logging.messages.JsfMessage</enumType> + <enumType>org.jboss.weld.logging.messages.ReflectionMessage</enumType> + <enumType>org.jboss.weld.logging.messages.UtilMessage</enumType> + <enumType>org.jboss.weld.logging.messages.ServletMessage</enumType> + <enumType>org.jboss.weld.logging.messages.VersionMessage</enumType> </enumTypes> </configuration> </execution> Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,14 +16,14 @@ */ package org.jboss.weld.bean; -import static org.jboss.weld.messages.BeanMessage.CREATING_BEAN; -import static org.jboss.weld.messages.BeanMessage.QUALIFIERS_USED; -import static org.jboss.weld.messages.BeanMessage.USING_DEFAULT_NAME; -import static org.jboss.weld.messages.BeanMessage.USING_DEFAULT_QUALIFIER; -import static org.jboss.weld.messages.BeanMessage.USING_NAME; -import static org.jboss.weld.messages.BeanMessage.USING_SCOPE_FROM_STEREOTYPE; -import static org.jboss.weld.util.log.Category.BEAN; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.BEAN; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.BeanMessage.CREATING_BEAN; +import static org.jboss.weld.logging.messages.BeanMessage.QUALIFIERS_USED; +import static org.jboss.weld.logging.messages.BeanMessage.USING_DEFAULT_NAME; +import static org.jboss.weld.logging.messages.BeanMessage.USING_DEFAULT_QUALIFIER; +import static org.jboss.weld.logging.messages.BeanMessage.USING_NAME; +import static org.jboss.weld.logging.messages.BeanMessage.USING_SCOPE_FROM_STEREOTYPE; import java.lang.annotation.Annotation; import java.lang.reflect.Type; Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,10 +16,10 @@ */ package org.jboss.weld.bean; -import static org.jboss.weld.messages.BeanMessage.USING_DEFAULT_SCOPE; -import static org.jboss.weld.messages.BeanMessage.USING_SCOPE; -import static org.jboss.weld.util.log.Category.BEAN; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.BEAN; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.BeanMessage.USING_DEFAULT_SCOPE; +import static org.jboss.weld.logging.messages.BeanMessage.USING_SCOPE; import java.lang.annotation.Annotation; import java.lang.reflect.Type; Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,10 +16,10 @@ */ package org.jboss.weld.bean; -import static org.jboss.weld.messages.BeanMessage.USING_DEFAULT_SCOPE; -import static org.jboss.weld.messages.BeanMessage.USING_SCOPE; -import static org.jboss.weld.util.log.Category.BEAN; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.BEAN; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.BeanMessage.USING_DEFAULT_SCOPE; +import static org.jboss.weld.logging.messages.BeanMessage.USING_SCOPE; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,9 +16,9 @@ */ package org.jboss.weld.bean; -import static org.jboss.weld.messages.BeanMessage.CIRCULAR_CALL; -import static org.jboss.weld.util.log.Category.BEAN; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.BEAN; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.BeanMessage.CIRCULAR_CALL; import java.lang.reflect.Member; Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,9 +16,10 @@ */ package org.jboss.weld.bean; -import static org.jboss.weld.messages.BeanMessage.ERROR_DESTROYING; -import static org.jboss.weld.util.log.Category.BEAN; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.BEAN; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.BeanMessage.ERROR_DESTROYING; +import static org.jboss.weld.logging.messages.BeanMessage.USER_DEFINED_DECORATOR_DISALLOWED; import java.util.ArrayList; import java.util.List; @@ -56,6 +57,8 @@ import org.slf4j.ext.XLogger; import org.slf4j.ext.XLogger.Level; +import ch.qos.cal10n.IMessageConveyor; + /** * Represents a simple bean * @@ -68,6 +71,7 @@ // Logger private static final LocLogger log = loggerFactory().getLogger(BEAN); private static final XLogger xLog = loggerFactory().getXLogger(BEAN); + private static final IMessageConveyor messageConveyer = loggerFactory().getMessageConveyor(); // The constructor private ConstructorInjectionPoint<T> constructor; @@ -143,7 +147,7 @@ return getManager().replaceOrPushCurrentInjectionPoint(outerDelegateInjectionPoint); } else { - throw new IllegalStateException("Cannot operate on user defined decorator"); + throw new IllegalStateException(messageConveyer.getMessage(USER_DEFINED_DECORATOR_DISALLOWED, decorator)); } } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/AbstractFacadeBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/AbstractFacadeBean.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/AbstractFacadeBean.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,9 +16,9 @@ */ package org.jboss.weld.bean.builtin.facade; -import static org.jboss.weld.messages.BeanMessage.DYNAMIC_LOOKUP_OF_BUILT_IN_NOT_ALLOWED; -import static org.jboss.weld.util.log.Category.BEAN; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.BEAN; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.BeanMessage.DYNAMIC_LOOKUP_OF_BUILT_IN_NOT_ALLOWED; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,9 +16,9 @@ */ package org.jboss.weld.bean.proxy; -import static org.jboss.weld.messages.BeanMessage.CALL_PROXIED_METHOD; -import static org.jboss.weld.util.log.Category.BEAN; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.BEAN; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.BeanMessage.CALL_PROXIED_METHOD; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseBeanProxyMethodHandler.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseBeanProxyMethodHandler.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseBeanProxyMethodHandler.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,10 +16,10 @@ */ package org.jboss.weld.bean.proxy; -import static org.jboss.weld.messages.BeanMessage.CALL_PROXIED_METHOD; -import static org.jboss.weld.messages.BeanMessage.CREATED_SESSION_BEAN_PROXY; -import static org.jboss.weld.util.log.Category.BEAN; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.BEAN; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.BeanMessage.CALL_PROXIED_METHOD; +import static org.jboss.weld.logging.messages.BeanMessage.CREATED_SESSION_BEAN_PROXY; import java.io.Serializable; import java.lang.reflect.Method; Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,12 +16,12 @@ */ package org.jboss.weld.bootstrap; -import static org.jboss.weld.messages.BootstrapMessage.FOUND_BEAN; -import static org.jboss.weld.messages.BootstrapMessage.FOUND_DECORATOR; -import static org.jboss.weld.messages.BootstrapMessage.FOUND_INTERCEPTOR; -import static org.jboss.weld.messages.BootstrapMessage.FOUND_OBSERVER_METHOD; -import static org.jboss.weld.util.log.Category.BOOTSTRAP; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.BOOTSTRAP; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.BootstrapMessage.FOUND_BEAN; +import static org.jboss.weld.logging.messages.BootstrapMessage.FOUND_DECORATOR; +import static org.jboss.weld.logging.messages.BootstrapMessage.FOUND_INTERCEPTOR; +import static org.jboss.weld.logging.messages.BootstrapMessage.FOUND_OBSERVER_METHOD; import java.lang.reflect.Member; import java.util.Set; Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,11 +16,11 @@ */ package org.jboss.weld.bootstrap; -import static org.jboss.weld.messages.BootstrapMessage.ENABLED_DECORATORS; -import static org.jboss.weld.messages.BootstrapMessage.ENABLED_INTERCEPTORS; -import static org.jboss.weld.messages.BootstrapMessage.ENABLED_POLICIES; -import static org.jboss.weld.util.log.Category.BOOTSTRAP; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.BOOTSTRAP; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.BootstrapMessage.ENABLED_DECORATORS; +import static org.jboss.weld.logging.messages.BootstrapMessage.ENABLED_INTERCEPTORS; +import static org.jboss.weld.logging.messages.BootstrapMessage.ENABLED_POLICIES; import org.jboss.weld.BeanManagerImpl; import org.jboss.weld.bean.builtin.DefaultValidatorBean; Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,11 +16,11 @@ */ package org.jboss.weld.bootstrap; -import static org.jboss.weld.messages.BootstrapMessage.JTA_UNAVAILABLE; -import static org.jboss.weld.messages.BootstrapMessage.VALIDATING_BEANS; -import static org.jboss.weld.messages.BootstrapMessage.VERSION; -import static org.jboss.weld.util.log.Category.BOOTSTRAP; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.BOOTSTRAP; +import static org.jboss.weld.logging.Category.VERSION; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.BootstrapMessage.JTA_UNAVAILABLE; +import static org.jboss.weld.logging.messages.BootstrapMessage.VALIDATING_BEANS; import java.net.URL; import java.util.Collection; @@ -69,6 +69,7 @@ import org.jboss.weld.ejb.EjbDescriptors; import org.jboss.weld.ejb.spi.EjbDescriptor; import org.jboss.weld.jsf.JsfApiAbstraction; +import org.jboss.weld.logging.messages.VersionMessage; import org.jboss.weld.metadata.TypeStore; import org.jboss.weld.metadata.cache.MetaAnnotationStore; import org.jboss.weld.persistence.PersistenceApiAbstraction; @@ -215,7 +216,7 @@ static { - log.info(VERSION, Names.version(WeldBootstrap.class.getPackage())); + loggerFactory().getLogger(VERSION).info(VersionMessage.VERSION, Names.version(WeldBootstrap.class.getPackage())); } // The Bean manager Modified: core/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,10 +16,10 @@ */ package org.jboss.weld.context; -import static org.jboss.weld.messages.ContextMessage.CONTEXTUAL_INSTANCE_REMOVED; -import static org.jboss.weld.messages.ContextMessage.CONTEXT_CLEARED; -import static org.jboss.weld.util.log.Category.CONTEXT; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.CONTEXT; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.ContextMessage.CONTEXTUAL_INSTANCE_REMOVED; +import static org.jboss.weld.logging.messages.ContextMessage.CONTEXT_CLEARED; import java.lang.annotation.Annotation; import java.util.concurrent.locks.ReentrantLock; Modified: core/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -22,14 +22,14 @@ */ package org.jboss.weld.context; -import static org.jboss.weld.messages.ContextMessage.APPLICATION_ENDED; -import static org.jboss.weld.messages.ContextMessage.APPLICATION_STARTED; -import static org.jboss.weld.messages.ContextMessage.REQUEST_ENDED; -import static org.jboss.weld.messages.ContextMessage.REQUEST_STARTED; -import static org.jboss.weld.messages.ContextMessage.SESSION_ENDED; -import static org.jboss.weld.messages.ContextMessage.SESSION_RESTORED; -import static org.jboss.weld.util.log.Category.CONTEXT; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.CONTEXT; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.ContextMessage.APPLICATION_ENDED; +import static org.jboss.weld.logging.messages.ContextMessage.APPLICATION_STARTED; +import static org.jboss.weld.logging.messages.ContextMessage.REQUEST_ENDED; +import static org.jboss.weld.logging.messages.ContextMessage.REQUEST_STARTED; +import static org.jboss.weld.logging.messages.ContextMessage.SESSION_ENDED; +import static org.jboss.weld.logging.messages.ContextMessage.SESSION_RESTORED; import org.jboss.weld.Container; import org.jboss.weld.bootstrap.api.Lifecycle; Modified: core/trunk/impl/src/main/java/org/jboss/weld/context/DependentInstancesStore.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/context/DependentInstancesStore.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/context/DependentInstancesStore.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,9 +16,9 @@ */ package org.jboss.weld.context; -import static org.jboss.weld.messages.ContextMessage.DEPENDENT_INSTANCE_ATTACHED; -import static org.jboss.weld.util.log.Category.CONTEXT; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.CONTEXT; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.ContextMessage.DEPENDENT_INSTANCE_ATTACHED; import java.io.Serializable; import java.util.ArrayList; Modified: core/trunk/impl/src/main/java/org/jboss/weld/context/beanstore/AbstractAttributeBackedBeanStore.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/context/beanstore/AbstractAttributeBackedBeanStore.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/context/beanstore/AbstractAttributeBackedBeanStore.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,11 +16,11 @@ */ package org.jboss.weld.context.beanstore; -import static org.jboss.weld.messages.ContextMessage.CONTEXTUAL_INSTANCE_ADDED; -import static org.jboss.weld.messages.ContextMessage.CONTEXTUAL_INSTANCE_FOUND; -import static org.jboss.weld.messages.ContextMessage.CONTEXT_CLEARED; -import static org.jboss.weld.util.log.Category.CONTEXT; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.CONTEXT; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.ContextMessage.CONTEXTUAL_INSTANCE_ADDED; +import static org.jboss.weld.logging.messages.ContextMessage.CONTEXTUAL_INSTANCE_FOUND; +import static org.jboss.weld.logging.messages.ContextMessage.CONTEXT_CLEARED; import java.util.ArrayList; import java.util.Collection; Modified: core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -22,18 +22,18 @@ */ package org.jboss.weld.conversation; -import static org.jboss.weld.messages.ConversationMessage.CLEANING_UP_CONVERSATION; -import static org.jboss.weld.messages.ConversationMessage.CONVERSATION_LOCK_UNAVAILABLE; -import static org.jboss.weld.messages.ConversationMessage.CONVERSATION_SWITCHED; -import static org.jboss.weld.messages.ConversationMessage.CONVERSATION_TERMINATION_SCHEDULED; -import static org.jboss.weld.messages.ConversationMessage.DESTROY_ALL_LRC; -import static org.jboss.weld.messages.ConversationMessage.DESTROY_LRC; -import static org.jboss.weld.messages.ConversationMessage.DESTROY_TRANSIENT_COVERSATION; -import static org.jboss.weld.messages.ConversationMessage.LRC_COUNT; -import static org.jboss.weld.messages.ConversationMessage.NO_CONVERSATION_TO_RESTORE; -import static org.jboss.weld.messages.ConversationMessage.UNABLE_TO_RESTORE_CONVERSATION; -import static org.jboss.weld.util.log.Category.CONVERSATION; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.CONVERSATION; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.ConversationMessage.CLEANING_UP_CONVERSATION; +import static org.jboss.weld.logging.messages.ConversationMessage.CONVERSATION_LOCK_UNAVAILABLE; +import static org.jboss.weld.logging.messages.ConversationMessage.CONVERSATION_SWITCHED; +import static org.jboss.weld.logging.messages.ConversationMessage.CONVERSATION_TERMINATION_SCHEDULED; +import static org.jboss.weld.logging.messages.ConversationMessage.DESTROY_ALL_LRC; +import static org.jboss.weld.logging.messages.ConversationMessage.DESTROY_LRC; +import static org.jboss.weld.logging.messages.ConversationMessage.DESTROY_TRANSIENT_COVERSATION; +import static org.jboss.weld.logging.messages.ConversationMessage.LRC_COUNT; +import static org.jboss.weld.logging.messages.ConversationMessage.NO_CONVERSATION_TO_RESTORE; +import static org.jboss.weld.logging.messages.ConversationMessage.UNABLE_TO_RESTORE_CONVERSATION; import java.util.Collections; import java.util.HashSet; Modified: core/trunk/impl/src/main/java/org/jboss/weld/conversation/ConversationEntry.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/conversation/ConversationEntry.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/conversation/ConversationEntry.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,14 +16,14 @@ */ package org.jboss.weld.conversation; -import static org.jboss.weld.messages.ConversationMessage.CONVERSATION_LOCKED; -import static org.jboss.weld.messages.ConversationMessage.CONVERSATION_TERMINATION_CANCELLATION_FAILED; -import static org.jboss.weld.messages.ConversationMessage.CONVERSATION_TERMINATION_CANCELLED; -import static org.jboss.weld.messages.ConversationMessage.CONVERSATION_UNAVAILBLE; -import static org.jboss.weld.messages.ConversationMessage.CONVERSATION_UNLOCKED; -import static org.jboss.weld.messages.ConversationMessage.ILLEGAL_CONVERSATION_UNLOCK_ATTEMPT; -import static org.jboss.weld.util.log.Category.CONVERSATION; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.CONVERSATION; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.ConversationMessage.CONVERSATION_LOCKED; +import static org.jboss.weld.logging.messages.ConversationMessage.CONVERSATION_TERMINATION_CANCELLATION_FAILED; +import static org.jboss.weld.logging.messages.ConversationMessage.CONVERSATION_TERMINATION_CANCELLED; +import static org.jboss.weld.logging.messages.ConversationMessage.CONVERSATION_UNAVAILBLE; +import static org.jboss.weld.logging.messages.ConversationMessage.CONVERSATION_UNLOCKED; +import static org.jboss.weld.logging.messages.ConversationMessage.ILLEGAL_CONVERSATION_UNLOCK_ATTEMPT; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; Modified: core/trunk/impl/src/main/java/org/jboss/weld/conversation/ConversationImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/conversation/ConversationImpl.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/conversation/ConversationImpl.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,11 +16,11 @@ */ package org.jboss.weld.conversation; -import static org.jboss.weld.messages.ConversationMessage.DEMOTED_LRC; -import static org.jboss.weld.messages.ConversationMessage.PROMOTED_TRANSIENT; -import static org.jboss.weld.messages.ConversationMessage.SWITCHED_CONVERSATION; -import static org.jboss.weld.util.log.Category.CONVERSATION; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.CONVERSATION; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.ConversationMessage.DEMOTED_LRC; +import static org.jboss.weld.logging.messages.ConversationMessage.PROMOTED_TRANSIENT; +import static org.jboss.weld.logging.messages.ConversationMessage.SWITCHED_CONVERSATION; import java.io.Serializable; Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,10 +16,10 @@ */ package org.jboss.weld.event; -import static org.jboss.weld.messages.EventMessage.ASYNC_FIRE; -import static org.jboss.weld.messages.EventMessage.ASYNC_OBSERVER_FAILURE; -import static org.jboss.weld.util.log.Category.EVENT; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.EVENT; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.EventMessage.ASYNC_FIRE; +import static org.jboss.weld.logging.messages.EventMessage.ASYNC_OBSERVER_FAILURE; import org.jboss.weld.Container; import org.jboss.weld.bootstrap.api.Lifecycle; Modified: core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,10 +16,10 @@ */ package org.jboss.weld.jsf; -import static org.jboss.weld.messages.JsfMessage.FOUND_CONVERSATION_FROM_REQUEST; -import static org.jboss.weld.messages.JsfMessage.RESUMING_CONVERSATION; -import static org.jboss.weld.util.log.Category.JSF; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.JSF; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.JsfMessage.FOUND_CONVERSATION_FROM_REQUEST; +import static org.jboss.weld.logging.messages.JsfMessage.RESUMING_CONVERSATION; import javax.enterprise.util.AnnotationLiteral; import javax.faces.context.FacesContext; Modified: core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -25,11 +25,11 @@ import static org.jboss.weld.jsf.JsfHelper.getConversationId; import static org.jboss.weld.jsf.JsfHelper.getHttpSession; import static org.jboss.weld.jsf.JsfHelper.getModuleBeanManager; -import static org.jboss.weld.messages.JsfMessage.CLEANING_UP_CONVERSATION; -import static org.jboss.weld.messages.JsfMessage.INITIATING_CONVERSATION; -import static org.jboss.weld.messages.JsfMessage.SKIPPING_CLEANING_UP_CONVERSATION; -import static org.jboss.weld.util.log.Category.JSF; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.JSF; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.JsfMessage.CLEANING_UP_CONVERSATION; +import static org.jboss.weld.logging.messages.JsfMessage.INITIATING_CONVERSATION; +import static org.jboss.weld.logging.messages.JsfMessage.SKIPPING_CLEANING_UP_CONVERSATION; import javax.faces.context.FacesContext; import javax.faces.event.PhaseEvent; Copied: core/trunk/impl/src/main/java/org/jboss/weld/logging (from rev 4699, core/trunk/impl/src/main/java/org/jboss/weld/util/log) Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/Category.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/log/Category.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/Category.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -1,9 +1,10 @@ -package org.jboss.weld.util.log; +package org.jboss.weld.logging; public enum Category { BOOTSTRAP("Bootstrap"), + VERSION("Version"), UTIL("Utilities"), BEAN("Bean"), SERVLET("Servlet"), Deleted: core/trunk/impl/src/main/java/org/jboss/weld/logging/IMessageConveyerFactory.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/log/IMessageConveyerFactory.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/IMessageConveyerFactory.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -1,26 +0,0 @@ -package org.jboss.weld.util.log; - -import java.util.Locale; - -import ch.qos.cal10n.IMessageConveyor; - -public interface IMessageConveyerFactory -{ - - /** - * Get the message conveyer for the default locale. - * - * By default, Locale.getDefault() will be used as the locale, but a custom - * implementation of MessageConveyerFactory may choose to use an alternative - * locale. - * - */ - public abstract IMessageConveyor getDefaultMessageConveyer(); - - /** - * Get the message conveyer for the given locale. - * - */ - public abstract IMessageConveyor getMessageConveyer(Locale locale); - -} \ No newline at end of file Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/LoggerFactory.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/log/LoggerFactory.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/LoggerFactory.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -1,4 +1,4 @@ -package org.jboss.weld.util.log; +package org.jboss.weld.logging; import org.slf4j.cal10n.LocLogger; import org.slf4j.cal10n.LocLoggerFactory; @@ -10,13 +10,14 @@ public class LoggerFactory { - private static LoggerFactory INSTANCE = new LoggerFactory(); + private static LoggerFactory INSTANCE = new LoggerFactory("WELD"); private final LocLoggerFactory locLoggerFactory; + private final IMessageConveyor messageConveyor; - private LoggerFactory() + private LoggerFactory(String subsystem) { - IMessageConveyor messageConveyor = new MessageConveyerFactoryLoader().getMessageConveyerFactory().getDefaultMessageConveyer(); + this.messageConveyor = MessageConveyorFactory.messageConveyerFactory().getDefaultMessageConveyer(subsystem); this.locLoggerFactory = new LocLoggerFactory(messageConveyor); } @@ -34,4 +35,10 @@ { return INSTANCE; } + + public IMessageConveyor getMessageConveyor() + { + return messageConveyor; + } + } Deleted: core/trunk/impl/src/main/java/org/jboss/weld/logging/Message.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/log/Message.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/Message.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -1,8 +0,0 @@ -package org.jboss.weld.util.log; - -public interface Message -{ - - public String getErrorId(); - -} Deleted: core/trunk/impl/src/main/java/org/jboss/weld/logging/MessageConveyerFactoryLoader.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/log/MessageConveyerFactoryLoader.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/MessageConveyerFactoryLoader.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -1,70 +0,0 @@ -package org.jboss.weld.util.log; - -import java.util.Locale; - -import org.jboss.weld.util.serviceProvider.DefaultServiceLoader; - -import ch.qos.cal10n.IMessageConveyor; -import ch.qos.cal10n.MessageConveyor; - -/** - * A factory for message conveyers, that looks for service providers which will - * convey a message. - * - * If none are found, the default {@link MessageConveyor} is used. - * - * @author pmuir - * - */ -public class MessageConveyerFactoryLoader -{ - - private static IMessageConveyerFactory load() - { - DefaultServiceLoader<IMessageConveyerFactory> serviceLoader = DefaultServiceLoader.load(IMessageConveyerFactory.class); - int i = 0; - for (IMessageConveyerFactory f : serviceLoader) - { - if (i > 0) - { - throw new IllegalStateException("Maximum one service provider for IMessageConveyerFactory allowed, got " + serviceLoader); - } - return f; - } - return new DefaultMessageConveyerFactory(); - } - - private static class DefaultMessageConveyerFactory implements IMessageConveyerFactory - { - private final IMessageConveyor defaultMessageConveyer; - - public DefaultMessageConveyerFactory() - { - this.defaultMessageConveyer = new MessageConveyor(Locale.ENGLISH); - } - - public IMessageConveyor getDefaultMessageConveyer() - { - return defaultMessageConveyer; - } - - public IMessageConveyor getMessageConveyer(Locale locale) - { - return new MessageConveyor(locale); - } - - } - - private IMessageConveyerFactory factory; - - public MessageConveyerFactoryLoader() - { - this.factory = load(); - } - - public IMessageConveyerFactory getMessageConveyerFactory() - { - return factory; - } - -} Added: core/trunk/impl/src/main/java/org/jboss/weld/logging/MessageConveyorFactory.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/logging/MessageConveyorFactory.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/MessageConveyorFactory.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -0,0 +1,56 @@ +package org.jboss.weld.logging; + +import java.util.Locale; + +import org.jboss.weld.util.serviceProvider.DefaultServiceLoader; + +import ch.qos.cal10n.IMessageConveyor; + +public abstract class MessageConveyorFactory +{ + + private static MessageConveyorFactory INSTANCE = load(); + + private static MessageConveyorFactory load() + { + DefaultServiceLoader<MessageConveyorFactory> serviceLoader = DefaultServiceLoader.load(MessageConveyorFactory.class); + int i = 0; + for (MessageConveyorFactory f : serviceLoader) + { + if (i > 0) + { + throw new IllegalStateException("Maximum one service provider for IMessageConveyerFactory allowed, got " + serviceLoader); + } + return f; + } + // Return the default + return new WeldMessageConveyerFactory(); + } + + public static MessageConveyorFactory messageConveyerFactory() + { + return INSTANCE; + } + + public static IMessageConveyor defaultMessageConveyer(String subsystem) + { + return messageConveyerFactory().getDefaultMessageConveyer(subsystem); + } + + /** + * Get the message conveyer for the default locale. + * + * By default, Locale.getDefault() will be used as the locale, but a custom + * implementation of MessageConveyerFactory may choose to use an alternative + * locale. + * + */ + public abstract IMessageConveyor getDefaultMessageConveyer(String subsystem); + + /** + * Get the message conveyer for the given locale. + * + */ + public abstract IMessageConveyor getMessageConveyer(Locale locale, String subsystem); + +} \ No newline at end of file Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/logging/MessageConveyorFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: core/trunk/impl/src/main/java/org/jboss/weld/logging/MessageId.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/logging/MessageId.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/MessageId.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -0,0 +1,19 @@ +package org.jboss.weld.logging; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +@Retention(RUNTIME) +@Target(FIELD) +public @interface MessageId +{ + + /** + * The message id + */ + String value(); + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/logging/MessageId.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: core/trunk/impl/src/main/java/org/jboss/weld/logging/WeldMessageConveyerFactory.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/logging/WeldMessageConveyerFactory.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/WeldMessageConveyerFactory.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -0,0 +1,25 @@ +/** + * + */ +package org.jboss.weld.logging; + +import java.util.Locale; + +import ch.qos.cal10n.IMessageConveyor; + +class WeldMessageConveyerFactory extends MessageConveyorFactory +{ + + @Override + public IMessageConveyor getDefaultMessageConveyer(String subsystem) + { + return new WeldMessageConveyor(Locale.ENGLISH, subsystem); + } + + @Override + public IMessageConveyor getMessageConveyer(Locale locale, String subsystem) + { + return new WeldMessageConveyor(locale, subsystem); + } + +} \ No newline at end of file Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/logging/WeldMessageConveyerFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: core/trunk/impl/src/main/java/org/jboss/weld/logging/WeldMessageConveyor.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/logging/WeldMessageConveyor.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/WeldMessageConveyor.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -0,0 +1,52 @@ +package org.jboss.weld.logging; + +import java.lang.reflect.Field; +import java.util.Locale; +import java.util.concurrent.Callable; + +import org.jboss.weld.util.collections.ConcurrentCache; + +import ch.qos.cal10n.MessageConveyor; +import ch.qos.cal10n.MessageConveyorException; + +public class WeldMessageConveyor extends MessageConveyor +{ + + private static final String SEPARATOR = "-"; + private final String subsystem; + + private final ConcurrentCache<Enum<?>, String> messagePrefixCache; + + public WeldMessageConveyor(Locale locale, String subsystem) + { + super(locale); + this.subsystem = subsystem; + this.messagePrefixCache = new ConcurrentCache<Enum<?>, String>(); + } + + @Override + public <E extends Enum<?>> String getMessage(E key, Object... args) throws MessageConveyorException + { + return new StringBuilder().append(getMessagePrefix(key)).append(super.getMessage(key, args)).toString(); + } + + private <E extends Enum<?>> String getMessagePrefix(final E key) + { + return messagePrefixCache.putIfAbsent(key, new Callable<String>() + { + + public String call() throws Exception + { + Field field = key.getClass().getField(key.name()); + if (!field.isAnnotationPresent(MessageId.class)) + { + throw new IllegalArgumentException("@MessageId must be present. Key: " + key + "; Key Type: " + key.getClass()); + } + String messageId = field.getAnnotation(MessageId.class).value(); + return new StringBuilder().append(subsystem).append(SEPARATOR).append(messageId).append(" ").toString(); + } + + }); + } + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/logging/WeldMessageConveyor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Copied: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages (from rev 4699, core/trunk/impl/src/main/java/org/jboss/weld/messages) Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanMessage.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/BeanMessage.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanMessage.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -1,5 +1,7 @@ -package org.jboss.weld.messages; +package org.jboss.weld.logging.messages; +import org.jboss.weld.logging.MessageId; + import ch.qos.cal10n.BaseName; import ch.qos.cal10n.Locale; import ch.qos.cal10n.LocaleData; @@ -8,28 +10,34 @@ @LocaleData({ @Locale("en") }) +/** + * Log messages for Beans. + * + * Message IDs: 000000 - 000099 + * + */ public enum BeanMessage { - - FOUND_INJECTABLE_CONSTRUCTORS, - FOUND_ONE_INJECTABLE_CONSTRUCTOR, - FOUND_DEFAULT_CONSTRUCTOR, - FOUND_POST_CONSTRUCT_METHODS, - FOUND_ONE_POST_CONSTRUCT_METHOD, - FOUND_PRE_DESTROY_METHODS, - FOUND_ONE_PRE_DESTROY_METHOD, - CREATED_SESSION_BEAN_PROXY, - CALL_PROXIED_METHOD, - DYNAMIC_LOOKUP_OF_BUILT_IN_NOT_ALLOWED, - QUALIFIERS_USED, - USING_DEFAULT_QUALIFIER, - CREATING_BEAN, - USING_DEFAULT_NAME, - USING_NAME, - USING_SCOPE_FROM_STEREOTYPE, - USING_SCOPE, - USING_DEFAULT_SCOPE, - CIRCULAR_CALL, - ERROR_DESTROYING + @MessageId("000000") FOUND_INJECTABLE_CONSTRUCTORS, + @MessageId("000001") FOUND_ONE_INJECTABLE_CONSTRUCTOR, + @MessageId("000002") FOUND_DEFAULT_CONSTRUCTOR, + @MessageId("000003") FOUND_POST_CONSTRUCT_METHODS, + @MessageId("000004") FOUND_ONE_POST_CONSTRUCT_METHOD, + @MessageId("000005") FOUND_PRE_DESTROY_METHODS, + @MessageId("000006") FOUND_ONE_PRE_DESTROY_METHOD, + @MessageId("000007") CREATED_SESSION_BEAN_PROXY, + @MessageId("000008") CALL_PROXIED_METHOD, + @MessageId("000009") DYNAMIC_LOOKUP_OF_BUILT_IN_NOT_ALLOWED, + @MessageId("000010") QUALIFIERS_USED, + @MessageId("000011") USING_DEFAULT_QUALIFIER, + @MessageId("000012") CREATING_BEAN, + @MessageId("000013") USING_DEFAULT_NAME, + @MessageId("000014") USING_NAME, + @MessageId("000015") USING_SCOPE_FROM_STEREOTYPE, + @MessageId("000016") USING_SCOPE, + @MessageId("000017") USING_DEFAULT_SCOPE, + @MessageId("000018") CIRCULAR_CALL, + @MessageId("000019") ERROR_DESTROYING, + @MessageId("000020") USER_DEFINED_DECORATOR_DISALLOWED } Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BootstrapMessage.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/BootstrapMessage.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BootstrapMessage.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -1,25 +1,32 @@ -package org.jboss.weld.messages; +package org.jboss.weld.logging.messages; +import org.jboss.weld.logging.MessageId; + import ch.qos.cal10n.BaseName; import ch.qos.cal10n.Locale; import ch.qos.cal10n.LocaleData; -@BaseName("org.jboss.weld.messages.bootstrap") +@BaseName("org.jboss.weld.messages.bootstrap") @LocaleData({ - @Locale("en") + @Locale("en") }) +/** + * Log messages for bootstrap + * + * Message Ids: 000100 - 000199 + * + */ public enum BootstrapMessage { - VALIDATING_BEANS, - JTA_UNAVAILABLE, - VERSION, - ENABLED_POLICIES, - ENABLED_DECORATORS, - ENABLED_INTERCEPTORS, - FOUND_BEAN, - FOUND_INTERCEPTOR, - FOUND_DECORATOR, - FOUND_OBSERVER_METHOD, + @MessageId("000100") VALIDATING_BEANS, + @MessageId("000101") JTA_UNAVAILABLE, + @MessageId("000103") ENABLED_POLICIES, + @MessageId("000104") ENABLED_DECORATORS, + @MessageId("000105") ENABLED_INTERCEPTORS, + @MessageId("000106") FOUND_BEAN, + @MessageId("000107") FOUND_INTERCEPTOR, + @MessageId("000108") FOUND_DECORATOR, + @MessageId("000109") FOUND_OBSERVER_METHOD; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ContextMessage.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/ContextMessage.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ContextMessage.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -1,26 +1,33 @@ -package org.jboss.weld.messages; +package org.jboss.weld.logging.messages; +import org.jboss.weld.logging.MessageId; + import ch.qos.cal10n.BaseName; import ch.qos.cal10n.Locale; import ch.qos.cal10n.LocaleData; -@BaseName("org.jboss.weld.messages.context") +@BaseName("org.jboss.weld.messages.context") @LocaleData({ - @Locale("en") + @Locale("en") }) +/** + * Log messages for Contexts + * + * Message Ids: 000200 - 000299 + */ public enum ContextMessage { - CONTEXTUAL_INSTANCE_FOUND, - CONTEXT_CLEARED, - CONTEXTUAL_INSTANCE_ADDED, - CONTEXTUAL_INSTANCE_REMOVED, - SESSION_RESTORED, - SESSION_ENDED, - REQUEST_STARTED, - REQUEST_ENDED, - APPLICATION_STARTED, - APPLICATION_ENDED, - DEPENDENT_INSTANCE_ATTACHED + @MessageId("000200") CONTEXTUAL_INSTANCE_FOUND, + @MessageId("000201") CONTEXT_CLEARED, + @MessageId("000202") CONTEXTUAL_INSTANCE_ADDED, + @MessageId("000203") CONTEXTUAL_INSTANCE_REMOVED, + @MessageId("000204") SESSION_RESTORED, + @MessageId("000205") SESSION_ENDED, + @MessageId("000206") REQUEST_STARTED, + @MessageId("000207") REQUEST_ENDED, + @MessageId("000208") APPLICATION_STARTED, + @MessageId("000209") APPLICATION_ENDED, + @MessageId("000210") DEPENDENT_INSTANCE_ATTACHED; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ConversationMessage.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/ConversationMessage.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ConversationMessage.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -1,35 +1,43 @@ -package org.jboss.weld.messages; +package org.jboss.weld.logging.messages; +import org.jboss.weld.logging.MessageId; + import ch.qos.cal10n.BaseName; import ch.qos.cal10n.Locale; import ch.qos.cal10n.LocaleData; -@BaseName("org.jboss.weld.messages.conversation") +@BaseName("org.jboss.weld.messages.conversation") @LocaleData({ - @Locale("en") + @Locale("en") }) +/** + * Log messages for conversations + * + * Message Ids: 000300 - 000399 + * + */ public enum ConversationMessage { - NO_CONVERSATION_TO_RESTORE, - UNABLE_TO_RESTORE_CONVERSATION, - CONVERSATION_LOCK_UNAVAILABLE, - CONVERSATION_SWITCHED, - CLEANING_UP_CONVERSATION, - CONVERSATION_TERMINATION_SCHEDULED, - CONVERSATION_TERMINATION_CANCELLED, - CONVERSATION_TERMINATION_CANCELLATION_FAILED, - DESTROY_LRC_COMPLETE, - LRC_COUNT, - DESTROY_TRANSIENT_COVERSATION, - DESTROY_LRC, - DESTROY_ALL_LRC, - CONVERSATION_LOCKED, - CONVERSATION_UNLOCKED, - CONVERSATION_UNAVAILBLE, - ILLEGAL_CONVERSATION_UNLOCK_ATTEMPT, - PROMOTED_TRANSIENT, - DEMOTED_LRC, - SWITCHED_CONVERSATION + @MessageId("000300") NO_CONVERSATION_TO_RESTORE, + @MessageId("000301") UNABLE_TO_RESTORE_CONVERSATION, + @MessageId("000302") CONVERSATION_LOCK_UNAVAILABLE, + @MessageId("000303") CONVERSATION_SWITCHED, + @MessageId("000304") CLEANING_UP_CONVERSATION, + @MessageId("000305") CONVERSATION_TERMINATION_SCHEDULED, + @MessageId("000306") CONVERSATION_TERMINATION_CANCELLED, + @MessageId("000307") CONVERSATION_TERMINATION_CANCELLATION_FAILED, + @MessageId("000308") DESTROY_LRC_COMPLETE, + @MessageId("000309") LRC_COUNT, + @MessageId("000310") DESTROY_TRANSIENT_COVERSATION, + @MessageId("000311") DESTROY_LRC, + @MessageId("000312") DESTROY_ALL_LRC, + @MessageId("000313") CONVERSATION_LOCKED, + @MessageId("000314") CONVERSATION_UNLOCKED, + @MessageId("000315") CONVERSATION_UNAVAILBLE, + @MessageId("000316") ILLEGAL_CONVERSATION_UNLOCK_ATTEMPT, + @MessageId("000317") PROMOTED_TRANSIENT, + @MessageId("000318") DEMOTED_LRC, + @MessageId("000319") SWITCHED_CONVERSATION; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/EventMessage.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/EventMessage.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/EventMessage.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -1,5 +1,7 @@ -package org.jboss.weld.messages; +package org.jboss.weld.logging.messages; +import org.jboss.weld.logging.MessageId; + import ch.qos.cal10n.BaseName; import ch.qos.cal10n.Locale; import ch.qos.cal10n.LocaleData; @@ -8,11 +10,16 @@ @LocaleData({ @Locale("en") }) +/** + * Log messages for events + * + * Message ids: 000400 - 000499 + */ public enum EventMessage { - ASYNC_FIRE, - ASYNC_OBSERVER_FAILURE, - ASYNC_TX_FIRE + @MessageId("000400") ASYNC_FIRE, + @MessageId("000401") ASYNC_OBSERVER_FAILURE, + @MessageId("000402") ASYNC_TX_FIRE; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/JsfMessage.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/JsfMessage.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/JsfMessage.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -1,20 +1,27 @@ -package org.jboss.weld.messages; +package org.jboss.weld.logging.messages; +import org.jboss.weld.logging.MessageId; + import ch.qos.cal10n.BaseName; import ch.qos.cal10n.Locale; import ch.qos.cal10n.LocaleData; -@BaseName("org.jboss.weld.messages.jsf") +@BaseName("org.jboss.weld.messages.jsf") @LocaleData({ - @Locale("en") + @Locale("en") }) +/** + * Log messages for JSF integration + * + * Message Ids: 000500 - 000599 + */ public enum JsfMessage { - CLEANING_UP_CONVERSATION, - SKIPPING_CLEANING_UP_CONVERSATION, - INITIATING_CONVERSATION, - FOUND_CONVERSATION_FROM_REQUEST, - RESUMING_CONVERSATION + @MessageId("000500") CLEANING_UP_CONVERSATION, + @MessageId("000501") SKIPPING_CLEANING_UP_CONVERSATION, + @MessageId("000502") INITIATING_CONVERSATION, + @MessageId("000503") FOUND_CONVERSATION_FROM_REQUEST, + @MessageId("000504") RESUMING_CONVERSATION; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ReflectionMessage.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/ReflectionMessage.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ReflectionMessage.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -1,21 +1,29 @@ -package org.jboss.weld.messages; +package org.jboss.weld.logging.messages; +import org.jboss.weld.logging.MessageId; + import ch.qos.cal10n.BaseName; import ch.qos.cal10n.Locale; import ch.qos.cal10n.LocaleData; -@BaseName("org.jboss.weld.messages.reflection") +@BaseName("org.jboss.weld.messages.reflection") @LocaleData({ - @Locale("en") + @Locale("en") }) +/** + * Log messages relating to reflection + * + * Message ids: 000600 - 000699 + * + */ public enum ReflectionMessage { - MISSING_RETENTION, - MISSING_TARGET, - MISSING_TARGET_TYPE_METHOD_OR_TARGET_TYPE, - TARGET_TYPE_METHOD_INHERITS_FROM_TARGET_TYPE, - MISSING_TARGET_METHOD_FIELD_TYPE, - MISSING_TARGET_METHOD_FIELD_TYPE_PARAMETER_OR_TARGET_METHOD_TYPE_OR_TARGET_METHOD_OR_TARGET_TYPE_OR_TARGET_FIELD + @MessageId("000600") MISSING_RETENTION, + @MessageId("000601") MISSING_TARGET, + @MessageId("000602") MISSING_TARGET_TYPE_METHOD_OR_TARGET_TYPE, + @MessageId("000603") TARGET_TYPE_METHOD_INHERITS_FROM_TARGET_TYPE, + @MessageId("000604") MISSING_TARGET_METHOD_FIELD_TYPE, + @MessageId("000605") MISSING_TARGET_METHOD_FIELD_TYPE_PARAMETER_OR_TARGET_METHOD_TYPE_OR_TARGET_METHOD_OR_TARGET_TYPE_OR_TARGET_FIELD; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ServletMessage.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/ServletMessage.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ServletMessage.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -1,5 +1,7 @@ -package org.jboss.weld.messages; +package org.jboss.weld.logging.messages; +import org.jboss.weld.logging.MessageId; + import ch.qos.cal10n.BaseName; import ch.qos.cal10n.Locale; import ch.qos.cal10n.LocaleData; @@ -8,9 +10,14 @@ @LocaleData({ @Locale("en") }) +/** + * Error messages relating to Servlet integration + * + * Message ids: 000700 - 000799 + */ public enum ServletMessage { - NOT_STARTING + @MessageId("000700") NOT_STARTING; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/UtilMessage.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/UtilMessage.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/UtilMessage.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -1,5 +1,7 @@ -package org.jboss.weld.messages; +package org.jboss.weld.logging.messages; +import org.jboss.weld.logging.MessageId; + import ch.qos.cal10n.BaseName; import ch.qos.cal10n.Locale; import ch.qos.cal10n.LocaleData; @@ -8,10 +10,17 @@ @LocaleData({ @Locale("en") }) +/** + * Error messages relating to utility classes + * + * TODO maybe remove this, I'm not sure users care what we count a utility PLM + * + * Message ids: 000800 - 000899 + */ public enum UtilMessage { - SERVICE_LOADER_LOADING_ERROR, - SECURITY_EXCEPTION_SCANNING + @MessageId("000800") SERVICE_LOADER_LOADING_ERROR, + @MessageId("000801") SECURITY_EXCEPTION_SCANNING; } Added: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/VersionMessage.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/VersionMessage.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/VersionMessage.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -0,0 +1,24 @@ +package org.jboss.weld.logging.messages; + +import org.jboss.weld.logging.MessageId; + +import ch.qos.cal10n.BaseName; +import ch.qos.cal10n.Locale; +import ch.qos.cal10n.LocaleData; + +@BaseName("org.jboss.weld.messages.version") +@LocaleData({ + @Locale("en") +}) +/** + * Log messages for bootstrap + * + * Message Ids: 000900 - 000999 + * + */ +public enum VersionMessage +{ + + @MessageId("000900") VERSION, + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/VersionMessage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/AnnotationModel.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/AnnotationModel.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/AnnotationModel.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,9 +16,9 @@ */ package org.jboss.weld.metadata.cache; -import static org.jboss.weld.messages.ReflectionMessage.MISSING_RETENTION; -import static org.jboss.weld.util.log.Category.REFLECTION; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.REFLECTION; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.ReflectionMessage.MISSING_RETENTION; import java.lang.annotation.Annotation; import java.lang.annotation.Retention; Modified: core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -17,11 +17,11 @@ package org.jboss.weld.metadata.cache; -import static org.jboss.weld.messages.ReflectionMessage.MISSING_TARGET; -import static org.jboss.weld.messages.ReflectionMessage.MISSING_TARGET_TYPE_METHOD_OR_TARGET_TYPE; -import static org.jboss.weld.messages.ReflectionMessage.TARGET_TYPE_METHOD_INHERITS_FROM_TARGET_TYPE; -import static org.jboss.weld.util.log.Category.REFLECTION; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.REFLECTION; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.ReflectionMessage.MISSING_TARGET; +import static org.jboss.weld.logging.messages.ReflectionMessage.MISSING_TARGET_TYPE_METHOD_OR_TARGET_TYPE; +import static org.jboss.weld.logging.messages.ReflectionMessage.TARGET_TYPE_METHOD_INHERITS_FROM_TARGET_TYPE; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; Modified: core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/ScopeModel.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/ScopeModel.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/ScopeModel.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -19,10 +19,10 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; -import static org.jboss.weld.messages.ReflectionMessage.MISSING_TARGET; -import static org.jboss.weld.messages.ReflectionMessage.MISSING_TARGET_METHOD_FIELD_TYPE; -import static org.jboss.weld.util.log.Category.REFLECTION; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.REFLECTION; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.ReflectionMessage.MISSING_TARGET; +import static org.jboss.weld.logging.messages.ReflectionMessage.MISSING_TARGET_METHOD_FIELD_TYPE; import java.lang.annotation.Annotation; import java.lang.annotation.Target; Modified: core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/StereotypeModel.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/StereotypeModel.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/StereotypeModel.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -19,10 +19,10 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; -import static org.jboss.weld.messages.ReflectionMessage.MISSING_TARGET; -import static org.jboss.weld.messages.ReflectionMessage.MISSING_TARGET_METHOD_FIELD_TYPE_PARAMETER_OR_TARGET_METHOD_TYPE_OR_TARGET_METHOD_OR_TARGET_TYPE_OR_TARGET_FIELD; -import static org.jboss.weld.util.log.Category.REFLECTION; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.REFLECTION; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.ReflectionMessage.MISSING_TARGET; +import static org.jboss.weld.logging.messages.ReflectionMessage.MISSING_TARGET_METHOD_FIELD_TYPE_PARAMETER_OR_TARGET_METHOD_TYPE_OR_TARGET_METHOD_OR_TARGET_TYPE_OR_TARGET_FIELD; import java.lang.annotation.Annotation; import java.lang.annotation.Target; Modified: core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -22,9 +22,9 @@ */ package org.jboss.weld.servlet; -import static org.jboss.weld.messages.ServletMessage.NOT_STARTING; -import static org.jboss.weld.util.log.Category.SERVLET; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.SERVLET; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.ServletMessage.NOT_STARTING; import javax.enterprise.inject.spi.BeanManager; import javax.servlet.ServletContext; Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,15 +16,15 @@ */ package org.jboss.weld.util; -import static org.jboss.weld.messages.BeanMessage.FOUND_DEFAULT_CONSTRUCTOR; -import static org.jboss.weld.messages.BeanMessage.FOUND_INJECTABLE_CONSTRUCTORS; -import static org.jboss.weld.messages.BeanMessage.FOUND_ONE_INJECTABLE_CONSTRUCTOR; -import static org.jboss.weld.messages.BeanMessage.FOUND_ONE_POST_CONSTRUCT_METHOD; -import static org.jboss.weld.messages.BeanMessage.FOUND_ONE_PRE_DESTROY_METHOD; -import static org.jboss.weld.messages.BeanMessage.FOUND_POST_CONSTRUCT_METHODS; -import static org.jboss.weld.messages.BeanMessage.FOUND_PRE_DESTROY_METHODS; -import static org.jboss.weld.util.log.Category.BEAN; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.BEAN; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.BeanMessage.FOUND_DEFAULT_CONSTRUCTOR; +import static org.jboss.weld.logging.messages.BeanMessage.FOUND_INJECTABLE_CONSTRUCTORS; +import static org.jboss.weld.logging.messages.BeanMessage.FOUND_ONE_INJECTABLE_CONSTRUCTOR; +import static org.jboss.weld.logging.messages.BeanMessage.FOUND_ONE_POST_CONSTRUCT_METHOD; +import static org.jboss.weld.logging.messages.BeanMessage.FOUND_ONE_PRE_DESTROY_METHOD; +import static org.jboss.weld.logging.messages.BeanMessage.FOUND_POST_CONSTRUCT_METHODS; +import static org.jboss.weld.logging.messages.BeanMessage.FOUND_PRE_DESTROY_METHODS; import java.lang.annotation.Annotation; import java.lang.reflect.Type; Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Reflections.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/Reflections.java 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/java/org/jboss/weld/util/Reflections.java 2009-11-06 00:13:45 UTC (rev 4707) @@ -16,9 +16,9 @@ */ package org.jboss.weld.util; -import static org.jboss.weld.messages.UtilMessage.SECURITY_EXCEPTION_SCANNING; -import static org.jboss.weld.util.log.Category.UTIL; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.Category.UTIL; +import static org.jboss.weld.logging.LoggerFactory.loggerFactory; +import static org.jboss.weld.logging.messages.UtilMessage.SECURITY_EXCEPTION_SCANNING; import java.beans.Introspector; import java.io.Serializable; Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties =================================================================== --- core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties 2009-11-06 00:13:45 UTC (rev 4707) @@ -18,3 +18,4 @@ USING_DEFAULT_SCOPE=Using default @Dependent scope for {0} CIRCULAR_CALL=Executing producer field or method {0} on incomplete declaring bean {1} due to circular injection ERROR_DESTROYING=Error destroying an instance {0} of {1} +USER_DEFINED_DECORATOR_DISALLOWED=Weld does not currently support user defined decorators. Decorator: {0} Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties =================================================================== --- core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties 2009-11-05 22:34:08 UTC (rev 4706) +++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties 2009-11-06 00:13:45 UTC (rev 4707) @@ -1,10 +1,9 @@ VALIDATING_BEANS=Weld initialized. Validating beans JTA_UNAVAILABLE=Transactional services not available. Injection of @Current UserTransaction not available. Transactional observers will be invoked synchronously. -VERSION=Weld {0} ENABLED_POLICIES=Enabled policies for {0}: {1} {2} ENABLED_DECORATORS=Enabled decorator types for {0}: {1} ENABLED_INTERCEPTORS=Enabled interceptor types for {0}: {1} FOUND_BEAN=Bean: {0} FOUND_INTERCEPTOR=Interceptor: {0} FOUND_DECORATOR=Decorator: {0} -FOUND_OBSERVER_METHOD=ObserverMethod: {0} +FOUND_OBSERVER_METHOD=ObserverMethod\: {0} Added: core/trunk/impl/src/main/resources/org/jboss/weld/messages/version_en.properties =================================================================== --- core/trunk/impl/src/main/resources/org/jboss/weld/messages/version_en.properties (rev 0) +++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/version_en.properties 2009-11-06 00:13:45 UTC (rev 4707) @@ -0,0 +1 @@ +VERSION={0} Property changes on: core/trunk/impl/src/main/resources/org/jboss/weld/messages/version_en.properties ___________________________________________________________________ Name: svn:mime-type + text/plain

16 years, 5 months

1
0
0 / 0

Weld SVN: r4706 - api/trunk/cdi/src/main/java/javax/enterprise/inject.

by weld-commits＠lists.jboss.org

Author: gavin.king(a)jboss.com Date: 2009-11-05 17:34:08 -0500 (Thu, 05 Nov 2009) New Revision: 4706 Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java Log: "bean archive" Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java =================================================================== --- api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java 2009-11-05 21:38:05 UTC (rev 4705) +++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java 2009-11-05 22:34:08 UTC (rev 4706) @@ -52,8 +52,8 @@ * for the bean archive if either: * * <ul> - * <li>the alternative is a managed bean or session bean and - * the bean class of the bean is listed,</li> + * <li>the alternative is a managed bean or session bean and the + * bean class of the bean is listed,</li> * <li>the alternative is a producer method, field or resource, * and the bean class that declares the method or field is listed, * or</li> Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java =================================================================== --- api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-11-05 21:38:05 UTC (rev 4705) +++ api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-11-05 22:34:08 UTC (rev 4706) @@ -236,8 +236,8 @@ * EJB specification. * * <ul> - * <li>A {@linkplain javax.ejb.Stateless stateless session bean} must belong to the - * {@link javax.enterprise.context.Dependent @Dependent} pseudo-scope.</li> + * <li>A {@linkplain javax.ejb.Stateless stateless session bean} must belong to + * the {@link javax.enterprise.context.Dependent @Dependent} pseudo-scope.</li> * <li>A {@linkplain javax.ejb.Singleton singleton bean} must belong to either the * {@link javax.enterprise.context.ApplicationScoped @ApplicationScoped} * scope or to the {@link javax.enterprise.context.Dependent @Dependent} @@ -264,12 +264,10 @@ * acts as a source of objects to be injected, where: * * <ul> - * <li>the objects to be injected are not required to be instances - * of beans, or</li> - * <li>the concrete type of the objects to be injected may vary at - * runtime, or</li> - * <li>the objects require some custom initialization that is not - * performed by the bean constructor.</li> + * <li>the objects to be injected are not required to be instances of beans, or</li> + * <li>the concrete type of the objects to be injected may vary at runtime, or</li> + * <li>the objects require some custom initialization that is not performed by + * the bean constructor.</li> * </ul> * * A producer method or field is a method or field of a bean class annotated @@ -356,9 +354,8 @@ * <ul> * <li>the bean is not an interceptor or decorator,</li> * <li>the bean is enabled,</li> - * <li>the bean is either not an alternative, or the module is a bean deployment - * archive and the bean is a selected alternative of the bean deployment - * archive, and</li> + * <li>the bean is either not an alternative, or the module is a bean archive and + * the bean is a selected alternative of the bean archive, and</li> * <li>the bean class is required to be accessible to classes in the module, * according to the class accessibility requirements of the module architecture.</li> * </ul> @@ -400,9 +397,8 @@ * <li>and array types.</li> * </ul> * - * An injection point whose declared type cannot be proxied by the - * container must not resolve to a bean with a - * {@linkplain javax.enterprise.context normal scope}. + * An injection point whose declared type cannot be proxied by the container must + * not resolve to a bean with a {@linkplain javax.enterprise.context normal scope}. * * <h3>EL name resolution</h3> *

16 years, 5 months

1
0
0 / 0

Weld SVN: r4705 - core/trunk/impl/src/main/java/org/jboss/weld/bootstrap.

by weld-commits＠lists.jboss.org

Author: rogerk Date: 2009-11-05 16:38:05 -0500 (Thu, 05 Nov 2009) New Revision: 4705 Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java Log: use concurrenthashmap instead of hashmap Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-11-05 21:35:31 UTC (rev 4704) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-11-05 21:38:05 UTC (rev 4705) @@ -25,11 +25,12 @@ import java.net.URL; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.Map.Entry; +import java.util.concurrent.ConcurrentHashMap; + import javax.enterprise.inject.spi.Extension; @@ -121,7 +122,7 @@ this.deploymentManager = deploymentManager; this.environment = environment; this.deployment = deployment; - this.managerAwareBeanDeploymentArchives = new HashMap<BeanDeploymentArchive, BeanDeployment>(); + this.managerAwareBeanDeploymentArchives = new ConcurrentHashMap<BeanDeploymentArchive, BeanDeployment>(); this.implementationBeanDeploymentArchive = new BeanDeploymentArchive() {

16 years, 5 months

1
0
0 / 0

Weld SVN: r4704 - doc/trunk/reference/en-US.

by weld-commits＠lists.jboss.org

Author: gavin.king(a)jboss.com Date: 2009-11-05 16:35:31 -0500 (Thu, 05 Nov 2009) New Revision: 4704 Modified: doc/trunk/reference/en-US/decorators.xml doc/trunk/reference/en-US/interceptors.xml doc/trunk/reference/en-US/specialization.xml Log: "bean archive" Modified: doc/trunk/reference/en-US/decorators.xml =================================================================== --- doc/trunk/reference/en-US/decorators.xml 2009-11-05 21:29:12 UTC (rev 4703) +++ doc/trunk/reference/en-US/decorators.xml 2009-11-05 21:35:31 UTC (rev 4704) @@ -151,8 +151,8 @@ <para> By default, all decorators are disabled. We need to <emphasis>enable</emphasis> our decorator in the - <literal>beans.xml</literal> descriptor of a bean deployment archive. This activation only applies - to beans in the same archive. + <literal>beans.xml</literal> descriptor of a bean archive. This activation only applies to the beans + in that archive. </para> <programlisting role="XML"><![CDATA[<beans Modified: doc/trunk/reference/en-US/interceptors.xml =================================================================== --- doc/trunk/reference/en-US/interceptors.xml 2009-11-05 21:29:12 UTC (rev 4703) +++ doc/trunk/reference/en-US/interceptors.xml 2009-11-05 21:35:31 UTC (rev 4704) @@ -120,8 +120,8 @@ <para> By default, all interceptors are disabled. We need to <emphasis>enable</emphasis> our interceptor in the - <literal>beans.xml</literal> descriptor of a bean deployment archive. This activation only applies to beans in - the same archive. + <literal>beans.xml</literal> descriptor of a bean archive. This activation only applies to the beans in + that archive. </para> <programlisting role="XML"><![CDATA[<beans Modified: doc/trunk/reference/en-US/specialization.xml =================================================================== --- doc/trunk/reference/en-US/specialization.xml 2009-11-05 21:29:12 UTC (rev 4703) +++ doc/trunk/reference/en-US/specialization.xml 2009-11-05 21:35:31 UTC (rev 4704) @@ -80,9 +80,9 @@ <para> By default, <literal>@Alternative</literal> beans are disabled. We need to <emphasis>enable</emphasis> the alternative—effectively replacing the bean implementation without the <literal>@Alternative</literal> - annotation—in the <literal>beans.xml</literal> descriptor of a bean deployment archive by specifying the bean - class (or the class that contains the alternative producer method or field). This activation only applies to - beans in the same archive. + annotation—in the <literal>beans.xml</literal> descriptor of a bean archive by specifying the bean + class (or the class that contains the alternative producer method or field). This activation only applies + to the beans in that archive. </para> <programlisting role="XML"><![CDATA[<beans

16 years, 5 months

1
0
0 / 0

Weld SVN: r4703 - in api/trunk/cdi/src/main/java/javax: enterprise/inject and 1 other directories.

by weld-commits＠lists.jboss.org

Author: gavin.king(a)jboss.com Date: 2009-11-05 16:29:12 -0500 (Thu, 05 Nov 2009) New Revision: 4703 Modified: api/trunk/cdi/src/main/java/javax/decorator/package-info.java api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java api/trunk/cdi/src/main/java/javax/enterprise/inject/New.java api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessBean.java Log: "bean archive" Modified: api/trunk/cdi/src/main/java/javax/decorator/package-info.java =================================================================== --- api/trunk/cdi/src/main/java/javax/decorator/package-info.java 2009-11-05 21:06:01 UTC (rev 4702) +++ api/trunk/cdi/src/main/java/javax/decorator/package-info.java 2009-11-05 21:29:12 UTC (rev 4703) @@ -47,21 +47,19 @@ * * <h3>Enabled decorators</h3> * - * By default, a bean deployment archive has no enabled - * decorators. A decorator must be explicitly enabled by listing - * its bean class under the <tt><decorators></tt> element - * of the <tt>beans.xml</tt> file of the bean deployment archive. - * The order of the decorator declarations determines the decorator - * ordering. Decorators which occur earlier in the list are called - * first. + * By default, a bean archive has no enabled decorators. A + * decorator must be explicitly enabled by listing its bean class + * under the <tt><decorators></tt> element of the + * <tt>beans.xml</tt> file of the bean archive. The order of the + * decorator declarations determines the decorator ordering. + * Decorators which occur earlier in the list are called first. * * A decorator is bound to a bean if: * * <ul> * <li>The bean is {@linkplain javax.enterprise.inject eligible for injection} * to the delegate injection point of the decorator.</li> - * <li>The decorator is enabled in the bean deployment archive of - * the bean.</li> + * <li>The decorator is enabled in the bean archive of the bean.</li> * </ul> * * If a managed bean class is declared final, it may not have Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java =================================================================== --- api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java 2009-11-05 21:06:01 UTC (rev 4702) +++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java 2009-11-05 21:29:12 UTC (rev 4703) @@ -38,19 +38,18 @@ * * An alternative is not available for injection, lookup * or EL resolution to classes or JSP/JSF pages in a module - * unless the module is a bean deployment archive and the - * alternative is explicitly selected in that bean - * deployment archive. An alternative is never available for - * injection, lookup or EL resolution in a module that is not - * a bean deployment archive. + * unless the module is a bean archive and the alternative is + * explicitly selected in that bean archive. An + * alternative is never available for injection, lookup or EL + * resolution in a module that is not a bean archive. * - * By default, a bean deployment archive has no selected - * alternatives. An alternative must be explicitly declared - * using the <tt><alternatives></tt> element of the - * <tt>beans.xml</tt> file of the bean deployment archive. - * The <tt><alternatives></tt> element contains a - * list of bean classes and stereotypes. An alternative is - * selected for the bean deployment archive if either: + * By default, a bean archive has no selected alternatives. + * An alternative must be explicitly declared using the + * <tt><alternatives></tt> element of the + * <tt>beans.xml</tt> file of the bean archive. The + * <tt><alternatives></tt> element contains a list of + * bean classes and stereotypes. An alternative is selected + * for the bean archive if either: * * <ul> * <li>the alternative is a managed bean or session bean and Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/New.java =================================================================== --- api/trunk/cdi/src/main/java/javax/enterprise/inject/New.java 2009-11-05 21:06:01 UTC (rev 4702) +++ api/trunk/cdi/src/main/java/javax/enterprise/inject/New.java 2009-11-05 21:29:12 UTC (rev 4703) @@ -70,12 +70,14 @@ public @interface New { /** - * Selects the bean to be injected. The class - * must be the bean class of an enabled or disabled - * bean. The bean class need not be deployed in a - * bean deployment archive. + * Specifies the bean class of the new instance. The class + * must be the bean class of an enabled or disabled bean. The + * bean class need not be deployed in a bean archive. * - * @return the bean class of the bean to be injected + * Defaults to the declared type of the injection point if + * not specified. + * + * @return the bean class of the new instance */ Class<?> value() default New.class; Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java =================================================================== --- api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-11-05 21:06:01 UTC (rev 4702) +++ api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-11-05 21:29:12 UTC (rev 4703) @@ -331,14 +331,14 @@ * A bean is said to be enabled if: * * <ul> - * <li>it is deployed in a bean deployment archive, and</li> + * <li>it is deployed in a bean archive, and</li> * <li>it is not a * {@linkplain javax.enterprise.inject.Produces producer method or field} * of a disabled bean, and</li> * <li>it is not {@linkplain javax.enterprise.inject.Specializes specialized} * by any other enabled bean, and either</li> * <li>it is not an {@linkplain javax.enterprise.inject.Alternative alternative}, - * or it is a selected alternative of at least one bean deployment archive.</li> + * or it is a selected alternative of at least one bean archive.</li> * </ul> * * Otherwise, the bean is said to be disabled. @@ -347,10 +347,9 @@ * * Beans and their clients may be deployed in modules in a module architecture * such as the Java EE environment. In a module architecture, certain modules are - * considered bean deployment archives. In the Java EE module architecture, any - * Java EE module or library is a module. The Java EE module or library is a bean - * deployment archive if it contains a <tt>beans.xml</tt> file in the metadata - * directory.</para> + * considered bean archives. In the Java EE module architecture, any Java EE + * module or library is a module. The Java EE module or library is a bean archive + * if it contains a <tt>beans.xml</tt> file in the metadata directory.</para> * * A bean is available for injection in a certain module if: * @@ -416,24 +415,23 @@ * page with the EL expression.</li> * </ul> * - * If an EL name resolves to more than one bean, the container attempts to resolve - * the ambiguity by eliminating all beans which are not alternatives. + * If an EL name resolves to more than one bean, the container attempts to + * resolve the ambiguity by eliminating all beans which are not alternatives. * * <h3>Enabled interceptors</h3> * - * By default, a bean deployment archive has no enabled interceptors. An - * interceptor must be explicitly enabled by listing its bean class under the + * By default, a bean archive has no enabled interceptors. An interceptor + * must be explicitly enabled by listing its bean class under the * <tt><interceptors></tt> element of the <tt>beans.xml</tt> file of the - * bean deployment archive. The order of the interceptor declarations determines - * the interceptor ordering. Interceptors which occur earlier in the list are + * bean archive. The order of the interceptor declarations determines the + * interceptor ordering. Interceptors which occur earlier in the list are * called first. * * An interceptor is bound to a bean if: * * <ul> * <li>The bean has all the interceptor bindings of the interceptor.</li> - * <li>The interceptor is enabled in the bean deployment archive of - * the bean.</li> + * <li>The interceptor is enabled in the bean archive of the bean.</li> * </ul> * * An interceptor instance is a Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java =================================================================== --- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java 2009-11-05 21:06:01 UTC (rev 4702) +++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java 2009-11-05 21:29:12 UTC (rev 4703) @@ -19,8 +19,7 @@ /** * * The container fires an event of this type for each Java class or interface - * it discovers in a bean deployment archive, before it reads the declared - * annotations. + * it discovers in a bean archive, before it reads the declared annotations. * * * Any observer of this event is permitted to wrap and/or replace the Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessBean.java =================================================================== --- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessBean.java 2009-11-05 21:06:01 UTC (rev 4702) +++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessBean.java 2009-11-05 21:29:12 UTC (rev 4703) @@ -19,7 +19,7 @@ /** * * The container fires an event of this type for each enabled bean, interceptor - * or decorator deployed in a bean deployment archive, before registering the + * or decorator deployed in a bean archive, before registering the * {@link javax.enterprise.inject.spi.Bean} object. * *

16 years, 5 months

1
0
0 / 0

Weld SVN: r4702 - core/trunk/impl/src/main/java/org/jboss/weld.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-11-05 16:06:01 -0500 (Thu, 05 Nov 2009) New Revision: 4702 Modified: core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java Log: oops Modified: core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 2009-11-05 21:03:42 UTC (rev 4701) +++ core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 2009-11-05 21:06:01 UTC (rev 4702) @@ -656,7 +656,7 @@ @SuppressWarnings("unchecked") - private <T> Set<ObserverMethod<? super T>> resolveObserverMethods(Type eventType, Annotation... bindings) + public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(Type eventType, Annotation... bindings) { checkBindingTypes(Arrays.asList(bindings)); HashSet<Annotation> bindingAnnotations = new HashSet<Annotation>(Arrays.asList(bindings));

16 years, 5 months

1
0
0 / 0

Weld SVN: r4701 - core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-11-05 16:03:42 -0500 (Thu, 05 Nov 2009) New Revision: 4701 Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractContainerEvent.java Log: remove compilation error Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractContainerEvent.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractContainerEvent.java 2009-11-05 20:37:34 UTC (rev 4700) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractContainerEvent.java 2009-11-05 21:03:42 UTC (rev 4701) @@ -66,7 +66,7 @@ Type eventType = new ParameterizedTypeImpl(getRawType(), getEmptyTypeArray(), null); for (BeanDeployment beanDeployment : beanDeployments.values()) { - observers.addAll(beanDeployment.getBeanManager().resolveObserverMethods(eventType)); + observers.addAll((Set) beanDeployment.getBeanManager().resolveObserverMethods(eventType)); } for (ObserverMethod<Object> observerMethod : observers) {

16 years, 5 months

1
0
0 / 0

Weld SVN: r4700 - in core/trunk: impl/src/main/java/org/jboss/weld/bootstrap/events and 3 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-11-05 15:37:34 -0500 (Thu, 05 Nov 2009) New Revision: 4700 Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployer.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractContainerEvent.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterDeploymentValidationImpl.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/NonBdaExtensionTest.java core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/javax.enterprise.inject.spi.Extension Log: WELD-258 Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployer.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployer.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployer.java 2009-11-05 20:37:34 UTC (rev 4700) @@ -44,7 +44,6 @@ { private final BeanManagerImpl beanManager; - private final Set<ObserverMethodImpl<?, ?>> observerMethods; private final Set<Extension> extensions; private final Deployment deployment; private final Map<BeanDeploymentArchive, BeanDeployment> beanDeployments; @@ -53,7 +52,6 @@ { this.beanManager = manager; this.extensions = new HashSet<Extension>(); - this.observerMethods = new HashSet<ObserverMethodImpl<?,?>>(); this.deployment = deployment; this.beanDeployments = beanDeployments; } @@ -70,7 +68,8 @@ BeanDeployment beanDeployment = DeploymentStructures.getOrCreateBeanDeployment(deployment, beanManager, beanDeployments, clazz.getJavaClass()); ExtensionBean bean = new ExtensionBean(beanDeployment.getBeanManager(), clazz, extension); - createObserverMethods(bean, beanDeployment.getBeanManager(), clazz); + Set<ObserverMethodImpl<?, ?>> observerMethods = new HashSet<ObserverMethodImpl<?,?>>(); + createObserverMethods(bean, beanDeployment.getBeanManager(), clazz, observerMethods); beanDeployment.getBeanManager().addBean(bean); for (ObserverMethodImpl<?, ?> observerMethod : observerMethods) { @@ -95,18 +94,18 @@ this.extensions.add(extension); } - protected <X> void createObserverMethods(RIBean<X> declaringBean, BeanManagerImpl beanManager, WeldClass<X> annotatedClass) + protected <X> void createObserverMethods(RIBean<X> declaringBean, BeanManagerImpl beanManager, WeldClass<X> annotatedClass, Set<ObserverMethodImpl<?, ?>> observerMethods) { for (WeldMethod<?, X> method : annotatedClass.getDeclaredWeldMethodsWithAnnotatedParameters(Observes.class)) { - createObserverMethod(declaringBean, beanManager, method); + createObserverMethod(declaringBean, beanManager, method, observerMethods); } } - protected <T, X> void createObserverMethod(RIBean<X> declaringBean, BeanManagerImpl beanManager, WeldMethod<T, X> method) + protected <T, X> void createObserverMethod(RIBean<X> declaringBean, BeanManagerImpl beanManager, WeldMethod<T, X> method, Set<ObserverMethodImpl<?, ?>> observerMethods) { ObserverMethodImpl<T, X> observer = ObserverFactory.create(method, declaringBean, beanManager); - this.observerMethods.add(observer); + observerMethods.add(observer); } } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-11-05 20:37:34 UTC (rev 4700) @@ -346,10 +346,7 @@ // Re-Read the deployment structure, this will be the physical structure, and will add in BDAs for any extensions outside a physical BDA beanDeployments = deploymentVisitor.visit(); - for (BeanDeployment beanDeployment : beanDeployments.values()) - { - BeforeBeanDiscoveryImpl.fire(beanDeployment.getBeanManager(), deployment, beanDeployments); - } + BeforeBeanDiscoveryImpl.fire(deploymentManager, deployment, beanDeployments); // Re-Read the deployment structure, this will be the physical structure, extensions and any classes added using addAnnotatedType outside the physical BDA beanDeployments = deploymentVisitor.visit(); @@ -367,10 +364,7 @@ { entry.getValue().deployBeans(environment); } - for (BeanDeployment beanDeployment : beanDeployments.values()) - { - AfterBeanDiscoveryImpl.fire(beanDeployment.getBeanManager(), deployment, beanDeployments); - } + AfterBeanDiscoveryImpl.fire(deploymentManager, deployment, beanDeployments); // Re-read the deployment structure, this will be the physical structure, extensions, classes, and any beans added using addBean outside the physical structure beanDeployments = deploymentVisitor.visit(); Container.instance().putBeanDeployments(beanDeployments); @@ -388,11 +382,7 @@ { deployment.getServices().get(Validator.class).validateDeployment(entry.getValue().getBeanManager(), entry.getValue().getBeanDeployer().getEnvironment()); } - for (BeanDeployment beanDeployment : beanDeployments.values()) - { - AfterDeploymentValidationImpl.fire(beanDeployment.getBeanManager()); - } - + AfterDeploymentValidationImpl.fire(deploymentManager, beanDeployments); } return this; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractContainerEvent.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractContainerEvent.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractContainerEvent.java 2009-11-05 20:37:34 UTC (rev 4700) @@ -2,12 +2,19 @@ import java.lang.reflect.Type; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.enterprise.inject.spi.ObserverMethod; + import org.jboss.weld.BeanManagerImpl; -import org.jboss.weld.DefinitionException; +import org.jboss.weld.bootstrap.BeanDeployment; +import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive; import org.jboss.weld.util.reflection.ParameterizedTypeImpl; + public abstract class AbstractContainerEvent { @@ -48,9 +55,24 @@ } catch (Exception e) { - getErrors().add(new DefinitionException(e)); + getErrors().add(e); } } + + protected void fire(Map<BeanDeploymentArchive, BeanDeployment> beanDeployments) + { + // Collect all observers to remove dupes + Set<ObserverMethod<Object>> observers = new HashSet<ObserverMethod<Object>>(); + Type eventType = new ParameterizedTypeImpl(getRawType(), getEmptyTypeArray(), null); + for (BeanDeployment beanDeployment : beanDeployments.values()) + { + observers.addAll(beanDeployment.getBeanManager().resolveObserverMethods(eventType)); + } + for (ObserverMethod<Object> observerMethod : observers) + { + observerMethod.notify(this); + } + } protected Type getRawType() { Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java 2009-11-05 20:37:34 UTC (rev 4700) @@ -23,9 +23,8 @@ import javax.enterprise.context.spi.Context; import javax.enterprise.inject.spi.AfterBeanDiscovery; import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.ObserverMethod; import javax.enterprise.inject.spi.Interceptor; -import javax.decorator.Decorator; +import javax.enterprise.inject.spi.ObserverMethod; import org.jboss.weld.BeanManagerImpl; import org.jboss.weld.bootstrap.BeanDeployment; @@ -37,7 +36,7 @@ public static void fire(BeanManagerImpl beanManager, Deployment deployment, Map<BeanDeploymentArchive, BeanDeployment> beanDeployments) { - new AfterBeanDiscoveryImpl(beanManager, deployment, beanDeployments).fire(); + new AfterBeanDiscoveryImpl(beanManager, deployment, beanDeployments).fire(beanDeployments); } protected AfterBeanDiscoveryImpl(BeanManagerImpl beanManager, Deployment deployment, Map<BeanDeploymentArchive, BeanDeployment> beanDeployments) Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterDeploymentValidationImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterDeploymentValidationImpl.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterDeploymentValidationImpl.java 2009-11-05 20:37:34 UTC (rev 4700) @@ -16,17 +16,21 @@ */ package org.jboss.weld.bootstrap.events; +import java.util.Map; + import javax.enterprise.inject.spi.AfterDeploymentValidation; import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.bootstrap.BeanDeployment; +import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive; public class AfterDeploymentValidationImpl extends AbstractDeploymentContainerEvent implements AfterDeploymentValidation { - public static void fire(BeanManagerImpl beanManager) + public static void fire(BeanManagerImpl beanManager, Map<BeanDeploymentArchive, BeanDeployment> beanDeployments) { - new AfterDeploymentValidationImpl(beanManager).fire(); + new AfterDeploymentValidationImpl(beanManager).fire(beanDeployments); } protected AfterDeploymentValidationImpl(BeanManagerImpl beanManager) Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java 2009-11-05 20:37:34 UTC (rev 4700) @@ -36,7 +36,7 @@ public static void fire(BeanManagerImpl beanManager, Deployment deployment, Map<BeanDeploymentArchive, BeanDeployment> beanDeployments) { - new BeforeBeanDiscoveryImpl(beanManager, deployment, beanDeployments).fire(); + new BeforeBeanDiscoveryImpl(beanManager, deployment, beanDeployments).fire(beanDeployments); } protected BeforeBeanDiscoveryImpl(BeanManagerImpl beanManager, Deployment deployment, Map<BeanDeploymentArchive, BeanDeployment> beanDeployments) Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-11-05 20:37:34 UTC (rev 4700) @@ -62,6 +62,10 @@ public class ObserverMethodImpl<T, X> implements ObserverMethod<T> { + public static final String ID_PREFIX = ObserverMethodImpl.class.getPackage().getName(); + + public static final String ID_SEPARATOR = "-"; + private static final Annotation ANY = new AnyLiteral(); private final Set<Annotation> bindings; @@ -71,6 +75,7 @@ protected final RIBean<X> declaringBean; protected final MethodInjectionPoint<T, X> observerMethod; protected TransactionPhase transactionPhase; + private final String id; private final Set<WeldInjectionPoint<?, ?>> newInjectionPoints; @@ -88,7 +93,7 @@ this.declaringBean = declaringBean; this.observerMethod = MethodInjectionPoint.of(declaringBean, observer); this.eventType = observerMethod.getAnnotatedParameters(Observes.class).get(0).getBaseType(); - + this.id = new StringBuilder().append(ID_PREFIX).append(ID_SEPARATOR)/*.append(manager.getId()).append(ID_SEPARATOR)*/.append(ObserverMethod.class.getSimpleName()).append(ID_SEPARATOR).append(declaringBean.getBeanClass().getName()).append(".").append(observer.getSignature()).toString(); this.bindings = new HashSet<Annotation>(observerMethod.getAnnotatedParameters(Observes.class).get(0).getMetaAnnotations(Qualifier.class)); Observes observesAnnotation = observerMethod.getAnnotatedParameters(Observes.class).get(0).getAnnotation(Observes.class); this.notifyType = observesAnnotation.notifyObserver(); @@ -231,16 +236,6 @@ } } } - - @Override - public String toString() - { - StringBuilder builder = new StringBuilder(); - builder.append("Observer Implementation: \n"); - builder.append(" Observer (Declaring) class: " + declaringBean.getBeanClass()); - builder.append(" Observer method: " + observerMethod); - return builder.toString(); - } protected boolean ignore(T event) { @@ -255,5 +250,36 @@ } return false; } + + @Override + public String toString() + { + return id; + } + + public String getId() + { + return id; + } + + @Override + public boolean equals(Object obj) + { + if (obj instanceof ObserverMethodImpl<?, ?>) + { + ObserverMethodImpl<?, ?> that = (ObserverMethodImpl<?, ?>) obj; + return this.getId().equals(that.getId()); + } + else + { + return false; + } + } + + @Override + public int hashCode() + { + return getId().hashCode(); + } } Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java 2009-11-05 20:37:34 UTC (rev 4700) @@ -0,0 +1,6 @@ +package org.jboss.weld.tests.unit.deployment.structure.extensions; + +public class Bar +{ + +} Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java 2009-11-05 20:37:34 UTC (rev 4700) @@ -0,0 +1,45 @@ +package org.jboss.weld.tests.unit.deployment.structure.extensions; + +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; +import javax.enterprise.inject.spi.Extension; +import javax.enterprise.inject.spi.ProcessManagedBean; + +public class CountingObserver1 implements Extension +{ + + private int beforeBeanDiscovery; + private int processFooManagedBean; + private int processBarManagedBean; + + public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event) + { + beforeBeanDiscovery++; + } + + public void observerProcessFooManagedBean(@Observes ProcessManagedBean<Foo> event) + { + processFooManagedBean++; + } + + public void observerProcessBarManagedBean(@Observes ProcessManagedBean<Bar> event) + { + processBarManagedBean++; + } + + public int getBeforeBeanDiscovery() + { + return beforeBeanDiscovery; + } + + public int getProcessFooManagedBean() + { + return processFooManagedBean; + } + + public int getProcessBarManagedBean() + { + return processBarManagedBean; + } + +} Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java 2009-11-05 20:37:34 UTC (rev 4700) @@ -0,0 +1,47 @@ +package org.jboss.weld.tests.unit.deployment.structure.extensions; + +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; +import javax.enterprise.inject.spi.Extension; +import javax.enterprise.inject.spi.ProcessManagedBean; + +public class CountingObserver2 implements Extension +{ + + private int beforeBeanDiscovery; + private int processFooManagedBean; + private int processBarManagedBean; + + public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager) + { + beforeBeanDiscovery++; + event.addAnnotatedType(beanManager.createAnnotatedType(Bar.class)); + } + + public void observerProcessFooManagedBean(@Observes ProcessManagedBean<Foo> event) + { + processFooManagedBean++; + } + + public void observerProcessBarManagedBean(@Observes ProcessManagedBean<Bar> event) + { + processBarManagedBean++; + } + + public int getBeforeBeanDiscovery() + { + return beforeBeanDiscovery; + } + + public int getProcessFooManagedBean() + { + return processFooManagedBean; + } + + public int getProcessBarManagedBean() + { + return processBarManagedBean; + } + +} Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/NonBdaExtensionTest.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/NonBdaExtensionTest.java 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/NonBdaExtensionTest.java 2009-11-05 20:37:34 UTC (rev 4700) @@ -85,4 +85,58 @@ } + @Test(description="WELD-258") + public void testEventsSentOnceOnly() + { + // Create the BDA in which we will deploy Observer1 and Foo. This is equivalent to a war or ejb jar + final MockBeanDeploymentArchive bda1 = new MockBeanDeploymentArchive("1", CountingObserver1.class, Foo.class); + + // Create the BDA to return from loadBeanDeploymentArchive for Observer2, this is probably a library, though could be another war or ejb jar + // bda2 is accessible from bda1, but isn't added to it's accessibility graph by default. This similar to an archive which doesn't contain a beans.xml but does contain an extension + final BeanDeploymentArchive bda2 = new MockBeanDeploymentArchive("2", CountingObserver2.class); + + // Create a deployment, that we can use to mirror the structure of one Extension inside a BDA, and one outside + Deployment deployment = new AbstractMockDeployment(bda1) + { + + public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass) + { + // Return bda2 if it is Observer2. Stick anything else which this test isn't about in bda1 + if (beanClass.equals(CountingObserver2.class) || beanClass.equals(Bar.class)) + { + // If Observer2 is requested, then we need to add bda2 to the accessibility graph of bda1 + bda1.getBeanDeploymentArchives().add(bda2); + return bda2; + } + else + { + return bda1; + } + } + + }; + + TestContainer container = new TestContainer(new MockServletLifecycle(deployment, bda1)); + container.getLifecycle().initialize(); + + // Add custom ServiceLoader so that we can load Extension services from current package, not META-INF/services + // We do this after startContainer() so we replace the default impl + deployment.getServices().add(ServiceLoaderFactory.class, new PackageServiceLoaderFactory(NonBdaExtensionTest.class.getPackage(), Extension.class)); + + // Cause the container to deploy the beans etc. + container.getLifecycle().beginApplication(); + + // Get the bean manager for bda1 and bda2 + BeanManagerImpl beanManager1 = container.getBeanManager(); + + CountingObserver1 observer1 = beanManager1.getInstanceByType(CountingObserver1.class); + CountingObserver2 observer2 = beanManager1.getInstanceByType(CountingObserver2.class); + assert observer1.getBeforeBeanDiscovery() == 1; + assert observer1.getProcessFooManagedBean() == 1; + assert observer1.getProcessBarManagedBean() == 0; + assert observer2.getBeforeBeanDiscovery() == 1; + assert observer2.getProcessFooManagedBean() == 1; + assert observer2.getProcessBarManagedBean() == 1; + } + } Modified: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/javax.enterprise.inject.spi.Extension =================================================================== --- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/javax.enterprise.inject.spi.Extension 2009-11-05 17:26:45 UTC (rev 4699) +++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/javax.enterprise.inject.spi.Extension 2009-11-05 20:37:34 UTC (rev 4700) @@ -1,3 +1,4 @@ org.jboss.weld.tests.unit.deployment.structure.extensions.Observer1 org.jboss.weld.tests.unit.deployment.structure.extensions.Observer2 -org.jboss.weld.tests.unit.deployment.structure.extensions.Observer3 \ No newline at end of file +org.jboss.weld.tests.unit.deployment.structure.extensions.CountingObserver1 +org.jboss.weld.tests.unit.deployment.structure.extensions.CountingObserver2

16 years, 5 months

1
0
0 / 0

Weld SVN: r4699 - core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators.

by weld-commits＠lists.jboss.org

Author: marius.bogoevici Date: 2009-11-05 12:26:45 -0500 (Thu, 05 Nov 2009) New Revision: 4699 Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBean.java core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBeanImpl.java core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java Log: breaking decorator test Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBean.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBean.java 2009-11-05 15:06:45 UTC (rev 4698) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBean.java 2009-11-05 17:26:45 UTC (rev 4699) @@ -35,4 +35,6 @@ int echo3(int i); int echo4(int i); + + boolean isInvoked(); } Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBeanImpl.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBeanImpl.java 2009-11-05 15:06:45 UTC (rev 4698) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBeanImpl.java 2009-11-05 17:26:45 UTC (rev 4699) @@ -29,24 +29,34 @@ public class SimpleBeanImpl implements SimpleBean { + private boolean invoked = false; + public int echo1(int i) { + invoked = true; return i; } public int echo2(int i) { + invoked = true; return i; } public int echo3(int i) { + invoked = true; return i; } public int echo4(int i) { + invoked = true; return i; } + public boolean isInvoked() + { + return invoked; + } } Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java 2009-11-05 15:06:45 UTC (rev 4698) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java 2009-11-05 17:26:45 UTC (rev 4699) @@ -14,7 +14,7 @@ @BeansXml("beans.xml") public class SimpleDecoratorTest extends AbstractWeldTest { - @Test + @Test(groups = "broken") public void testSimpleDecorator() { SimpleBean simpleBean = getCurrentManager().getInstanceByType(SimpleBean.class); @@ -22,19 +22,25 @@ resetDecorators(); assert simpleBean.echo1(1) == 1; assertDecorators(true, false, false); + assert simpleBean.isInvoked(); resetDecorators(); assert simpleBean.echo2(2) == 2; assertDecorators(false, true, false); + assert simpleBean.isInvoked(); //Only SimpleDecorator1 gets invoked, although I think SimpleDecorator2 should get invoked too resetDecorators(); assert simpleBean.echo3(3) == 3; assertDecorators(false, false, true); - + + assert simpleBean.isInvoked(); + resetDecorators(); assert simpleBean.echo4(4) == 4; assertDecorators(false, false, false); + + assert simpleBean.isInvoked(); } private void resetDecorators()

16 years, 5 months

1
0
0 / 0

Weld SVN: r4698 - in core/trunk: tests/src/test/java/org/jboss/weld/tests/extensions and 1 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-11-05 10:06:45 -0500 (Thu, 05 Nov 2009) New Revision: 4698 Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Cow.java core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/CowLocal.java core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionObserver.java core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Horse.java core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/OtherObserver.java core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Rat.java core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Special.java core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Stable.java Removed: core/trunk/impl/src/main/java/org/jboss/weld/event/AsynchronousTransactionalEventNotification.java Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java core/trunk/impl/src/main/java/org/jboss/weld/event/TransactionalObserverMethodImpl.java core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/javax.enterprise.inject.spi.Extension Log: WELD-243 Deleted: core/trunk/impl/src/main/java/org/jboss/weld/event/AsynchronousTransactionalEventNotification.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/event/AsynchronousTransactionalEventNotification.java 2009-11-05 09:38:05 UTC (rev 4697) +++ core/trunk/impl/src/main/java/org/jboss/weld/event/AsynchronousTransactionalEventNotification.java 2009-11-05 15:06:45 UTC (rev 4698) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.weld.event; - -import static org.jboss.weld.messages.EventMessage.ASYNC_OBSERVER_FAILURE; -import static org.jboss.weld.messages.EventMessage.ASYNC_TX_FIRE; -import static org.jboss.weld.util.log.Category.EVENT; -import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; - -import org.slf4j.cal10n.LocLogger; -import org.slf4j.ext.XLogger; -import org.slf4j.ext.XLogger.Level; - -/** - * A deferred event notification that will be delivered during the appropriate - * transaction phase, but asynchronously from the thread which generated the - * event. - * - * @author David Allen - * - */ -public class AsynchronousTransactionalEventNotification<T> extends DeferredEventNotification<T> -{ - private static final LocLogger log = loggerFactory().getLogger(EVENT); - private static final XLogger xLog = loggerFactory().getXLogger(EVENT); - - public AsynchronousTransactionalEventNotification(T event, ObserverMethodImpl<T, ?> observer) - { - super(event, observer); - } - - @Override - public void run() - { - // Let the event be deferred again as just an asynchronous event - try - { - log.trace(ASYNC_TX_FIRE, event, observer); - observer.sendEventAsynchronously(event); - } - catch (Exception e) - { - log.error(ASYNC_OBSERVER_FAILURE, event); - xLog.throwing(Level.DEBUG, e); - } - } - -} Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-11-05 09:38:05 UTC (rev 4697) +++ core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-11-05 15:06:45 UTC (rev 4698) @@ -31,20 +31,20 @@ import javax.enterprise.inject.Disposes; import javax.enterprise.inject.New; import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.Extension; import javax.enterprise.inject.spi.ObserverMethod; import javax.inject.Inject; import javax.inject.Qualifier; import org.jboss.weld.BeanManagerImpl; -import org.jboss.weld.Container; import org.jboss.weld.DefinitionException; import org.jboss.weld.bean.RIBean; +import org.jboss.weld.bootstrap.events.AbstractContainerEvent; import org.jboss.weld.injection.MethodInjectionPoint; import org.jboss.weld.injection.WeldInjectionPoint; import org.jboss.weld.introspector.WeldMethod; import org.jboss.weld.introspector.WeldParameter; import org.jboss.weld.literal.AnyLiteral; -import org.jboss.weld.manager.api.ExecutorServices; import org.jboss.weld.util.Beans; /** @@ -192,6 +192,10 @@ public void notify(final T event) { + if (ignore(event)) + { + return; + } sendEvent(event); } @@ -206,7 +210,6 @@ CreationalContext<?> creationalContext = null; try { - // Get the most specialized instance of the component if (notifyType.equals(Reception.ALWAYS)) { creationalContext = manager.createCreationalContext(declaringBean); @@ -229,17 +232,6 @@ } } - /** - * Queues the event for later execution - * - * @param event - */ - protected void sendEventAsynchronously(final T event) - { - DeferredEventNotification<T> deferredEvent = new DeferredEventNotification<T>(event, this); - Container.instance().deploymentServices().get(ExecutorServices.class).getTaskExecutor().execute(deferredEvent); - } - @Override public String toString() { @@ -249,5 +241,19 @@ builder.append(" Observer method: " + observerMethod); return builder.toString(); } + + protected boolean ignore(T event) + { + Class<?> eventType = event.getClass(); + if (AbstractContainerEvent.class.isAssignableFrom(eventType)) + { + // This is a container lifeycle event, ensure we are firing to an extension + if (!Extension.class.isAssignableFrom(getBeanClass())) + { + return true; + } + } + return false; + } } Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/TransactionalObserverMethodImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/event/TransactionalObserverMethodImpl.java 2009-11-05 09:38:05 UTC (rev 4697) +++ core/trunk/impl/src/main/java/org/jboss/weld/event/TransactionalObserverMethodImpl.java 2009-11-05 15:06:45 UTC (rev 4698) @@ -53,6 +53,10 @@ @Override public void notify(T event) { + if (ignore(event)) + { + return; + } if ((manager.getServices().get(TransactionServices.class) != null) && (manager.getServices().get(TransactionServices.class).isTransactionActive())) { deferEvent(event); Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Cow.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Cow.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Cow.java 2009-11-05 15:06:45 UTC (rev 4698) @@ -0,0 +1,9 @@ +package org.jboss.weld.tests.extensions; + +import javax.ejb.Stateless; + +@Stateless +public class Cow implements CowLocal +{ + +} Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Cow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/CowLocal.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/CowLocal.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/CowLocal.java 2009-11-05 15:06:45 UTC (rev 4698) @@ -0,0 +1,9 @@ +package org.jboss.weld.tests.extensions; + +import javax.ejb.Local; + +@Local +public interface CowLocal +{ + +} Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/CowLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionObserver.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionObserver.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionObserver.java 2009-11-05 15:06:45 UTC (rev 4698) @@ -0,0 +1,279 @@ +package org.jboss.weld.tests.extensions; + +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.AfterBeanDiscovery; +import javax.enterprise.inject.spi.AfterDeploymentValidation; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; +import javax.enterprise.inject.spi.Extension; +import javax.enterprise.inject.spi.ProcessAnnotatedType; +import javax.enterprise.inject.spi.ProcessBean; +import javax.enterprise.inject.spi.ProcessInjectionTarget; +import javax.enterprise.inject.spi.ProcessManagedBean; +import javax.enterprise.inject.spi.ProcessObserverMethod; +import javax.enterprise.inject.spi.ProcessProducer; +import javax.enterprise.inject.spi.ProcessProducerField; +import javax.enterprise.inject.spi.ProcessProducerMethod; +import javax.enterprise.inject.spi.ProcessSessionBean; + +public class ExtensionObserver implements Extension +{ + + private boolean allBeforeBeanDiscovery; + private boolean allAfterBeanDiscovery; + private boolean allAfterDeploymentValidation; + private boolean allProcessBean; + private boolean allProcessInjectionTarget; + private boolean allProcessManagedBean; + private boolean allProcessObserverMethod; + private boolean allProcessProducer; + private boolean allProcessProducerField; + private boolean allProcessProducerMethod; + private boolean allProcessSessionBean; + private boolean allProcessAnnnotatedType; + + private boolean beforeBeanDiscovery; + private boolean afterBeanDiscovery; + private boolean afterDeploymentValidation; + private boolean processBean; + private boolean processInjectionTarget; + private boolean processManagedBean; + private boolean processObserverMethod; + private boolean processProducer; + private boolean processProducerField; + private boolean processProducerMethod; + private boolean processSessionBean; + private boolean processAnnotatedType; + + public void observeAll(@Observes Object event) + { + if (event instanceof BeforeBeanDiscovery) + { + allBeforeBeanDiscovery = true; + } + if (event instanceof AfterBeanDiscovery) + { + allAfterBeanDiscovery = true; + } + if (event instanceof AfterDeploymentValidation) + { + allAfterDeploymentValidation = true; + } + if (event instanceof ProcessBean<?> && !(event instanceof ProcessProducerField<?, ?> || event instanceof ProcessProducerMethod<?, ?> || event instanceof ProcessManagedBean<?> || event instanceof ProcessSessionBean<?>)) + { + allProcessBean = true; + } + if (event instanceof ProcessInjectionTarget<?>) + { + allProcessInjectionTarget = true; + } + if (event instanceof ProcessManagedBean<?>) + { + allProcessManagedBean = true; + } + if (event instanceof ProcessObserverMethod<?, ?>) + { + allProcessObserverMethod = true; + } + if (event instanceof ProcessProducer<?, ?>) + { + allProcessProducer = true; + } + if (event instanceof ProcessProducerField<?, ?>) + { + allProcessProducerField = true; + } + if (event instanceof ProcessProducerMethod<?, ?>) + { + allProcessProducerMethod = true; + } + if (event instanceof ProcessSessionBean<?>) + { + allProcessSessionBean = true; + } + if (event instanceof ProcessAnnotatedType<?>) + { + allProcessAnnnotatedType = true; + } + } + + public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event) + { + beforeBeanDiscovery = true; + } + + public void observeAfterBeanDiscovery(@Observes AfterBeanDiscovery event) + { + afterBeanDiscovery = true; + } + + public void observeAfterDeploymentValidation(@Observes AfterDeploymentValidation event) + { + afterDeploymentValidation = true; + } + + public void observeProcessBean(@Observes ProcessBean<?> event) + { + processBean = true; + } + + public void observeProcessInjectionTarget(@Observes ProcessInjectionTarget<?> event) + { + processInjectionTarget = true; + } + + public void observeProcessProducer(@Observes ProcessProducer<?, ?> event) + { + processProducer = true; + } + + public void observeProcessProducerMethod(@Observes ProcessProducerMethod<?, ?> event) + { + processProducerMethod = true; + } + + public void observeProcessProducerField(@Observes ProcessProducerField<?, ?> event) + { + processProducerField = true; + } + + public void observeProcessObserverMethod(@Observes ProcessObserverMethod<?, ?> event) + { + processObserverMethod = true; + } + + public void observeProcessManagedBean(@Observes ProcessManagedBean<?> event) + { + processManagedBean = true; + } + + public void observeProcessSessionBean(@Observes ProcessSessionBean<?> event) + { + processSessionBean = true; + } + + public void observeProcessAnnotatedType(@Observes ProcessAnnotatedType<?> event) + { + processAnnotatedType = true; + } + + public boolean isAllBeforeBeanDiscovery() + { + return allBeforeBeanDiscovery; + } + + public boolean isAllAfterBeanDiscovery() + { + return allAfterBeanDiscovery; + } + + public boolean isAllAfterDeploymentValidation() + { + return allAfterDeploymentValidation; + } + + public boolean isAllProcessBean() + { + return allProcessBean; + } + + public boolean isAllProcessInjectionTarget() + { + return allProcessInjectionTarget; + } + + public boolean isAllProcessManagedBean() + { + return allProcessManagedBean; + } + + public boolean isAllProcessObserverMethod() + { + return allProcessObserverMethod; + } + + public boolean isAllProcessProducer() + { + return allProcessProducer; + } + + public boolean isAllProcessProducerField() + { + return allProcessProducerField; + } + + public boolean isAllProcessProducerMethod() + { + return allProcessProducerMethod; + } + + public boolean isAllProcessSessionBean() + { + return allProcessSessionBean; + } + + public boolean isAllProcessAnnnotatedType() + { + return allProcessAnnnotatedType; + } + + public boolean isBeforeBeanDiscovery() + { + return beforeBeanDiscovery; + } + + public boolean isAfterBeanDiscovery() + { + return afterBeanDiscovery; + } + + public boolean isAfterDeploymentValidation() + { + return afterDeploymentValidation; + } + + public boolean isProcessBean() + { + return processBean; + } + + public boolean isProcessInjectionTarget() + { + return processInjectionTarget; + } + + public boolean isProcessManagedBean() + { + return processManagedBean; + } + + public boolean isProcessObserverMethod() + { + return processObserverMethod; + } + + public boolean isProcessProducer() + { + return processProducer; + } + + public boolean isProcessProducerField() + { + return processProducerField; + } + + public boolean isProcessProducerMethod() + { + return processProducerMethod; + } + + public boolean isProcessSessionBean() + { + return processSessionBean; + } + + public boolean isProcessAnnotatedType() + { + return processAnnotatedType; + } + +} Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionObserver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java 2009-11-05 09:38:05 UTC (rev 4697) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java 2009-11-05 15:06:45 UTC (rev 4698) @@ -2,12 +2,15 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.jboss.weld.test.AbstractWeldTest; import org.testng.annotations.Test; @Artifact @IntegrationTest +(a)Packaging(PackagingType.EAR) @Extension("javax.enterprise.inject.spi.Extension") public class ExtensionTest extends AbstractWeldTest { @@ -18,5 +21,73 @@ assert SimpleExtension.getInstance() != null; assert getCurrentManager().getInstanceByType(SimpleExtension.class).equals(SimpleExtension.getInstance()); } + + @Test(description="WELD-243") + public void testContainerEventsOnlySentToExtensionBeans() + { + ExtensionObserver extensionObserver = getCurrentManager().getInstanceByType(ExtensionObserver.class); + OtherObserver otherObserver = getCurrentManager().getInstanceByType(OtherObserver.class); + + assert extensionObserver.isBeforeBeanDiscovery(); + assert extensionObserver.isAllBeforeBeanDiscovery(); + assert !otherObserver.isBeforeBeanDiscovery(); + assert !otherObserver.isAllBeforeBeanDiscovery(); + + assert extensionObserver.isAfterBeanDiscovery(); + assert extensionObserver.isAllAfterBeanDiscovery(); + assert !otherObserver.isAfterBeanDiscovery(); + assert !otherObserver.isAllAfterBeanDiscovery(); + + assert extensionObserver.isProcessAnnotatedType(); + assert extensionObserver.isAllProcessAnnnotatedType(); + assert !otherObserver.isProcessAnnotatedType(); + assert !otherObserver.isAllProcessAnnotatedType(); + + assert extensionObserver.isProcessBean(); + assert extensionObserver.isAllProcessBean(); + assert !otherObserver.isProcessBean(); + assert !otherObserver.isAllProcessBean(); + + assert extensionObserver.isProcessInjectionTarget(); + assert extensionObserver.isAllProcessInjectionTarget(); + assert !otherObserver.isProcessInjectionTarget(); + assert !otherObserver.isAllProcessInjectionTarget(); + + assert extensionObserver.isProcessManagedBean(); + assert extensionObserver.isAllProcessManagedBean(); + assert !otherObserver.isProcessManagedBean(); + assert !otherObserver.isAllProcessManagedBean(); + + assert extensionObserver.isProcessObserverMethod(); + assert extensionObserver.isAllProcessObserverMethod(); + assert !otherObserver.isProcessObserverMethod(); + assert !otherObserver.isAllProcessObserverMethod(); + + assert extensionObserver.isProcessProducer(); + assert extensionObserver.isAllProcessProducer(); + assert !otherObserver.isProcessProducer(); + assert !otherObserver.isAllProcessProducer(); + + assert extensionObserver.isProcessProducerField(); + assert extensionObserver.isAllProcessProducerField(); + assert !otherObserver.isProcessProducerField(); + assert !otherObserver.isAllProcessProducerField(); + + assert extensionObserver.isProcessProducerMethod(); + assert extensionObserver.isAllProcessProducerField(); + assert !otherObserver.isProcessProducerMethod(); + assert !otherObserver.isAllProcessProducerMethod(); + + assert extensionObserver.isProcessSessionBean(); + assert extensionObserver.isAllProcessSessionBean(); + assert !otherObserver.isProcessSessionBean(); + assert !otherObserver.isAllProcessSessionBean(); + + assert extensionObserver.isAfterDeploymentValidation(); + assert extensionObserver.isAllAfterDeploymentValidation(); + assert !otherObserver.isAfterDeploymentValidation(); + assert !otherObserver.isAllAfterDeploymentValidation(); + + } } Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Horse.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Horse.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Horse.java 2009-11-05 15:06:45 UTC (rev 4698) @@ -0,0 +1,6 @@ +package org.jboss.weld.tests.extensions; + +public class Horse +{ + +} Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Horse.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/OtherObserver.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/OtherObserver.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/OtherObserver.java 2009-11-05 15:06:45 UTC (rev 4698) @@ -0,0 +1,280 @@ +package org.jboss.weld.tests.extensions; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.AfterBeanDiscovery; +import javax.enterprise.inject.spi.AfterDeploymentValidation; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; +import javax.enterprise.inject.spi.ProcessAnnotatedType; +import javax.enterprise.inject.spi.ProcessBean; +import javax.enterprise.inject.spi.ProcessInjectionTarget; +import javax.enterprise.inject.spi.ProcessManagedBean; +import javax.enterprise.inject.spi.ProcessObserverMethod; +import javax.enterprise.inject.spi.ProcessProducer; +import javax.enterprise.inject.spi.ProcessProducerField; +import javax.enterprise.inject.spi.ProcessProducerMethod; +import javax.enterprise.inject.spi.ProcessSessionBean; + +@ApplicationScoped +public class OtherObserver +{ + + private boolean allBeforeBeanDiscovery; + private boolean allAfterBeanDiscovery; + private boolean allAfterDeploymentValidation; + private boolean allProcessBean; + private boolean allProcessInjectionTarget; + private boolean allProcessManagedBean; + private boolean allProcessObserverMethod; + private boolean allProcessProducer; + private boolean allProcessProducerField; + private boolean allProcessProducerMethod; + private boolean allProcessSession; + private boolean allProcessAnnotatedType; + + private boolean beforeBeanDiscovery; + private boolean afterBeanDiscovery; + private boolean afterDeploymentValidation; + private boolean processBean; + private boolean processInjectionTarget; + private boolean processManagedBean; + private boolean processObserverMethod; + private boolean processProducer; + private boolean processProducerField; + private boolean processProducerMethod; + private boolean processSessionBean; + private boolean processAnnotatedType; + + public void observeAll(@Observes Object event) + { + if (event instanceof BeforeBeanDiscovery) + { + allBeforeBeanDiscovery = true; + } + if (event instanceof AfterBeanDiscovery) + { + allAfterBeanDiscovery = true; + } + if (event instanceof AfterDeploymentValidation) + { + allAfterDeploymentValidation = true; + } + if (event instanceof ProcessBean<?> && !(event instanceof ProcessProducerField<?, ?> || event instanceof ProcessProducerMethod<?, ?> || event instanceof ProcessManagedBean<?> || event instanceof ProcessSessionBean<?>)) + { + allProcessBean = true; + } + if (event instanceof ProcessInjectionTarget<?>) + { + allProcessInjectionTarget = true; + } + if (event instanceof ProcessManagedBean<?>) + { + allProcessManagedBean = true; + } + if (event instanceof ProcessObserverMethod<?, ?>) + { + allProcessObserverMethod = true; + } + if (event instanceof ProcessProducer<?, ?>) + { + allProcessProducer = true; + } + if (event instanceof ProcessProducerField<?, ?>) + { + allProcessProducerField = true; + } + if (event instanceof ProcessProducerMethod<?, ?>) + { + allProcessProducerMethod = true; + } + if (event instanceof ProcessSessionBean<?>) + { + allProcessSession = true; + } + if (event instanceof ProcessAnnotatedType<?>) + { + allProcessAnnotatedType = true; + } + } + + public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event) + { + beforeBeanDiscovery = true; + } + + public void observeAfterBeanDiscovery(@Observes AfterBeanDiscovery event) + { + afterBeanDiscovery = true; + } + + public void observeAfterDeploymentValidation(@Observes AfterDeploymentValidation event) + { + afterDeploymentValidation = true; + } + + public void observeProcessBean(@Observes ProcessBean<?> event) + { + processBean = true; + } + + public void observeProcessInjectionTarget(@Observes ProcessInjectionTarget<?> event) + { + processInjectionTarget = true; + } + + public void observeProcessProducer(@Observes ProcessProducer<?, ?> event) + { + processProducer = true; + } + + public void observeProcessProducerMethod(@Observes ProcessProducerMethod<?, ?> event) + { + processProducerMethod = true; + } + + public void observeProcessProducerField(@Observes ProcessProducerField<?, ?> event) + { + processProducerField = true; + } + + public void observeProcessObserverMethod(@Observes ProcessObserverMethod<?, ?> event) + { + processObserverMethod = true; + } + + public void observeProcessManagedBean(@Observes ProcessManagedBean<?> event) + { + processManagedBean = true; + } + + public void observeProcessSessionBean(@Observes ProcessSessionBean<?> event) + { + processSessionBean = true; + } + + public void observeProcessAnnotatedType(@Observes ProcessAnnotatedType<?> event) + { + processAnnotatedType = true; + } + + public boolean isAllBeforeBeanDiscovery() + { + return allBeforeBeanDiscovery; + } + + public boolean isAllAfterBeanDiscovery() + { + return allAfterBeanDiscovery; + } + + public boolean isAllAfterDeploymentValidation() + { + return allAfterDeploymentValidation; + } + + public boolean isAllProcessBean() + { + return allProcessBean; + } + + public boolean isAllProcessInjectionTarget() + { + return allProcessInjectionTarget; + } + + public boolean isAllProcessManagedBean() + { + return allProcessManagedBean; + } + + public boolean isAllProcessObserverMethod() + { + return allProcessObserverMethod; + } + + public boolean isAllProcessProducer() + { + return allProcessProducer; + } + + public boolean isAllProcessProducerField() + { + return allProcessProducerField; + } + + public boolean isAllProcessProducerMethod() + { + return allProcessProducerMethod; + } + + public boolean isAllProcessSessionBean() + { + return allProcessSession; + } + + public boolean isAllProcessAnnotatedType() + { + return allProcessAnnotatedType; + } + + public boolean isBeforeBeanDiscovery() + { + return beforeBeanDiscovery; + } + + public boolean isAfterBeanDiscovery() + { + return afterBeanDiscovery; + } + + public boolean isAfterDeploymentValidation() + { + return afterDeploymentValidation; + } + + public boolean isProcessBean() + { + return processBean; + } + + public boolean isProcessInjectionTarget() + { + return processInjectionTarget; + } + + public boolean isProcessManagedBean() + { + return processManagedBean; + } + + public boolean isProcessObserverMethod() + { + return processObserverMethod; + } + + public boolean isProcessProducer() + { + return processProducer; + } + + public boolean isProcessProducerField() + { + return processProducerField; + } + + public boolean isProcessProducerMethod() + { + return processProducerMethod; + } + + public boolean isProcessSessionBean() + { + return processSessionBean; + } + + public boolean isProcessAnnotatedType() + { + return processAnnotatedType; + } + +} Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/OtherObserver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Rat.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Rat.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Rat.java 2009-11-05 15:06:45 UTC (rev 4698) @@ -0,0 +1,6 @@ +package org.jboss.weld.tests.extensions; + +public class Rat +{ + +} Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Rat.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Special.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Special.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Special.java 2009-11-05 15:06:45 UTC (rev 4698) @@ -0,0 +1,20 @@ +package org.jboss.weld.tests.extensions; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; + +@Qualifier +(a)Retention(RetentionPolicy.RUNTIME) +@Target({FIELD, METHOD, TYPE, PARAMETER}) +public @interface Special +{ + +} Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Special.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Stable.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Stable.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Stable.java 2009-11-05 15:06:45 UTC (rev 4698) @@ -0,0 +1,15 @@ +package org.jboss.weld.tests.extensions; + +import javax.enterprise.inject.Produces; + +public class Stable +{ + + @Produces @Special Rat rat = new Rat(); + + @Produces @Special Horse produce() + { + return new Horse(); + } + +} Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Stable.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/javax.enterprise.inject.spi.Extension =================================================================== --- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/javax.enterprise.inject.spi.Extension 2009-11-05 09:38:05 UTC (rev 4697) +++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/javax.enterprise.inject.spi.Extension 2009-11-05 15:06:45 UTC (rev 4698) @@ -1 +1,2 @@ -org.jboss.weld.tests.extensions.SimpleExtension \ No newline at end of file +org.jboss.weld.tests.extensions.SimpleExtension +org.jboss.weld.tests.extensions.ExtensionObserver \ No newline at end of file

16 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits November 2009