[weld-commits] Weld SVN: r4707 - in core/trunk/impl: src/main/java/org/jboss/weld and 15 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Thu Nov 5 19:13:46 EST 2009
Author: pete.muir at 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>
<!-- list every enum type you would like to see checked -->
- <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;
+
+ at Retention(RUNTIME)
+ at 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;
- at BaseName("org.jboss.weld.messages.bootstrap")
+ at 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;
- at BaseName("org.jboss.weld.messages.context")
+ at 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;
- at BaseName("org.jboss.weld.messages.conversation")
+ at 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;
- at BaseName("org.jboss.weld.messages.jsf")
+ at 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;
- at BaseName("org.jboss.weld.messages.reflection")
+ at 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;
+
+ at BaseName("org.jboss.weld.messages.version")
+ at 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
More information about the weld-commits
mailing list