update to new TCK and API, rename logger util classes

weld · Nov 1, 2009 · 401ec24 · 401ec24
1 parent 1563ec1
commit 401ec24
Show file tree

Hide file tree

Showing 43 changed files with 144 additions and 144 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -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>

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -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>

diff --git a/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java b/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java
@@ -578,10 +578,10 @@ public void addDecorator(DecoratorImpl<?> bean)
       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 @@ public void addInterceptor(InterceptorImpl<?> bean)
 
 
    @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 @@ private <T> Set<ObserverMethod<T>> resolveObserverMethods(Type eventType, Annota
          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 @@ public void fireEvent(Type eventType, Object event, Annotation... qualifiers)
       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);
       }     

diff --git a/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java b/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java b/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java b/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java b/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/bean/InterceptorImpl.java b/impl/src/main/java/org/jboss/weld/bean/InterceptorImpl.java
@@ -67,7 +67,7 @@ public static <T> InterceptorImpl<T> of(WeldClass<T> type, BeanManagerImpl manag
       return new InterceptorImpl(type, manager);
    }
 
-   public Set<Annotation> getInterceptorBindingTypes()
+   public Set<Annotation> getInterceptorBindings()
    {
       return interceptorBindingTypes;
    }

diff --git a/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java b/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/facade/AbstractFacadeBean.java b/impl/src/main/java/org/jboss/weld/bean/builtin/facade/AbstractFacadeBean.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java b/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseBeanProxyMethodHandler.java b/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseBeanProxyMethodHandler.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java b/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java b/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java b/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java b/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java b/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/context/DependentInstancesStore.java b/impl/src/main/java/org/jboss/weld/context/DependentInstancesStore.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/context/beanstore/AbstractAttributeBackedBeanStore.java b/impl/src/main/java/org/jboss/weld/context/beanstore/AbstractAttributeBackedBeanStore.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java b/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/conversation/ConversationEntry.java b/impl/src/main/java/org/jboss/weld/conversation/ConversationEntry.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/conversation/ConversationImpl.java b/impl/src/main/java/org/jboss/weld/conversation/ConversationImpl.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/event/AsynchronousTransactionalEventNotification.java b/impl/src/main/java/org/jboss/weld/event/AsynchronousTransactionalEventNotification.java
@@ -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;

diff --git a/impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java b/impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java
@@ -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;