[weld-commits] Weld SVN: r4520 - in core/trunk: impl and 15 other directories.

Author: pete.muir(a)jboss.org Date: 2009-11-01 11:44:01 -0500 (Sun, 01 Nov 2009) New Revision: 4520 Added: core/trunk/impl/src/main/java/org/jboss/weld/messages/BeanMessage.java core/trunk/impl/src/main/java/org/jboss/weld/messages/BootstrapMessage.java core/trunk/impl/src/main/java/org/jboss/weld/messages/ContextMessage.java core/trunk/impl/src/main/java/org/jboss/weld/messages/ConversationMessage.java core/trunk/impl/src/main/java/org/jboss/weld/messages/EventMessage.java core/trunk/impl/src/main/java/org/jboss/weld/messages/JsfMessage.java core/trunk/impl/src/main/java/org/jboss/weld/messages/ReflectionMessage.java core/trunk/impl/src/main/java/org/jboss/weld/messages/UtilMessage.java core/trunk/impl/src/main/java/org/jboss/weld/util/log/Category.java Removed: core/trunk/impl/src/main/java/org/jboss/weld/messages/BeanMessages.java core/trunk/impl/src/main/java/org/jboss/weld/messages/BootstrapMessages.java core/trunk/impl/src/main/java/org/jboss/weld/messages/ContextMessages.java core/trunk/impl/src/main/java/org/jboss/weld/messages/ConversationMessages.java core/trunk/impl/src/main/java/org/jboss/weld/messages/EventMessages.java core/trunk/impl/src/main/java/org/jboss/weld/messages/JsfMessages.java core/trunk/impl/src/main/java/org/jboss/weld/messages/ReflectionMessages.java core/trunk/impl/src/main/java/org/jboss/weld/messages/UtilMessages.java core/trunk/impl/src/main/java/org/jboss/weld/util/log/Categories.java Modified: core/trunk/bom/pom.xml core/trunk/impl/pom.xml core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 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/InterceptorImpl.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/AsynchronousTransactionalEventNotification.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/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/resolution/TypeSafeInterceptorResolver.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/java/org/jboss/weld/util/log/LoggerFactory.java Log: update to new TCK and API, rename logger util classes Modified: core/trunk/bom/pom.xml =================================================================== --- core/trunk/bom/pom.xml 2009-11-01 16:38:47 UTC (rev 4519) +++ core/trunk/bom/pom.xml 2009-11-01 16:44:01 UTC (rev 4520) @@ -71,10 +71,10 @@ </repositories> <properties> - <weld.api.version>1.0-CR2</weld.api.version> + <weld.api.version>1.0-CR3</weld.api.version> <google.collections.version>1.0-rc3</google.collections.version> <javassist.version>3.11.0.GA</javassist.version> - <cdi.tck.version>1.0.0-CR3</cdi.tck.version> + <cdi.tck.version>1.0.0-CR4</cdi.tck.version> <atinject.tck.version>1.0.0-PFD-3</atinject.tck.version> <jboss.interceptor.version>1.0.0-CR5</jboss.interceptor.version> <slf4j.version>1.5.9.RC1</slf4j.version> Modified: core/trunk/impl/pom.xml =================================================================== --- core/trunk/impl/pom.xml 2009-11-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/pom.xml 2009-11-01 16:44:01 UTC (rev 4520) @@ -128,14 +128,14 @@ <configuration> <enumTypes> <!-- list every enum type you would like to see checked --> - <enumType>org.jboss.weld.messages.BeanMessages</enumType> - <enumType>org.jboss.weld.messages.BootstrapMessages</enumType> - <enumType>org.jboss.weld.messages.ContextMessages</enumType> - <enumType>org.jboss.weld.messages.ConversationMessages</enumType> - <enumType>org.jboss.weld.messages.EventMessages</enumType> - <enumType>org.jboss.weld.messages.JsfMessages</enumType> - <enumType>org.jboss.weld.messages.ReflectionMessages</enumType> - <enumType>org.jboss.weld.messages.UtilMessages</enumType> + <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> </enumTypes> </configuration> </execution> 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -578,10 +578,10 @@ decoratorResolver.clear(); } - public <T> Set<ObserverMethod<T>> resolveObserverMethods(T event, Annotation... bindings) + public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, Annotation... bindings) { Observers.checkEventObjectType(event); - return resolveObserverMethods(event.getClass(), bindings); + return this.<T>resolveObserverMethods(event.getClass(), bindings); } public void addInterceptor(InterceptorImpl<?> bean) @@ -593,7 +593,7 @@ @SuppressWarnings("unchecked") - private <T> Set<ObserverMethod<T>> resolveObserverMethods(Type eventType, Annotation... bindings) + private <T> Set<ObserverMethod<? super T>> resolveObserverMethods(Type eventType, Annotation... bindings) { checkBindingTypes(Arrays.asList(bindings)); @@ -604,7 +604,7 @@ bindingAnnotations.add(new DefaultLiteral()); } bindingAnnotations.add(new AnyLiteral()); - Set<ObserverMethod<T>> observers = new HashSet<ObserverMethod<T>>(); + Set<ObserverMethod<? super T>> observers = new HashSet<ObserverMethod<? super T>>(); Set<ObserverMethod<?>> eventObservers = observerResolver.resolve(ResolvableFactory.of(new Reflections.HierarchyDiscovery(eventType).getTypeClosureAsSet(), bindingAnnotations, null)); for (ObserverMethod<?> observer : eventObservers) { @@ -834,9 +834,9 @@ notifyObservers(event, resolveObserverMethods(eventType, qualifiers)); } - private <T> void notifyObservers(final T event, final Set<ObserverMethod<T>> observers) + private <T> void notifyObservers(final T event, final Set<ObserverMethod<? super T>> observers) { - for (ObserverMethod<T> observer : observers) + for (ObserverMethod<? super T> observer : observers) { observer.notify(event); } 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,13 +16,13 @@ */ package org.jboss.weld.bean; -import static org.jboss.weld.messages.BeanMessages.CREATING_BEAN; -import static org.jboss.weld.messages.BeanMessages.QUALIFIERS_USED; -import static org.jboss.weld.messages.BeanMessages.USING_DEFAULT_NAME; -import static org.jboss.weld.messages.BeanMessages.USING_DEFAULT_QUALIFIER; -import static org.jboss.weld.messages.BeanMessages.USING_NAME; -import static org.jboss.weld.messages.BeanMessages.USING_SCOPE_FROM_STEREOTYPE; -import static org.jboss.weld.util.log.Categories.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 java.lang.annotation.Annotation; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,9 +16,9 @@ */ package org.jboss.weld.bean; -import static org.jboss.weld.messages.BeanMessages.USING_DEFAULT_SCOPE; -import static org.jboss.weld.messages.BeanMessages.USING_SCOPE; -import static org.jboss.weld.util.log.Categories.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 java.lang.annotation.Annotation; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,9 +16,9 @@ */ package org.jboss.weld.bean; -import static org.jboss.weld.messages.BeanMessages.USING_DEFAULT_SCOPE; -import static org.jboss.weld.messages.BeanMessages.USING_SCOPE; -import static org.jboss.weld.util.log.Categories.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 java.lang.annotation.Annotation; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,8 +16,8 @@ */ package org.jboss.weld.bean; -import static org.jboss.weld.messages.BeanMessages.CIRCULAR_CALL; -import static org.jboss.weld.util.log.Categories.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 java.lang.reflect.Member; Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/InterceptorImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/InterceptorImpl.java 2009-11-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/InterceptorImpl.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -67,7 +67,7 @@ return new InterceptorImpl(type, manager); } - public Set<Annotation> getInterceptorBindingTypes() + public Set<Annotation> getInterceptorBindings() { return interceptorBindingTypes; } 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,8 +16,8 @@ */ package org.jboss.weld.bean; -import static org.jboss.weld.messages.BeanMessages.ERROR_DESTROYING; -import static org.jboss.weld.util.log.Categories.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 java.util.ArrayList; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/AbstractFacadeBean.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,8 +16,8 @@ */ package org.jboss.weld.bean.builtin.facade; -import static org.jboss.weld.messages.BeanMessages.DYNAMIC_LOOKUP_OF_BUILT_IN_NOT_ALLOWED; -import static org.jboss.weld.util.log.Categories.BEAN; +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 java.lang.annotation.Annotation; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,8 +16,8 @@ */ package org.jboss.weld.bean.proxy; -import static org.jboss.weld.messages.BeanMessages.CALL_PROXIED_METHOD; -import static org.jboss.weld.util.log.Categories.BEAN; +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 java.io.Serializable; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseBeanProxyMethodHandler.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,9 +16,9 @@ */ package org.jboss.weld.bean.proxy; -import static org.jboss.weld.messages.BeanMessages.CALL_PROXIED_METHOD; -import static org.jboss.weld.messages.BeanMessages.CREATED_SESSION_BEAN_PROXY; -import static org.jboss.weld.util.log.Categories.BEAN; +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 java.io.Serializable; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,11 +16,11 @@ */ package org.jboss.weld.bootstrap; -import static org.jboss.weld.messages.BootstrapMessages.FOUND_BEAN; -import static org.jboss.weld.messages.BootstrapMessages.FOUND_DECORATOR; -import static org.jboss.weld.messages.BootstrapMessages.FOUND_INTERCEPTOR; -import static org.jboss.weld.messages.BootstrapMessages.FOUND_OBSERVER_METHOD; -import static org.jboss.weld.util.log.Categories.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 java.lang.reflect.Member; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,10 +16,10 @@ */ package org.jboss.weld.bootstrap; -import static org.jboss.weld.messages.BootstrapMessages.ENABLED_DECORATORS; -import static org.jboss.weld.messages.BootstrapMessages.ENABLED_INTERCEPTORS; -import static org.jboss.weld.messages.BootstrapMessages.ENABLED_POLICIES; -import static org.jboss.weld.util.log.Categories.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 org.jboss.weld.BeanManagerImpl; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,10 +16,10 @@ */ package org.jboss.weld.bootstrap; -import static org.jboss.weld.messages.BootstrapMessages.JTA_UNAVAILABLE; -import static org.jboss.weld.messages.BootstrapMessages.VALIDATING_BEANS; -import static org.jboss.weld.messages.BootstrapMessages.VERSION; -import static org.jboss.weld.util.log.Categories.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 java.util.HashMap; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,9 +16,9 @@ */ package org.jboss.weld.context; -import static org.jboss.weld.messages.ContextMessages.CONTEXTUAL_INSTANCE_REMOVED; -import static org.jboss.weld.messages.ContextMessages.CONTEXT_CLEARED; -import static org.jboss.weld.util.log.Categories.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 java.lang.annotation.Annotation; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -22,13 +22,13 @@ */ package org.jboss.weld.context; -import static org.jboss.weld.messages.ContextMessages.APPLICATION_ENDED; -import static org.jboss.weld.messages.ContextMessages.APPLICATION_STARTED; -import static org.jboss.weld.messages.ContextMessages.REQUEST_ENDED; -import static org.jboss.weld.messages.ContextMessages.REQUEST_STARTED; -import static org.jboss.weld.messages.ContextMessages.SESSION_ENDED; -import static org.jboss.weld.messages.ContextMessages.SESSION_RESTORED; -import static org.jboss.weld.util.log.Categories.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 org.jboss.weld.Container; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/context/DependentInstancesStore.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,8 +16,8 @@ */ package org.jboss.weld.context; -import static org.jboss.weld.messages.ContextMessages.DEPENDENT_INSTANCE_ATTACHED; -import static org.jboss.weld.util.log.Categories.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 java.io.Serializable; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/context/beanstore/AbstractAttributeBackedBeanStore.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,10 +16,10 @@ */ package org.jboss.weld.context.beanstore; -import static org.jboss.weld.messages.ContextMessages.CONTEXTUAL_INSTANCE_ADDED; -import static org.jboss.weld.messages.ContextMessages.CONTEXTUAL_INSTANCE_FOUND; -import static org.jboss.weld.messages.ContextMessages.CONTEXT_CLEARED; -import static org.jboss.weld.util.log.Categories.CONTEXT; +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 java.util.ArrayList; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -22,17 +22,17 @@ */ package org.jboss.weld.conversation; -import static org.jboss.weld.messages.ConversationMessages.CLEANING_UP_CONVERSATION; -import static org.jboss.weld.messages.ConversationMessages.CONVERSATION_LOCK_UNAVAILABLE; -import static org.jboss.weld.messages.ConversationMessages.CONVERSATION_SWITCHED; -import static org.jboss.weld.messages.ConversationMessages.CONVERSATION_TERMINATION_SCHEDULED; -import static org.jboss.weld.messages.ConversationMessages.DESTROY_ALL_LRC; -import static org.jboss.weld.messages.ConversationMessages.DESTROY_LRC; -import static org.jboss.weld.messages.ConversationMessages.DESTROY_TRANSIENT_COVERSATION; -import static org.jboss.weld.messages.ConversationMessages.LRC_COUNT; -import static org.jboss.weld.messages.ConversationMessages.NO_CONVERSATION_TO_RESTORE; -import static org.jboss.weld.messages.ConversationMessages.UNABLE_TO_RESTORE_CONVERSATION; -import static org.jboss.weld.util.log.Categories.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 java.util.Collections; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/conversation/ConversationEntry.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,13 +16,13 @@ */ package org.jboss.weld.conversation; -import static org.jboss.weld.messages.ConversationMessages.CONVERSATION_LOCKED; -import static org.jboss.weld.messages.ConversationMessages.CONVERSATION_TERMINATION_CANCELLATION_FAILED; -import static org.jboss.weld.messages.ConversationMessages.CONVERSATION_TERMINATION_CANCELLED; -import static org.jboss.weld.messages.ConversationMessages.CONVERSATION_UNAVAILBLE; -import static org.jboss.weld.messages.ConversationMessages.CONVERSATION_UNLOCKED; -import static org.jboss.weld.messages.ConversationMessages.ILLEGAL_CONVERSATION_UNLOCK_ATTEMPT; -import static org.jboss.weld.util.log.Categories.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 java.util.concurrent.Future; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/conversation/ConversationImpl.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,10 +16,10 @@ */ package org.jboss.weld.conversation; -import static org.jboss.weld.messages.ConversationMessages.DEMOTED_LRC; -import static org.jboss.weld.messages.ConversationMessages.PROMOTED_TRANSIENT; -import static org.jboss.weld.messages.ConversationMessages.SWITCHED_CONVERSATION; -import static org.jboss.weld.util.log.Categories.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 java.io.Serializable; Modified: 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/event/AsynchronousTransactionalEventNotification.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,9 +16,9 @@ */ package org.jboss.weld.event; -import static org.jboss.weld.messages.EventMessages.ASYNC_OBSERVER_FAILURE; -import static org.jboss.weld.messages.EventMessages.ASYNC_TX_FIRE; -import static org.jboss.weld.util.log.Categories.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; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,9 +16,9 @@ */ package org.jboss.weld.event; -import static org.jboss.weld.messages.EventMessages.ASYNC_FIRE; -import static org.jboss.weld.messages.EventMessages.ASYNC_OBSERVER_FAILURE; -import static org.jboss.weld.util.log.Categories.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 org.jboss.weld.Container; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,9 +16,9 @@ */ package org.jboss.weld.jsf; -import static org.jboss.weld.messages.JsfMessages.FOUND_CONVERSATION_FROM_REQUEST; -import static org.jboss.weld.messages.JsfMessages.RESUMING_CONVERSATION; -import static org.jboss.weld.util.log.Categories.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 javax.enterprise.util.AnnotationLiteral; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -25,10 +25,10 @@ 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.JsfMessages.CLEANING_UP_CONVERSATION; -import static org.jboss.weld.messages.JsfMessages.INITIATING_CONVERSATION; -import static org.jboss.weld.messages.JsfMessages.SKIPPING_CLEANING_UP_CONVERSATION; -import static org.jboss.weld.util.log.Categories.JSF; +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 javax.faces.context.FacesContext; Copied: core/trunk/impl/src/main/java/org/jboss/weld/messages/BeanMessage.java (from rev 4492, core/trunk/impl/src/main/java/org/jboss/weld/messages/BeanMessages.java) =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/BeanMessage.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/BeanMessage.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -0,0 +1,35 @@ +package org.jboss.weld.messages; + +import ch.qos.cal10n.BaseName; +import ch.qos.cal10n.Locale; +import ch.qos.cal10n.LocaleData; + +(a)BaseName(&quot;org.jboss.weld.messages.bean&quot;) +@LocaleData({ + @Locale("en") +}) +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 + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/messages/BeanMessage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Deleted: core/trunk/impl/src/main/java/org/jboss/weld/messages/BeanMessages.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/BeanMessages.java 2009-11-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/BeanMessages.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -1,35 +0,0 @@ -package org.jboss.weld.messages; - -import ch.qos.cal10n.BaseName; -import ch.qos.cal10n.Locale; -import ch.qos.cal10n.LocaleData; - -(a)BaseName(&quot;org.jboss.weld.messages.bean&quot;) -@LocaleData({ - @Locale("en") -}) -public enum BeanMessages -{ - - 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 - -} Copied: core/trunk/impl/src/main/java/org/jboss/weld/messages/BootstrapMessage.java (from rev 4492, core/trunk/impl/src/main/java/org/jboss/weld/messages/BootstrapMessages.java) =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/BootstrapMessage.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/BootstrapMessage.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -0,0 +1,25 @@ +package org.jboss.weld.messages; + +import ch.qos.cal10n.BaseName; +import ch.qos.cal10n.Locale; +import ch.qos.cal10n.LocaleData; + +(a)BaseName(&quot;org.jboss.weld.messages.bootstrap&quot;) +@LocaleData({ + @Locale("en") +}) +public enum BootstrapMessage +{ + + VALIDATING_BEANS, + JTA_UNAVAILABLE, + VERSION, + ENABLED_POLICIES, + ENABLED_DECORATORS, + ENABLED_INTERCEPTORS, + FOUND_BEAN, + FOUND_INTERCEPTOR, + FOUND_DECORATOR, + FOUND_OBSERVER_METHOD, + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/messages/BootstrapMessage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Deleted: core/trunk/impl/src/main/java/org/jboss/weld/messages/BootstrapMessages.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/BootstrapMessages.java 2009-11-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/BootstrapMessages.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -1,25 +0,0 @@ -package org.jboss.weld.messages; - -import ch.qos.cal10n.BaseName; -import ch.qos.cal10n.Locale; -import ch.qos.cal10n.LocaleData; - -(a)BaseName(&quot;org.jboss.weld.messages.bootstrap&quot;) -@LocaleData({ - @Locale("en") -}) -public enum BootstrapMessages -{ - - VALIDATING_BEANS, - JTA_UNAVAILABLE, - VERSION, - ENABLED_POLICIES, - ENABLED_DECORATORS, - ENABLED_INTERCEPTORS, - FOUND_BEAN, - FOUND_INTERCEPTOR, - FOUND_DECORATOR, - FOUND_OBSERVER_METHOD, - -} Copied: core/trunk/impl/src/main/java/org/jboss/weld/messages/ContextMessage.java (from rev 4492, core/trunk/impl/src/main/java/org/jboss/weld/messages/ContextMessages.java) =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/ContextMessage.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/ContextMessage.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -0,0 +1,26 @@ +package org.jboss.weld.messages; + +import ch.qos.cal10n.BaseName; +import ch.qos.cal10n.Locale; +import ch.qos.cal10n.LocaleData; + +(a)BaseName(&quot;org.jboss.weld.messages.context&quot;) +@LocaleData({ + @Locale("en") +}) +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 + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/messages/ContextMessage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Deleted: core/trunk/impl/src/main/java/org/jboss/weld/messages/ContextMessages.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/ContextMessages.java 2009-11-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/ContextMessages.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -1,26 +0,0 @@ -package org.jboss.weld.messages; - -import ch.qos.cal10n.BaseName; -import ch.qos.cal10n.Locale; -import ch.qos.cal10n.LocaleData; - -(a)BaseName(&quot;org.jboss.weld.messages.context&quot;) -@LocaleData({ - @Locale("en") -}) -public enum ContextMessages -{ - - 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 - -} Copied: core/trunk/impl/src/main/java/org/jboss/weld/messages/ConversationMessage.java (from rev 4492, core/trunk/impl/src/main/java/org/jboss/weld/messages/ConversationMessages.java) =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/ConversationMessage.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/ConversationMessage.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -0,0 +1,35 @@ +package org.jboss.weld.messages; + +import ch.qos.cal10n.BaseName; +import ch.qos.cal10n.Locale; +import ch.qos.cal10n.LocaleData; + +(a)BaseName(&quot;org.jboss.weld.messages.conversation&quot;) +@LocaleData({ + @Locale("en") +}) +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 + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/messages/ConversationMessage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Deleted: core/trunk/impl/src/main/java/org/jboss/weld/messages/ConversationMessages.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/ConversationMessages.java 2009-11-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/ConversationMessages.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -1,35 +0,0 @@ -package org.jboss.weld.messages; - -import ch.qos.cal10n.BaseName; -import ch.qos.cal10n.Locale; -import ch.qos.cal10n.LocaleData; - -(a)BaseName(&quot;org.jboss.weld.messages.conversation&quot;) -@LocaleData({ - @Locale("en") -}) -public enum ConversationMessages -{ - - 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 - -} Copied: core/trunk/impl/src/main/java/org/jboss/weld/messages/EventMessage.java (from rev 4492, core/trunk/impl/src/main/java/org/jboss/weld/messages/EventMessages.java) =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/EventMessage.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/EventMessage.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -0,0 +1,18 @@ +package org.jboss.weld.messages; + +import ch.qos.cal10n.BaseName; +import ch.qos.cal10n.Locale; +import ch.qos.cal10n.LocaleData; + +(a)BaseName(&quot;org.jboss.weld.messages.event&quot;) +@LocaleData({ + @Locale("en") +}) +public enum EventMessage +{ + + ASYNC_FIRE, + ASYNC_OBSERVER_FAILURE, + ASYNC_TX_FIRE + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/messages/EventMessage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Deleted: core/trunk/impl/src/main/java/org/jboss/weld/messages/EventMessages.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/EventMessages.java 2009-11-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/EventMessages.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -1,18 +0,0 @@ -package org.jboss.weld.messages; - -import ch.qos.cal10n.BaseName; -import ch.qos.cal10n.Locale; -import ch.qos.cal10n.LocaleData; - -(a)BaseName(&quot;org.jboss.weld.messages.event&quot;) -@LocaleData({ - @Locale("en") -}) -public enum EventMessages -{ - - ASYNC_FIRE, - ASYNC_OBSERVER_FAILURE, - ASYNC_TX_FIRE - -} Copied: core/trunk/impl/src/main/java/org/jboss/weld/messages/JsfMessage.java (from rev 4492, core/trunk/impl/src/main/java/org/jboss/weld/messages/JsfMessages.java) =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/JsfMessage.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/JsfMessage.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -0,0 +1,20 @@ +package org.jboss.weld.messages; + +import ch.qos.cal10n.BaseName; +import ch.qos.cal10n.Locale; +import ch.qos.cal10n.LocaleData; + +(a)BaseName(&quot;org.jboss.weld.messages.jsf&quot;) +@LocaleData({ + @Locale("en") +}) +public enum JsfMessage +{ + + CLEANING_UP_CONVERSATION, + SKIPPING_CLEANING_UP_CONVERSATION, + INITIATING_CONVERSATION, + FOUND_CONVERSATION_FROM_REQUEST, + RESUMING_CONVERSATION + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/messages/JsfMessage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Deleted: core/trunk/impl/src/main/java/org/jboss/weld/messages/JsfMessages.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/JsfMessages.java 2009-11-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/JsfMessages.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -1,20 +0,0 @@ -package org.jboss.weld.messages; - -import ch.qos.cal10n.BaseName; -import ch.qos.cal10n.Locale; -import ch.qos.cal10n.LocaleData; - -(a)BaseName(&quot;org.jboss.weld.messages.jsf&quot;) -@LocaleData({ - @Locale("en") -}) -public enum JsfMessages -{ - - CLEANING_UP_CONVERSATION, - SKIPPING_CLEANING_UP_CONVERSATION, - INITIATING_CONVERSATION, - FOUND_CONVERSATION_FROM_REQUEST, - RESUMING_CONVERSATION - -} Copied: core/trunk/impl/src/main/java/org/jboss/weld/messages/ReflectionMessage.java (from rev 4492, core/trunk/impl/src/main/java/org/jboss/weld/messages/ReflectionMessages.java) =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/ReflectionMessage.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/ReflectionMessage.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -0,0 +1,21 @@ +package org.jboss.weld.messages; + +import ch.qos.cal10n.BaseName; +import ch.qos.cal10n.Locale; +import ch.qos.cal10n.LocaleData; + +(a)BaseName(&quot;org.jboss.weld.messages.reflection&quot;) +@LocaleData({ + @Locale("en") +}) +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 + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/messages/ReflectionMessage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Deleted: core/trunk/impl/src/main/java/org/jboss/weld/messages/ReflectionMessages.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/ReflectionMessages.java 2009-11-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/ReflectionMessages.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -1,21 +0,0 @@ -package org.jboss.weld.messages; - -import ch.qos.cal10n.BaseName; -import ch.qos.cal10n.Locale; -import ch.qos.cal10n.LocaleData; - -(a)BaseName(&quot;org.jboss.weld.messages.reflection&quot;) -@LocaleData({ - @Locale("en") -}) -public enum ReflectionMessages -{ - - 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 - -} Copied: core/trunk/impl/src/main/java/org/jboss/weld/messages/UtilMessage.java (from rev 4492, core/trunk/impl/src/main/java/org/jboss/weld/messages/UtilMessages.java) =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/UtilMessage.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/UtilMessage.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -0,0 +1,17 @@ +package org.jboss.weld.messages; + +import ch.qos.cal10n.BaseName; +import ch.qos.cal10n.Locale; +import ch.qos.cal10n.LocaleData; + +(a)BaseName(&quot;org.jboss.weld.messages.util&quot;) +@LocaleData({ + @Locale("en") +}) +public enum UtilMessage +{ + + SERVICE_LOADER_LOADING_ERROR, + SECURITY_EXCEPTION_SCANNING + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/messages/UtilMessage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Deleted: core/trunk/impl/src/main/java/org/jboss/weld/messages/UtilMessages.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/UtilMessages.java 2009-11-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/UtilMessages.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -1,17 +0,0 @@ -package org.jboss.weld.messages; - -import ch.qos.cal10n.BaseName; -import ch.qos.cal10n.Locale; -import ch.qos.cal10n.LocaleData; - -(a)BaseName(&quot;org.jboss.weld.messages.util&quot;) -@LocaleData({ - @Locale("en") -}) -public enum UtilMessages -{ - - SERVICE_LOADER_LOADING_ERROR, - SECURITY_EXCEPTION_SCANNING - -} 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/AnnotationModel.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,8 +16,8 @@ */ package org.jboss.weld.metadata.cache; -import static org.jboss.weld.messages.ReflectionMessages.MISSING_RETENTION; -import static org.jboss.weld.util.log.Categories.REFLECTION; +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 java.lang.annotation.Annotation; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -17,10 +17,10 @@ package org.jboss.weld.metadata.cache; -import static org.jboss.weld.messages.ReflectionMessages.MISSING_TARGET; -import static org.jboss.weld.messages.ReflectionMessages.MISSING_TARGET_TYPE_METHOD_OR_TARGET_TYPE; -import static org.jboss.weld.messages.ReflectionMessages.TARGET_TYPE_METHOD_INHERITS_FROM_TARGET_TYPE; -import static org.jboss.weld.util.log.Categories.REFLECTION; +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 java.lang.annotation.Annotation; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/ScopeModel.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -19,9 +19,9 @@ 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.ReflectionMessages.MISSING_TARGET; -import static org.jboss.weld.messages.ReflectionMessages.MISSING_TARGET_METHOD_FIELD_TYPE; -import static org.jboss.weld.util.log.Categories.REFLECTION; +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 java.lang.annotation.Annotation; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/StereotypeModel.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -19,9 +19,9 @@ 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.ReflectionMessages.MISSING_TARGET; -import static org.jboss.weld.messages.ReflectionMessages.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.Categories.REFLECTION; +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 java.lang.annotation.Annotation; Modified: core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeInterceptorResolver.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeInterceptorResolver.java 2009-11-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeInterceptorResolver.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -45,8 +45,8 @@ protected boolean matches(InterceptorResolvable resolvable, InterceptorImpl<?> bean) { return bean.intercepts(resolvable.getInterceptionType()) - && bean.getInterceptorBindingTypes().size() > 0 - && Beans.containsAllInterceptionBindings(bean.getInterceptorBindingTypes(), resolvable.getQualifiers(), getManager()) + && bean.getInterceptorBindings().size() > 0 + && Beans.containsAllInterceptionBindings(bean.getInterceptorBindings(), resolvable.getQualifiers(), getManager()) && getManager().getEnabledInterceptorClasses().contains(bean.getType()); } 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,14 +16,14 @@ */ package org.jboss.weld.util; -import static org.jboss.weld.messages.BeanMessages.FOUND_DEFAULT_CONSTRUCTOR; -import static org.jboss.weld.messages.BeanMessages.FOUND_INJECTABLE_CONSTRUCTORS; -import static org.jboss.weld.messages.BeanMessages.FOUND_ONE_INJECTABLE_CONSTRUCTOR; -import static org.jboss.weld.messages.BeanMessages.FOUND_ONE_POST_CONSTRUCT_METHOD; -import static org.jboss.weld.messages.BeanMessages.FOUND_ONE_PRE_DESTROY_METHOD; -import static org.jboss.weld.messages.BeanMessages.FOUND_POST_CONSTRUCT_METHODS; -import static org.jboss.weld.messages.BeanMessages.FOUND_PRE_DESTROY_METHODS; -import static org.jboss.weld.util.log.Categories.BEAN; +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 java.lang.annotation.Annotation; 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-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/util/Reflections.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -16,8 +16,8 @@ */ package org.jboss.weld.util; -import static org.jboss.weld.messages.UtilMessages.SECURITY_EXCEPTION_SCANNING; -import static org.jboss.weld.util.log.Categories.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 java.beans.Introspector; Deleted: core/trunk/impl/src/main/java/org/jboss/weld/util/log/Categories.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/log/Categories.java 2009-11-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/util/log/Categories.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -1,35 +0,0 @@ -package org.jboss.weld.util.log; - -public enum Categories -{ - - BOOTSTRAP("WeldBootstrap"), - UTIL("WeldUtilities"), - BEAN("Bean"), - SERVLET("Servlet"), - REFLECTION("Reflection"), - JSF("JSF"), - EVENT("Event"), - CONVERSATION("Conversation"), - CONTEXT("Context"); - - private static final String LOG_PREFIX = "org.jboss.weld."; - - private final String name; - - Categories(String name) - { - this.name = createName(name); - } - - String getName() - { - return name; - } - - private static String createName(String name) - { - return new StringBuilder().append(LOG_PREFIX).append(name).toString(); - } - -} Copied: core/trunk/impl/src/main/java/org/jboss/weld/util/log/Category.java (from rev 4492, core/trunk/impl/src/main/java/org/jboss/weld/util/log/Categories.java) =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/log/Category.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/util/log/Category.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -0,0 +1,35 @@ +package org.jboss.weld.util.log; + +public enum Category +{ + + BOOTSTRAP("Bootstrap"), + UTIL("Utilities"), + BEAN("Bean"), + SERVLET("Servlet"), + REFLECTION("Reflection"), + JSF("JSF"), + EVENT("Event"), + CONVERSATION("Conversation"), + CONTEXT("Context"); + + private static final String LOG_PREFIX = "Weld/"; + + private final String name; + + Category(String name) + { + this.name = createName(name); + } + + String getName() + { + return name; + } + + private static String createName(String name) + { + return new StringBuilder().append(LOG_PREFIX).append(name).toString(); + } + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/util/log/Category.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/log/LoggerFactory.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/log/LoggerFactory.java 2009-11-01 16:38:47 UTC (rev 4519) +++ core/trunk/impl/src/main/java/org/jboss/weld/util/log/LoggerFactory.java 2009-11-01 16:44:01 UTC (rev 4520) @@ -20,12 +20,12 @@ this.locLoggerFactory = new LocLoggerFactory(messageConveyor); } - public LocLogger getLogger(Categories category) + public LocLogger getLogger(Category category) { return locLoggerFactory.getLocLogger(category.getName()); } - public XLogger getXLogger(Categories category) + public XLogger getXLogger(Category category) { return XLoggerFactory.getXLogger(category.getName()); }