[weld-commits] Weld SVN: r5111 - in core/trunk/impl/src/main: java/org/jboss/weld/injection and 9 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Mon Nov 23 03:18:21 EST 2009
Author: dallen6
Date: 2009-11-23 03:18:20 -0500 (Mon, 23 Nov 2009)
New Revision: 5111
Added:
core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanManagerMessage.java
core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/MetadataMessage.java
core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ResolutionMessage.java
core/trunk/impl/src/main/resources/org/jboss/weld/messages/beanmanager_en.properties
core/trunk/impl/src/main/resources/org/jboss/weld/messages/metadata_en.properties
core/trunk/impl/src/main/resources/org/jboss/weld/messages/resolution_en.properties
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/WeldException.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/Exceptions.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/AnnotationStore.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.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/metadata/cache/AnnotationModel.java
core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/BindingTypeModel.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/MergedStereotypes.java
core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/StereotypeModel.java
core/trunk/impl/src/main/java/org/jboss/weld/resolution/ResolvableWeldClass.java
core/trunk/impl/src/main/java/org/jboss/weld/resources/ManagerObjectFactory.java
core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletHelper.java
core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java
core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java
core/trunk/impl/src/main/resources/org/jboss/weld/messages/jsf_en.properties
core/trunk/impl/src/main/resources/org/jboss/weld/messages/reflection_en.properties
core/trunk/impl/src/main/resources/org/jboss/weld/messages/servlet_en.properties
Log:
Additional exception message conversion for localization
Modified: core/trunk/impl/src/main/java/org/jboss/weld/WeldException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/WeldException.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/WeldException.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -32,6 +32,11 @@
// Exception messages
private static final IMessageConveyor messageConveyer = loggerFactory().getMessageConveyor();
+ public WeldException(Throwable throwable)
+ {
+ super(throwable);
+ }
+
public <E extends Enum<?>> WeldException(E key, Object... args)
{
super(messageConveyer.getMessage(key, args));
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -17,8 +17,8 @@
package org.jboss.weld.injection;
import static org.jboss.weld.injection.Exceptions.rethrowException;
+import static org.jboss.weld.logging.messages.BeanMessage.PROXY_REQUIRED;
-import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
import java.io.ObjectStreamException;
import java.io.Serializable;
@@ -37,6 +37,7 @@
import javax.enterprise.inject.spi.Bean;
import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.InvalidObjectException;
import org.jboss.weld.introspector.ConstructorSignature;
import org.jboss.weld.introspector.ForwardingWeldConstructor;
import org.jboss.weld.introspector.WeldClass;
@@ -216,7 +217,7 @@
private void readObject(ObjectInputStream stream) throws InvalidObjectException
{
- throw new InvalidObjectException("Proxy required");
+ throw new InvalidObjectException(PROXY_REQUIRED);
}
private static class SerializationProxy<T> extends WeldInjectionPointSerializationProxy<T, Constructor<T>>
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/Exceptions.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/Exceptions.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/Exceptions.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -20,6 +20,8 @@
import javax.enterprise.inject.CreationException;
+import org.jboss.weld.WeldException;
+
class Exceptions
{
@@ -38,11 +40,11 @@
}
catch (InstantiationException e1)
{
- throw new RuntimeException(e1);
+ throw new WeldException(e1);
}
catch (IllegalAccessException e1)
{
- throw new RuntimeException(e1);
+ throw new WeldException(e1);
}
e.initCause(t);
throw e;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -17,8 +17,8 @@
package org.jboss.weld.injection;
import static org.jboss.weld.injection.Exceptions.rethrowException;
+import static org.jboss.weld.logging.messages.BeanMessage.PROXY_REQUIRED;
-import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
import java.io.ObjectStreamException;
import java.io.Serializable;
@@ -37,6 +37,7 @@
import org.jboss.interceptor.util.InterceptionUtils;
import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.InvalidObjectException;
import org.jboss.weld.introspector.ForwardingWeldField;
import org.jboss.weld.introspector.WeldField;
@@ -148,7 +149,7 @@
private void readObject(ObjectInputStream stream) throws InvalidObjectException
{
- throw new InvalidObjectException("Proxy required");
+ throw new InvalidObjectException(PROXY_REQUIRED);
}
private static class SerializationProxy<T> extends WeldInjectionPointSerializationProxy<T, Field>
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -17,8 +17,8 @@
package org.jboss.weld.injection;
import static org.jboss.weld.injection.Exceptions.rethrowException;
+import static org.jboss.weld.logging.messages.BeanMessage.PROXY_REQUIRED;
-import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
import java.io.ObjectStreamException;
import java.lang.annotation.Annotation;
@@ -36,6 +36,7 @@
import javax.enterprise.inject.spi.Bean;
import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.InvalidObjectException;
import org.jboss.weld.introspector.ForwardingWeldMethod;
import org.jboss.weld.introspector.MethodSignature;
import org.jboss.weld.introspector.WeldMethod;
@@ -307,7 +308,7 @@
private void readObject(ObjectInputStream stream) throws InvalidObjectException
{
- throw new InvalidObjectException("Proxy required");
+ throw new InvalidObjectException(PROXY_REQUIRED);
}
private static class SerializationProxy<T> extends WeldInjectionPointSerializationProxy<T, Method>
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/AnnotationStore.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/AnnotationStore.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/AnnotationStore.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -17,6 +17,8 @@
package org.jboss.weld.introspector;
import static org.jboss.weld.introspector.WeldAnnotated.MAPPED_METAANNOTATIONS;
+import static org.jboss.weld.logging.messages.ReflectionMessage.ANNOTATION_MAP_NULL;
+import static org.jboss.weld.logging.messages.ReflectionMessage.DECLARED_ANNOTATION_MAP_NULL;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
@@ -30,7 +32,9 @@
import javax.inject.Qualifier;
+import org.jboss.weld.WeldException;
import org.jboss.weld.literal.DefaultLiteral;
+import org.jboss.weld.logging.messages.ReflectionMessage;
import org.jboss.weld.metadata.TypeStore;
import com.google.common.base.Supplier;
@@ -155,7 +159,7 @@
{
if (annotationMap == null)
{
- throw new NullPointerException("annotationMap cannot be null");
+ throw new WeldException(ANNOTATION_MAP_NULL);
}
this.annotationMap = annotationMap;
this.annotationSet = new HashSet<Annotation>();
@@ -176,7 +180,7 @@
if (declaredAnnotationMap == null)
{
- throw new NullPointerException("declaredAnnotationMap cannot be null");
+ throw new WeldException(DECLARED_ANNOTATION_MAP_NULL);
}
this.declaredAnnotationMap = declaredAnnotationMap;
this.declaredAnnotationSet = new HashSet<Annotation>();
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -16,12 +16,15 @@
*/
package org.jboss.weld.introspector.jlr;
+import static org.jboss.weld.logging.messages.ReflectionMessage.UNABLE_TO_GET_PARAMETER_NAME;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Set;
import javax.enterprise.inject.spi.AnnotatedCallable;
+import org.jboss.weld.ForbiddenArgumentException;
import org.jboss.weld.introspector.AnnotationStore;
import org.jboss.weld.introspector.WeldCallable;
import org.jboss.weld.introspector.WeldParameter;
@@ -133,7 +136,7 @@
*/
public String getName()
{
- throw new IllegalArgumentException("Unable to determine name of parameter");
+ throw new ForbiddenArgumentException(UNABLE_TO_GET_PARAMETER_NAME);
}
/**
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-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -19,6 +19,7 @@
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.IMPROPER_ENVIRONMENT;
import static org.jboss.weld.logging.messages.JsfMessage.RESUMING_CONVERSATION;
import javax.enterprise.util.AnnotationLiteral;
@@ -28,6 +29,7 @@
import org.jboss.weld.BeanManagerImpl;
import org.jboss.weld.Container;
+import org.jboss.weld.ForbiddenStateException;
import org.jboss.weld.conversation.ConversationIdName;
import org.jboss.weld.servlet.ServletHelper;
import org.jboss.weld.util.Reflections;
@@ -116,7 +118,7 @@
}
else
{
- throw new IllegalStateException("Weld doesn not support using JSF in an non-servlet environment");
+ throw new ForbiddenStateException(IMPROPER_ENVIRONMENT);
}
}
Added: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanManagerMessage.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanManagerMessage.java (rev 0)
+++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanManagerMessage.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat, Inc. and/or its affiliates, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.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.beanmanager")
+ at LocaleData({
+ @Locale("en")
+})
+/**
+ * Log messages for bean manager and related support classes.
+ *
+ * Message IDs: 001300 - 001399
+ *
+ * @author David Allen
+ *
+ */
+public enum BeanManagerMessage
+{
+ @MessageId("001300") CANNOT_LOCATE_BEAN_MANAGER
+}
Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanManagerMessage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/JsfMessage.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/JsfMessage.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/JsfMessage.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -22,6 +22,7 @@
@MessageId("000501") SKIPPING_CLEANING_UP_CONVERSATION,
@MessageId("000502") INITIATING_CONVERSATION,
@MessageId("000503") FOUND_CONVERSATION_FROM_REQUEST,
- @MessageId("000504") RESUMING_CONVERSATION;
+ @MessageId("000504") RESUMING_CONVERSATION,
+ @MessageId("000505") IMPROPER_ENVIRONMENT;
}
Added: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/MetadataMessage.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/MetadataMessage.java (rev 0)
+++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/MetadataMessage.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat, Inc. and/or its affiliates, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.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.metadata")
+ at LocaleData({
+ @Locale("en")
+})
+/**
+ * Log messages for Meta Data.
+ *
+ * Message IDs: 001100 - 001199
+ *
+ * @author David Allen
+ *
+ */
+public enum MetadataMessage
+{
+ @MessageId("001100") META_ANNOTATION_ON_WRONG_TYPE,
+ @MessageId("001101") NON_BINDING_MEMBER_TYPE,
+ @MessageId("001102") STEREOTYPE_NOT_REGISTERED,
+ @MessageId("001103") QUALIFIER_ON_STEREOTYPE,
+ @MessageId("001104") VALUE_ON_NAMED_STEREOTYPE,
+ @MessageId("001105") MULTIPLE_SCOPES;
+}
Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/MetadataMessage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ReflectionMessage.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ReflectionMessage.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ReflectionMessage.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -24,6 +24,9 @@
@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;
+ @MessageId("000605") MISSING_TARGET_METHOD_FIELD_TYPE_PARAMETER_OR_TARGET_METHOD_TYPE_OR_TARGET_METHOD_OR_TARGET_TYPE_OR_TARGET_FIELD,
+ @MessageId("000606") UNABLE_TO_GET_PARAMETER_NAME,
+ @MessageId("000607") ANNOTATION_MAP_NULL,
+ @MessageId("000608") DECLARED_ANNOTATION_MAP_NULL;
}
Added: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ResolutionMessage.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ResolutionMessage.java (rev 0)
+++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ResolutionMessage.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat, Inc. and/or its affiliates, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.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.resolution")
+ at LocaleData({
+ @Locale("en")
+})
+/**
+ * Log messages for resolution classes.
+ *
+ * Message IDs: 001200 - 001299
+ *
+ * @author David Allen
+ *
+ */
+public enum ResolutionMessage
+{
+ @MessageId("001200") INVALID_MEMBER_TYPE,
+ @MessageId("001201") CANNOT_EXTRACT_RAW_TYPE,
+ @MessageId("001202") CANNOT_EXTRACT_TYPE_INFORMATION;
+}
Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ResolutionMessage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ServletMessage.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ServletMessage.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ServletMessage.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -18,6 +18,13 @@
public enum ServletMessage
{
- @MessageId("000700") NOT_STARTING;
+ @MessageId("000700") NOT_STARTING,
+ @MessageId("000701") CONTEXT_NULL,
+ @MessageId("000702") BEAN_MANAGER_NOT_FOUND,
+ @MessageId("000703") REQUEST_SCOPE_BEAN_STORE_MISSING,
+ @MessageId("000704") BEAN_DEPLOYMENT_ARCHIVE_MISSING,
+ @MessageId("000705") BEAN_MANAGER_FOR_ARCHIVE_NOT_FOUND,
+ @MessageId("000706") ILLEGAL_USE_OF_WELD_LISTENER,
+ @MessageId("000707") ONLY_HTTP_SERVLET_LIFECYCLE_DEFINED;
}
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-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/AnnotationModel.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -27,6 +27,7 @@
import org.jboss.weld.DefinitionException;
import org.jboss.weld.introspector.WeldAnnotation;
+import org.jboss.weld.logging.messages.MetadataMessage;
import org.jboss.weld.resources.ClassTransformer;
import org.slf4j.cal10n.LocLogger;
@@ -71,7 +72,7 @@
{
if (!Annotation.class.isAssignableFrom(getRawType()))
{
- throw new DefinitionException(getMetaAnnotationTypes().toString() + " can only be applied to an annotation, it was applied to " + getRawType());
+ throw new DefinitionException(MetadataMessage.META_ANNOTATION_ON_WRONG_TYPE, getMetaAnnotationTypes(), getRawType());
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/BindingTypeModel.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/BindingTypeModel.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/BindingTypeModel.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -16,6 +16,8 @@
*/
package org.jboss.weld.metadata.cache;
+import static org.jboss.weld.logging.messages.MetadataMessage.NON_BINDING_MEMBER_TYPE;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
import java.util.Set;
@@ -24,6 +26,7 @@
import javax.inject.Qualifier;
import org.jboss.weld.DefinitionException;
+import org.jboss.weld.WeldException;
import org.jboss.weld.introspector.WeldMethod;
import org.jboss.weld.resources.ClassTransformer;
import org.jboss.weld.util.Reflections;
@@ -76,7 +79,7 @@
{
if ((Reflections.isArrayType(annotatedMethod.getJavaClass()) || Annotation.class.isAssignableFrom(annotatedMethod.getJavaClass())) && !nonBindingTypes.contains(annotatedMethod))
{
- throw new DefinitionException("Member of array type or annotation type must be annotated @NonBinding " + annotatedMethod);
+ throw new DefinitionException(NON_BINDING_MEMBER_TYPE, annotatedMethod);
}
}
@@ -148,15 +151,15 @@
}
catch (IllegalArgumentException e)
{
- throw new RuntimeException(e);
+ throw new WeldException(e);
}
catch (IllegalAccessException e)
{
- throw new RuntimeException(e);
+ throw new WeldException(e);
}
catch (InvocationTargetException e)
{
- throw new RuntimeException(e);
+ throw new WeldException(e);
}
}
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-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -19,6 +19,7 @@
import static org.jboss.weld.logging.Category.REFLECTION;
import static org.jboss.weld.logging.LoggerFactory.loggerFactory;
+import static org.jboss.weld.logging.messages.MetadataMessage.NON_BINDING_MEMBER_TYPE;
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;
@@ -33,6 +34,7 @@
import javax.interceptor.InterceptorBinding;
import org.jboss.weld.DefinitionException;
+import org.jboss.weld.WeldException;
import org.jboss.weld.introspector.WeldMethod;
import org.jboss.weld.resources.ClassTransformer;
import org.jboss.weld.util.Reflections;
@@ -127,7 +129,7 @@
{
if ((Reflections.isArrayType(annotatedMethod.getJavaClass()) || Annotation.class.isAssignableFrom(annotatedMethod.getJavaClass())) && !nonBindingTypes.contains(annotatedMethod))
{
- throw new DefinitionException("Member of array type or annotation type must be annotated @NonBinding " + annotatedMethod);
+ throw new DefinitionException(NON_BINDING_MEMBER_TYPE, annotatedMethod);
}
}
}
@@ -161,15 +163,15 @@
}
catch (IllegalArgumentException e)
{
- throw new RuntimeException(e);
+ throw new WeldException(e);
}
catch (IllegalAccessException e)
{
- throw new RuntimeException(e);
+ throw new WeldException(e);
}
catch (InvocationTargetException e)
{
- throw new RuntimeException(e);
+ throw new WeldException(e);
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/MergedStereotypes.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/MergedStereotypes.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/MergedStereotypes.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -16,11 +16,14 @@
*/
package org.jboss.weld.metadata.cache;
+import static org.jboss.weld.logging.messages.MetadataMessage.STEREOTYPE_NOT_REGISTERED;
+
import java.lang.annotation.Annotation;
import java.util.HashSet;
import java.util.Set;
import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.ForbiddenStateException;
/**
* Meta model for the merged stereotype for a bean
@@ -66,7 +69,7 @@
StereotypeModel<?> stereotype = manager.getServices().get(MetaAnnotationStore.class).getStereotype(stereotypeAnnotation.annotationType());
if (stereotype == null)
{
- throw new IllegalStateException("Stereotype " + stereotypeAnnotation + " not registered with container");
+ throw new ForbiddenStateException(STEREOTYPE_NOT_REGISTERED, stereotypeAnnotation);
}
if (stereotype.isPolicy())
{
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-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/StereotypeModel.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -21,6 +21,9 @@
import static java.lang.annotation.ElementType.TYPE;
import static org.jboss.weld.logging.Category.REFLECTION;
import static org.jboss.weld.logging.LoggerFactory.loggerFactory;
+import static org.jboss.weld.logging.messages.MetadataMessage.MULTIPLE_SCOPES;
+import static org.jboss.weld.logging.messages.MetadataMessage.QUALIFIER_ON_STEREOTYPE;
+import static org.jboss.weld.logging.messages.MetadataMessage.VALUE_ON_NAMED_STEREOTYPE;
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;
@@ -96,7 +99,7 @@
{
if (!annotation.annotationType().equals(Named.class))
{
- throw new DefinitionException("Cannot declare binding types on a stereotype " + getAnnotatedAnnotation());
+ throw new DefinitionException(QUALIFIER_ON_STEREOTYPE, getAnnotatedAnnotation());
}
}
}
@@ -124,7 +127,7 @@
{
if (!"".equals(getAnnotatedAnnotation().getAnnotation(Named.class).value()))
{
- throw new DefinitionException("Cannot specify a value for a @Named stereotype " + getAnnotatedAnnotation());
+ throw new DefinitionException(VALUE_ON_NAMED_STEREOTYPE, getAnnotatedAnnotation());
}
beanNameDefaulted = true;
}
@@ -140,7 +143,7 @@
scopeTypes.addAll(getAnnotatedAnnotation().getMetaAnnotations(NormalScope.class));
if (scopeTypes.size() > 1)
{
- throw new DefinitionException("At most one scope type may be specified for " + getAnnotatedAnnotation());
+ throw new DefinitionException(MULTIPLE_SCOPES, getAnnotatedAnnotation());
}
else if (scopeTypes.size() == 1)
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/resolution/ResolvableWeldClass.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/resolution/ResolvableWeldClass.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/resolution/ResolvableWeldClass.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -16,6 +16,10 @@
*/
package org.jboss.weld.resolution;
+import static org.jboss.weld.logging.messages.ResolutionMessage.CANNOT_EXTRACT_RAW_TYPE;
+import static org.jboss.weld.logging.messages.ResolutionMessage.CANNOT_EXTRACT_TYPE_INFORMATION;
+import static org.jboss.weld.logging.messages.ResolutionMessage.INVALID_MEMBER_TYPE;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Member;
@@ -31,6 +35,8 @@
import javax.enterprise.util.TypeLiteral;
import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.ForbiddenArgumentException;
+import org.jboss.weld.InvalidOperationException;
import org.jboss.weld.bean.AbstractClassBean;
import org.jboss.weld.injection.WeldInjectionPoint;
import org.jboss.weld.introspector.AnnotationStore;
@@ -90,7 +96,7 @@
}
else
{
- throw new IllegalStateException();
+ throw new ForbiddenArgumentException(INVALID_MEMBER_TYPE, member);
}
}
@@ -109,7 +115,7 @@
}
else
{
- throw new IllegalArgumentException("Cannot extract rawType from " + type);
+ throw new ForbiddenArgumentException(CANNOT_EXTRACT_RAW_TYPE, type);
}
this.actualTypeArguments = ((ParameterizedType) type).getActualTypeArguments();
this._string = rawType.toString() + "<" + Arrays.asList(actualTypeArguments).toString() + ">; binding types = " + Names.annotationsToString(annotationStore.getBindings());
@@ -122,7 +128,7 @@
}
else
{
- throw new IllegalArgumentException("Unable to extract type information from " + type);
+ throw new ForbiddenArgumentException(CANNOT_EXTRACT_TYPE_INFORMATION, type);
}
this.typeClosure = new HashSet<Type>();
typeClosure.add(type);
@@ -158,7 +164,7 @@
public String getName()
{
- throw new UnsupportedOperationException();
+ throw new InvalidOperationException();
}
@Override
@@ -169,38 +175,38 @@
public boolean isFinal()
{
- throw new UnsupportedOperationException();
+ throw new InvalidOperationException();
}
public boolean isPublic()
{
- throw new UnsupportedOperationException();
+ throw new InvalidOperationException();
}
public boolean isPrivate()
{
- throw new UnsupportedOperationException();
+ throw new InvalidOperationException();
}
public boolean isPackagePrivate()
{
- throw new UnsupportedOperationException();
+ throw new InvalidOperationException();
}
public Package getPackage()
{
- throw new UnsupportedOperationException();
+ throw new InvalidOperationException();
}
public boolean isStatic()
{
- throw new UnsupportedOperationException();
+ throw new InvalidOperationException();
}
@Override
public boolean isProxyable()
{
- throw new UnsupportedOperationException();
+ throw new InvalidOperationException();
}
@Override
Modified: core/trunk/impl/src/main/java/org/jboss/weld/resources/ManagerObjectFactory.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/resources/ManagerObjectFactory.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/resources/ManagerObjectFactory.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -16,6 +16,9 @@
*/
package org.jboss.weld.resources;
+import static org.jboss.weld.logging.LoggerFactory.loggerFactory;
+import static org.jboss.weld.logging.messages.BeanManagerMessage.CANNOT_LOCATE_BEAN_MANAGER;
+
import java.util.Hashtable;
import java.util.Map.Entry;
@@ -28,9 +31,13 @@
import org.jboss.weld.Container;
import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import ch.qos.cal10n.IMessageConveyor;
+
public class ManagerObjectFactory implements ObjectFactory
{
-
+ // Exception messages
+ private static final IMessageConveyor messageConveyer = loggerFactory().getMessageConveyor();
+
public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable<?, ?> environment) throws Exception
{
for (Entry<BeanDeploymentArchive, BeanManagerImpl> entry : Container.instance().beanDeploymentArchives().entrySet())
@@ -40,7 +47,7 @@
return entry.getValue().getCurrent();
}
}
- throw new NamingException("Unable to locate BeanManager");
+ throw new NamingException(messageConveyer.getMessage(CANNOT_LOCATE_BEAN_MANAGER));
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletHelper.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletHelper.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletHelper.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -16,10 +16,14 @@
*/
package org.jboss.weld.servlet;
+import static org.jboss.weld.logging.messages.ServletMessage.BEAN_MANAGER_NOT_FOUND;
+import static org.jboss.weld.logging.messages.ServletMessage.CONTEXT_NULL;
+
import javax.enterprise.inject.spi.BeanManager;
import javax.servlet.ServletContext;
import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.ForbiddenArgumentException;
/**
* @author pmuir
@@ -32,12 +36,12 @@
{
if (ctx == null)
{
- throw new IllegalArgumentException("ServletContext is null");
+ throw new ForbiddenArgumentException(CONTEXT_NULL);
}
BeanManagerImpl beanManagerImpl = (BeanManagerImpl) ctx.getAttribute(BeanManager.class.getName());
if (beanManagerImpl == null)
{
- throw new IllegalArgumentException("Unable to find BeanManager. ServletContext: " + ctx);
+ throw new ForbiddenArgumentException(BEAN_MANAGER_NOT_FOUND, ctx);
}
else
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -22,11 +22,13 @@
*/
package org.jboss.weld.servlet;
+import static org.jboss.weld.logging.messages.ServletMessage.REQUEST_SCOPE_BEAN_STORE_MISSING;
import static org.jboss.weld.servlet.ServletHelper.getModuleBeanManager;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import org.jboss.weld.ForbiddenStateException;
import org.jboss.weld.context.ContextLifecycle;
import org.jboss.weld.context.api.BeanStore;
import org.jboss.weld.context.api.helpers.ConcurrentHashMapBeanStore;
@@ -152,7 +154,7 @@
BeanStore beanStore = (BeanStore) request.getAttribute(REQUEST_ATTRIBUTE_NAME);
if (beanStore == null)
{
- throw new IllegalStateException("Cannot obtain request scoped beans from the request");
+ throw new ForbiddenStateException(REQUEST_SCOPE_BEAN_STORE_MISSING);
}
lifecycle.endRequest(request.getRequestURI(), beanStore);
request.removeAttribute(REQUEST_ATTRIBUTE_NAME);
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-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java 2009-11-23 08:18:20 UTC (rev 5111)
@@ -24,7 +24,11 @@
import static org.jboss.weld.logging.Category.SERVLET;
import static org.jboss.weld.logging.LoggerFactory.loggerFactory;
+import static org.jboss.weld.logging.messages.ServletMessage.BEAN_DEPLOYMENT_ARCHIVE_MISSING;
+import static org.jboss.weld.logging.messages.ServletMessage.BEAN_MANAGER_FOR_ARCHIVE_NOT_FOUND;
+import static org.jboss.weld.logging.messages.ServletMessage.ILLEGAL_USE_OF_WELD_LISTENER;
import static org.jboss.weld.logging.messages.ServletMessage.NOT_STARTING;
+import static org.jboss.weld.logging.messages.ServletMessage.ONLY_HTTP_SERVLET_LIFECYCLE_DEFINED;
import javax.enterprise.inject.spi.BeanManager;
import javax.servlet.ServletContext;
@@ -35,6 +39,7 @@
import org.jboss.weld.BeanManagerImpl;
import org.jboss.weld.Container;
+import org.jboss.weld.ForbiddenStateException;
import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
import org.jboss.weld.context.ContextLifecycle;
import org.jboss.weld.servlet.api.ServletServices;
@@ -72,12 +77,12 @@
BeanDeploymentArchive war = Container.instance().deploymentServices().get(ServletServices.class).getBeanDeploymentArchive(ctx);
if (war == null)
{
- throw new IllegalStateException("Unable to locate BeanDeploymentArchive. ServletContext: " + ctx);
+ throw new ForbiddenStateException(BEAN_DEPLOYMENT_ARCHIVE_MISSING, ctx);
}
BeanManagerImpl beanManager = Container.instance().beanDeploymentArchives().get(war);
if (beanManager == null)
{
- throw new IllegalStateException("Unable to locate BeanManager. ServletContext: " + ctx + "; BeanDeploymentArchive: " + war);
+ throw new ForbiddenStateException(BEAN_MANAGER_FOR_ARCHIVE_NOT_FOUND, ctx, war);
}
return beanManager;
}
@@ -93,7 +98,7 @@
}
if (!Container.instance().deploymentServices().contains(ServletServices.class))
{
- throw new IllegalStateException("Cannot use WeldListener without ServletServices");
+ throw new ForbiddenStateException(ILLEGAL_USE_OF_WELD_LISTENER);
}
sce.getServletContext().setAttribute(BeanManager.class.getName(), getBeanManager(sce.getServletContext()));
}
@@ -152,7 +157,7 @@
}
else
{
- throw new IllegalStateException("Non HTTP-Servlet lifecycle not defined");
+ throw new ForbiddenStateException(ONLY_HTTP_SERVLET_LIFECYCLE_DEFINED);
}
}
}
@@ -174,7 +179,7 @@
}
else
{
- throw new IllegalStateException("Non HTTP-Servlet lifecycle not defined");
+ throw new ForbiddenStateException(ONLY_HTTP_SERVLET_LIFECYCLE_DEFINED);
}
}
}
Added: core/trunk/impl/src/main/resources/org/jboss/weld/messages/beanmanager_en.properties
===================================================================
--- core/trunk/impl/src/main/resources/org/jboss/weld/messages/beanmanager_en.properties (rev 0)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/beanmanager_en.properties 2009-11-23 08:18:20 UTC (rev 5111)
@@ -0,0 +1 @@
+CANNOT_LOCATE_BEAN_MANAGER=Unable to locate BeanManager
Property changes on: core/trunk/impl/src/main/resources/org/jboss/weld/messages/beanmanager_en.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/jsf_en.properties
===================================================================
--- core/trunk/impl/src/main/resources/org/jboss/weld/messages/jsf_en.properties 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/jsf_en.properties 2009-11-23 08:18:20 UTC (rev 5111)
@@ -2,4 +2,5 @@
SKIPPING_CLEANING_UP_CONVERSATION=Skipping conversation cleanup after the {0} phase because {1}
INITIATING_CONVERSATION=Initiating conversation before the {0} phase
FOUND_CONVERSATION_FROM_REQUEST=Found conversation id {0} in request parameter
-RESUMING_CONVERSATION=Resuming conversation with id {0}
\ No newline at end of file
+RESUMING_CONVERSATION=Resuming conversation with id {0}
+IMPROPER_ENVIRONMENT=Weld does not support using JSF in a non-servlet environment
Added: core/trunk/impl/src/main/resources/org/jboss/weld/messages/metadata_en.properties
===================================================================
--- core/trunk/impl/src/main/resources/org/jboss/weld/messages/metadata_en.properties (rev 0)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/metadata_en.properties 2009-11-23 08:18:20 UTC (rev 5111)
@@ -0,0 +1,6 @@
+META_ANNOTATION_ON_WRONG_TYPE={0} can only be applied to an annotation. It was applied to {1}
+NON_BINDING_MEMBER_TYPE=Member of array type or annotation type must be annotated @NonBinding\: {0}
+STEREOTYPE_NOT_REGISTERED=Stereotype {0} not registered with container
+QUALIFIER_ON_STEREOTYPE=Cannot declare qualifiers on stereotype {0}
+VALUE_ON_NAMED_STEREOTYPE=Cannot specify a value for @Named stereotype {0}
+MULTIPLE_SCOPES=At most one scope type may be specified for {0}
Property changes on: core/trunk/impl/src/main/resources/org/jboss/weld/messages/metadata_en.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/reflection_en.properties
===================================================================
--- core/trunk/impl/src/main/resources/org/jboss/weld/messages/reflection_en.properties 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/reflection_en.properties 2009-11-23 08:18:20 UTC (rev 5111)
@@ -3,4 +3,7 @@
MISSING_TARGET_TYPE_METHOD_OR_TARGET_TYPE={0} is not declared @Target(TYPE, METHOD) or @Target(TYPE)
TARGET_TYPE_METHOD_INHERITS_FROM_TARGET_TYPE={0} is declared @Target(TYPE, METHOD), but inherits {1}, which is declared @Target(TYPE)
MISSING_TARGET_METHOD_FIELD_TYPE={0} is not declared @Target(METHOD, FIELD, TYPE)
-MISSING_TARGET_METHOD_FIELD_TYPE_PARAMETER_OR_TARGET_METHOD_TYPE_OR_TARGET_METHOD_OR_TARGET_TYPE_OR_TARGET_FIELD={0} is not declared @Target(METHOD, FIELD, TYPE, PARAMETER), @Target(METHOD, TYPE), @Target(METHOD), @Target(TYPE) or @Target(FIELD)
\ No newline at end of file
+MISSING_TARGET_METHOD_FIELD_TYPE_PARAMETER_OR_TARGET_METHOD_TYPE_OR_TARGET_METHOD_OR_TARGET_TYPE_OR_TARGET_FIELD={0} is not declared @Target(METHOD, FIELD, TYPE, PARAMETER), @Target(METHOD, TYPE), @Target(METHOD), @Target(TYPE) or @Target(FIELD)
+UNABLE_TO_GET_PARAMETER_NAME=Unable to determine name of parameter
+ANNOTATION_MAP_NULL=annotationMap cannot be null
+DECLARED_ANNOTATION_MAP_NULL=declaredAnnotationMap cannot be null
Added: core/trunk/impl/src/main/resources/org/jboss/weld/messages/resolution_en.properties
===================================================================
--- core/trunk/impl/src/main/resources/org/jboss/weld/messages/resolution_en.properties (rev 0)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/resolution_en.properties 2009-11-23 08:18:20 UTC (rev 5111)
@@ -0,0 +1,3 @@
+INVALID_MEMBER_TYPE=Invalid member type {0}
+CANNOT_EXTRACT_RAW_TYPE=Cannot extract rawType from {0}
+CANNOT_EXTRACT_TYPE_INFORMATION=Unable to extract type information from {0}
Property changes on: core/trunk/impl/src/main/resources/org/jboss/weld/messages/resolution_en.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/servlet_en.properties
===================================================================
--- core/trunk/impl/src/main/resources/org/jboss/weld/messages/servlet_en.properties 2009-11-22 23:48:19 UTC (rev 5110)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/servlet_en.properties 2009-11-23 08:18:20 UTC (rev 5111)
@@ -1 +1,8 @@
-NOT_STARTING=Not starting Weld/Servlet integration as Weld failed to initialize
\ No newline at end of file
+NOT_STARTING=Not starting Weld/Servlet integration as Weld failed to initialize
+CONTEXT_NULL=ServletContext is null
+BEAN_MANAGER_NOT_FOUND=Unable to find BeanManager for {0}
+REQUEST_SCOPE_BEAN_STORE_MISSING=Cannot obtain request scoped beans from the request
+BEAN_DEPLOYMENT_ARCHIVE_MISSING=Unable to locate bean deployment archive for {0}
+BEAN_MANAGER_FOR_ARCHIVE_NOT_FOUND=Unable to locate bean manager for {0} in {1}
+ILLEGAL_USE_OF_WELD_LISTENER=Cannot use WeldListener without ServletServices
+ONLY_HTTP_SERVLET_LIFECYCLE_DEFINED=Non Http-Servlet lifecycle not defined
More information about the weld-commits
mailing list