Weld SVN: r5479 - core/trunk/impl/src/main/java/org/jboss/weld/injection.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-15 11:36:27 -0500 (Fri, 15 Jan 2010)
New Revision: 5479
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.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/injection/ParameterInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java
Log:
minor
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 2010-01-15 13:55:00 UTC (rev 5478)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2010-01-15 16:36:27 UTC (rev 5479)
@@ -240,21 +240,21 @@
Bean<T> bean = getDeclaringBean();
if (constructor == null || bean == null)
{
- throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_CONSTRUCTOR_ON_DESERIALIZATION, getDeclaringBeanId(), getWeldClass(), signature);
+ throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_CONSTRUCTOR_ON_DESERIALIZATION, getDeclaringBeanId(), getDeclaringWeldClass(), signature);
}
return ConstructorInjectionPoint.of(getDeclaringBean(), getWeldConstructor());
}
protected WeldConstructor<T> getWeldConstructor()
{
- return getWeldClass().getDeclaredWeldConstructor(signature);
+ return getDeclaringWeldClass().getDeclaredWeldConstructor(signature);
}
@SuppressWarnings("unchecked")
@Override
- protected WeldClass<T> getWeldClass()
+ protected WeldClass<T> getDeclaringWeldClass()
{
- return (WeldClass<T>) super.getWeldClass();
+ return (WeldClass<T>) super.getDeclaringWeldClass();
}
}
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 2010-01-15 13:55:00 UTC (rev 5478)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java 2010-01-15 16:36:27 UTC (rev 5479)
@@ -169,14 +169,14 @@
Bean<T> bean = getDeclaringBean();
if (field == null || bean == null)
{
- throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_FIELD_ON_DESERIALIZATION, getDeclaringBeanId(), getWeldClass(), fieldName);
+ throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_FIELD_ON_DESERIALIZATION, getDeclaringBeanId(), getDeclaringWeldClass(), fieldName);
}
return FieldInjectionPoint.of(getDeclaringBean(), getWeldField());
}
protected WeldField<T, ?> getWeldField()
{
- return getWeldClass().getDeclaredWeldField(fieldName);
+ return getDeclaringWeldClass().getDeclaredWeldField(fieldName);
}
}
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 2010-01-15 13:55:00 UTC (rev 5478)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java 2010-01-15 16:36:27 UTC (rev 5479)
@@ -330,14 +330,14 @@
Bean<T> bean = getDeclaringBean();
if (method == null || bean == null)
{
- throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_METHOD_ON_DESERIALIZATION, getDeclaringBeanId(), getWeldClass(), signature);
+ throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_METHOD_ON_DESERIALIZATION, getDeclaringBeanId(), getDeclaringWeldClass(), signature);
}
return MethodInjectionPoint.of(getDeclaringBean(), getWeldMethod());
}
protected WeldMethod<T, ?> getWeldMethod()
{
- return getWeldClass().getDeclaredWeldMethod(signature);
+ return getDeclaringWeldClass().getDeclaredWeldMethod(signature);
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java 2010-01-15 13:55:00 UTC (rev 5478)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java 2010-01-15 16:36:27 UTC (rev 5479)
@@ -172,7 +172,7 @@
Bean<T> bean = getDeclaringBean();
if (parameter == null || bean == null)
{
- throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_PARAMETER_ON_DESERIALIZATION, getDeclaringBeanId(), getWeldClass(), methodSignature, parameterPosition);
+ throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_PARAMETER_ON_DESERIALIZATION, getDeclaringBeanId(), getDeclaringWeldClass(), methodSignature, parameterPosition);
}
return ParameterInjectionPoint.of(getDeclaringBean(), getWeldParameter());
}
@@ -181,7 +181,7 @@
{
if (methodSignature != null)
{
- WeldMethod<?, ?> method = getWeldClass().getDeclaredWeldMethod(methodSignature);
+ WeldMethod<?, ?> method = getDeclaringWeldClass().getDeclaredWeldMethod(methodSignature);
if (method.getParameters().size() > parameterPosition)
{
WeldParameter<?, ?> p = method.getWeldParameters().get(parameterPosition);
@@ -198,7 +198,7 @@
}
else if (constructorSignature != null)
{
- WeldConstructor<?> constructor = getWeldClass().getDeclaredWeldConstructor(constructorSignature);
+ WeldConstructor<?> constructor = getDeclaringWeldClass().getDeclaredWeldConstructor(constructorSignature);
if (constructor.getParameters().size() > parameterPosition)
{
WeldParameter<?, ?> p = constructor.getWeldParameters().get(parameterPosition);
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java 2010-01-15 13:55:00 UTC (rev 5478)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java 2010-01-15 16:36:27 UTC (rev 5479)
@@ -49,7 +49,7 @@
return Container.instance().services().get(ContextualStore.class).<Bean<T>, T>getContextual(declaringBeanId);
}
- protected WeldClass<?> getWeldClass()
+ protected WeldClass<?> getDeclaringWeldClass()
{
return Container.instance().services().get(ClassTransformer.class).loadClass(declaringClass);
}
16 years, 3 months
- 1
- 0
Weld SVN: r5478 - core/trunk/impl/src/main/resources/org/jboss/weld/messages.
by weld-commits＠lists.jboss.org
Author: nickarls
Date: 2010-01-15 08:55:00 -0500 (Fri, 15 Jan 2010)
New Revision: 5478
Modified:
core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties
core/trunk/impl/src/main/resources/org/jboss/weld/messages/beanmanager_en.properties
core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_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/util_en.properties
core/trunk/impl/src/main/resources/org/jboss/weld/messages/validator_en.properties
core/trunk/impl/src/main/resources/org/jboss/weld/messages/xml_en.properties
Log:
remove extra \
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 2010-01-15 13:53:21 UTC (rev 5477)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties 2010-01-15 13:55:00 UTC (rev 5478)
@@ -21,12 +21,12 @@
DELEGATE_INJECTION_POINT_NOT_FOUND=Delegate injection point not found on decorator {0}
ANNOTATION_NOT_BINDING=The annotation {0} is not a binding for {1}
DUPLICATE_BINDING=The annotation {0} is already present in the bindings list for {1}
-TYPE_PARAMETER_MUST_BE_CONCRETE=Type parameter must be a concrete type\: {0}
+TYPE_PARAMETER_MUST_BE_CONCRETE=Type parameter must be a concrete type: {0}
DISPOSE_NOT_FIRST_PARAM={0} does not have @Dispose as first parameter
MULTIPLE_DISPOSE_PARAMS={0} has more than one @Dispose parameter
INCONSISTENT_ANNOTATIONS_ON_METHOD={0} is not allowed on same method as {1}, see {2}
METHOD_NOT_BUSINESS_METHOD=Method {0} must be declared on a business interface of {1}
-BEAN_NOT_EE_RESOURCE_PRODUCER=The following bean is not an EE resource producer\: {0}
+BEAN_NOT_EE_RESOURCE_PRODUCER=The following bean is not an EE resource producer: {0}
NULL_INSTANCE=Unable to obtain instance from {0}
VALIDATION_SERVICE_NOT_AVAILABLE=ValidationServices are not available
INVALID_RESOURCE_PRODUCER_FIELD=Tried to create an EEResourceProducerField, but no @Resource, @PersistenceContext, @PersistenceUnit, @WebServiceRef or @EJB is present {0}
@@ -39,9 +39,9 @@
PROXY_INSTANTIATION_FAILED=Could not instantiate client proxy for {0}
PROXY_INSTANTIATION_BEAN_ACCESS_FAILED=Could not access bean correctly when creating client proxy for {0}
BEAN_ID_CREATION_FAILED=There was an error creating an id for {0}
-UNEXPECTED_UNWRAPPED_CUSTOM_DECORATOR=Unexpected unwrapped custom decorator instance\: {0}
+UNEXPECTED_UNWRAPPED_CUSTOM_DECORATOR=Unexpected unwrapped custom decorator instance: {0}
INVALID_REMOVE_METHOD_INVOCATION=Cannot call EJB remove method directly on non-dependent scoped bean {0}
-DELEGATE_NOT_ON_DECORATOR=Cannot place @Delegate at an injection point which is not on a Decorator\: {0}
+DELEGATE_NOT_ON_DECORATOR=Cannot place @Delegate at an injection point which is not on a Decorator: {0}
TYPED_CLASS_NOT_IN_HIERARCHY=@Typed class {0} is not present in the type hierarchy {1}
MULTIPLE_SCOPES_FOUND_FROM_STEREOTYPES=All stereotypes must specify the same scope OR a scope must be specified on {0}
NON_CONTAINER_DECORATOR=Cannot operate on non container provided decorator {0}
@@ -49,18 +49,18 @@
INTERCEPTION_TYPE_NOT_LIFECYCLE=InterceptionType must be lifecycle, but it is {0}
PROXY_REQUIRED=Proxy required
ONLY_ONE_SCOPE_ALLOWED=At most one scope may be specified on {0}
-SPECIALIZING_BEAN_MUST_EXTEND_A_BEAN=Specializing bean must extend another bean\: {0}
+SPECIALIZING_BEAN_MUST_EXTEND_A_BEAN=Specializing bean must extend another bean: {0}
CONFLICTING_INTERCEPTOR_BINDINGS=Conflicting interceptor bindings found on {0}
INVOCATION_ERROR=Unable to invoke {0} on {1}
PRODUCER_CAST_ERROR=Cannot cast producer type {0} to bean type {1}
-RETURN_TYPE_MUST_BE_CONCRETE=Return type must be concrete\: {0}
-NULL_NOT_ALLOWED_FROM_PRODUCER=Cannot return null from a non-dependent producer method\: {0}
-NON_SERIALIZABLE_PRODUCT_ERROR=Producers cannot declare passivating scope and return a non-serializable class\: {0}
+RETURN_TYPE_MUST_BE_CONCRETE=Return type must be concrete: {0}
+NULL_NOT_ALLOWED_FROM_PRODUCER=Cannot return null from a non-dependent producer method: {0}
+NON_SERIALIZABLE_PRODUCT_ERROR=Producers cannot declare passivating scope and return a non-serializable class: {0}
NON_SERIALIZABLE_FIELD_INJECTION_ERROR=Producers cannot produce non-serializable instances for injection into non-transient fields of passivating beans\\n\\nProducer\: {0}\\nInjection Point\: {1}
NON_SERIALIZABLE_INITIALIZER_PARAM_INJECTION_ERROR=Producers cannot produce non-serializable instances for injection into parameters of initializers of beans declaring passivating scope.\\n\\nBean\: {0}\\nInjection Point\: {1}
NON_SERIALIZABLE_PRODUCER_PARAM_INJECTION_ERROR=Producers cannot produce non-serializable instances for injection into parameters of producer methods declaring passivating scope.\\n\\nBean\: {0}\\nInjection Point\: {1}
NON_SERIALIZABLE_CONSTRUCTOR_PARAM_INJECTION_ERROR=Producers cannot produce non-serializable instances for injection into parameters of constructors of beans declaring passivating scope.\\n\\nBean\: {0}\\nInjection Point\: {1}
-DELEGATE_ON_NON_INITIALIZER_METHOD=Method with @Delegate parameter must be an initializer method\: {0}
+DELEGATE_ON_NON_INITIALIZER_METHOD=Method with @Delegate parameter must be an initializer method: {0}
NO_DELEGATE_FOR_DECORATOR=No delegate injection points defined for {0}
TOO_MANY_DELEGATES_FOR_DECORATOR=Too many delegate injection points defined for {0}
DELEGATE_MUST_SUPPORT_EVERY_DECORATED_TYPE=The delegate type must extend or implement every decorated type. Decorated type {0} on {1}
@@ -70,25 +70,25 @@
MISSING_BINDING_ON_INTERCEPTOR=An interceptor must have at least one binding, but {0} has none
SIMPLE_BEAN_AS_NON_STATIC_INNER_CLASS_NOT_ALLOWED=Simple bean {0} cannot be a non-static inner class
BEAN_MUST_BE_DEPENDENT=Managed bean {0} must be @Dependent
-PASSIVATING_BEAN_NEEDS_SERIALIZABLE_IMPL=Managed bean declaring a passivating scope must be passivation capable. Bean\: {0}
-FINAL_BEAN_CLASS_WITH_DECORATORS_NOT_ALLOWED=Bean class which has decorators cannot be declared final\: {0}
+PASSIVATING_BEAN_NEEDS_SERIALIZABLE_IMPL=Managed bean declaring a passivating scope must be passivation capable. Bean: {0}
+FINAL_BEAN_CLASS_WITH_DECORATORS_NOT_ALLOWED=Bean class which has decorators cannot be declared final: {0}
FINAL_DECORATED_BEAN_METHOD_NOT_ALLOWED=Decorated bean method {0} (decorated by {1}) cannot be declared final
-PUBLIC_FIELD_ON_NORMAL_SCOPED_BEAN_NOT_ALLOWED=Normal scoped managed bean implementation class has a public field\: {0}
-PARAMETER_ANNOTATION_NOT_ALLOWED_ON_CONSTRUCTOR=Managed bean constructor must not have a parameter annotated {0}\: {1}
+PUBLIC_FIELD_ON_NORMAL_SCOPED_BEAN_NOT_ALLOWED=Normal scoped managed bean implementation class has a public field: {0}
+PARAMETER_ANNOTATION_NOT_ALLOWED_ON_CONSTRUCTOR=Managed bean constructor must not have a parameter annotated {0}: {1}
MULTIPLE_DISPOSAL_METHODS=Cannot declare multiple disposal methods for this producer method.\\n\\nProducer method\: {0}\\nDisposal methods\: {1}
-PRODUCER_METHOD_NOT_SPECIALIZING=Specialized producer method does not override a method on the direct superclass\: {0}
-EJB_NOT_FOUND=Could not find the EJB in JNDI\: {0}
-EJB_CANNOT_BE_INTERCEPTOR=Enterprise beans cannot be interceptors\: {0}
-EJB_CANNOT_BE_DECORATOR=Enterprise beans cannot be decorators\: {0}
+PRODUCER_METHOD_NOT_SPECIALIZING=Specialized producer method does not override a method on the direct superclass: {0}
+EJB_NOT_FOUND=Could not find the EJB in JNDI: {0}
+EJB_CANNOT_BE_INTERCEPTOR=Enterprise beans cannot be interceptors: {0}
+EJB_CANNOT_BE_DECORATOR=Enterprise beans cannot be decorators: {0}
SCOPE_NOT_ALLOWED_ON_STATELESS_SESSION_BEAN=Scope {0} is not allowed on stateless enterprise beans for {1}. Only @Dependent is allowed on stateless enterprise beans.
SCOPE_NOT_ALLOWED_ON_SINGLETON_BEAN=Scope {0} is not allowed on singleton enterprise beans for {1}. Only @Dependent is allowed on singleton enterprise beans.
-SPECIALIZING_ENTERPRISE_BEAN_MUST_EXTEND_AN_ENTERPRISE_BEAN=Specializing enterprise bean must extend another enterprise bean\: {0}
+SPECIALIZING_ENTERPRISE_BEAN_MUST_EXTEND_AN_ENTERPRISE_BEAN=Specializing enterprise bean must extend another enterprise bean: {0}
CANNOT_DESTROY_NULL_BEAN=Cannot destroy null instance of {0}
-CANNOT_DESTROY_ENTERPRISE_BEAN_NOT_CREATED=Cannot destroy session bean instance not created by the container\: {0}
-MESSAGE_DRIVEN_BEANS_CANNOT_BE_MANAGED=Message driven beans cannot be Managed Beans\: {0}
-OBSERVER_METHOD_MUST_BE_STATIC_OR_BUSINESS=Observer method must be static or local business method\: {0} on {1}
-TOO_MANY_EJBS_FOR_CLASS=Unable to determine EJB for {0}, multiple EJBs with that class\: {1}
+CANNOT_DESTROY_ENTERPRISE_BEAN_NOT_CREATED=Cannot destroy session bean instance not created by the container: {0}
+MESSAGE_DRIVEN_BEANS_CANNOT_BE_MANAGED=Message driven beans cannot be Managed Beans: {0}
+OBSERVER_METHOD_MUST_BE_STATIC_OR_BUSINESS=Observer method must be static or local business method: {0} on {1}
+TOO_MANY_EJBS_FOR_CLASS=Unable to determine EJB for {0}, multiple EJBs with that class: {1}
ABSTRACT_METHOD_MUST_MATCH_DECORATED_TYPE=Method {0} defined on {1} does not match a method on decorated type {2}
-IP_NOT_CONSTRUCTOR_OR_METHOD=Cannot handle injection point as a constructor or method\: {0}
-PARAM_NOT_IN_PARAM_LIST=Parameter position {0} is not in the parameter list\: {1}
+IP_NOT_CONSTRUCTOR_OR_METHOD=Cannot handle injection point as a constructor or method: {0}
+PARAM_NOT_IN_PARAM_LIST=Parameter position {0} is not in the parameter list: {1}
CANNOT_READ_OBJECT=Cannot read object
Modified: 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 2010-01-15 13:53:21 UTC (rev 5477)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/beanmanager_en.properties 2010-01-15 13:55:00 UTC (rev 5478)
@@ -1,6 +1,6 @@
CANNOT_LOCATE_BEAN_MANAGER=Unable to locate BeanManager
INVALID_QUALIFIER=Annotation {0} is not a qualifier
-DUPLICATE_QUALIFIERS=Duplicate qualifiers\: {0}
+DUPLICATE_QUALIFIERS=Duplicate qualifiers: {0}
CONTEXT_NOT_ACTIVE=No active contexts for scope type {0}
DUPLICATE_ACTIVE_CONTEXTS=More than one context active for scope type {0}
SPECIFIED_TYPE_NOT_BEAN_TYPE=The given type {0} is not a type of the bean {1}
@@ -13,12 +13,12 @@
DUPLICATE_INTERCEPTOR_BINDING=Duplicate interceptor binding type {0} found
INTERCEPTOR_RESOLUTION_WITH_NONBINDING_TYPE=Trying to resolve interceptors with non-binding type {0}
NON_NORMAL_SCOPE={0} is expected to be a normal scope type
-TOO_MANY_ACTIVITIES=More than one current activity for an active context\: {0}
+TOO_MANY_ACTIVITIES=More than one current activity for an active context: {0}
NOT_INTERCEPTOR_BINDING_TYPE={0} is not an interceptor binding type
NOT_STEREOTYPE={0} is not a stereotype
AMBIGUOUS_BEANS_FOR_DEPENDENCY=Cannot resolve an ambiguous dependency between {0}
NULL_BEAN_MANAGER_ID=Bean manager ID must not be null
-INJECTION_ON_NON_CONTEXTUAL=Cannot inject into a non-contextual type\: {0}
+INJECTION_ON_NON_CONTEXTUAL=Cannot inject into a non-contextual type: {0}
MISSING_BEAN_CONSTRUCTOR_FOUND=Bean constructor was not found before but appears to be found now
ERROR_INVOKING_POST_CONSTRUCT=Error invoking post construct method {0}
ERROR_INVOKING_PRE_DESTROY=Error invoking pre-destroy method {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 2010-01-15 13:53:21 UTC (rev 5477)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties 2010-01-15 13:55:00 UTC (rev 5478)
@@ -6,11 +6,11 @@
FOUND_BEAN=Bean: {0}
FOUND_INTERCEPTOR=Interceptor: {0}
FOUND_DECORATOR=Decorator: {0}
-FOUND_OBSERVER_METHOD=ObserverMethod\: {0}
-ANNOTATION_TYPE_NULL=Cannot set the annotation type to null (if you want to stop the type being used, call veto())\: {0}
-BEAN_TYPE_NOT_EJB=Bean type is not STATELESS, STATEFUL or SINGLETON\: {0}
+FOUND_OBSERVER_METHOD=ObserverMethod: {0}
+ANNOTATION_TYPE_NULL=Cannot set the annotation type to null (if you want to stop the type being used, call veto()): {0}
+BEAN_TYPE_NOT_EJB=Bean type is not STATELESS, STATEFUL or SINGLETON: {0}
BEAN_IS_BOTH_INTERCEPTOR_AND_DECORATOR=Class {0} has both @Interceptor and @Decorator annotations
-DEPLOYMENT_ARCHIVE_NULL=BeanDeploymentArchive must not be null\: {0}
+DEPLOYMENT_ARCHIVE_NULL=BeanDeploymentArchive must not be null: {0}
DEPLOYMENT_REQUIRED=Must start the container with a deployment
BEAN_STORE_MISSING=No application context BeanStore set
MANAGER_NOT_INITIALIZED=Manager has not been initialized
Modified: 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 2010-01-15 13:53:21 UTC (rev 5477)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/metadata_en.properties 2010-01-15 13:55:00 UTC (rev 5478)
@@ -1,5 +1,5 @@
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}
+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}
Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/util_en.properties
===================================================================
--- core/trunk/impl/src/main/resources/org/jboss/weld/messages/util_en.properties 2010-01-15 13:53:21 UTC (rev 5477)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/util_en.properties 2010-01-15 13:55:00 UTC (rev 5478)
@@ -8,10 +8,10 @@
INITIALIZER_CANNOT_BE_PRODUCER=Initializer method {0} cannot be annotated @Produces on {1}
INITIALIZER_CANNOT_BE_DISPOSAL_METHOD=Initializer method {0} cannot have parameters annotated @Disposes on {1}
INITIALIZER_CANNOT_BE_OBSERVER=Initializer method {0} cannot be annotated @Observes on {1}
-QUALIFIER_ON_FINAL_FIELD=Cannot place qualifiers on final fields\: {0}
+QUALIFIER_ON_FINAL_FIELD=Cannot place qualifiers on final fields: {0}
TOO_MANY_INITIALIZERS=Cannot have more than one constructor annotated with @Initializer for {0}
AMBIGUOUS_CONSTRUCTOR=Cannot determine constructor to use for {0}
-INVALID_QUANTITY_INJECTABLE_FIELDS_AND_INITIALIZER_METHODS=injectableFields and initializerMethods must have the same size.\\n\\nInjectable Fields\: {0}\\nInitializerMethods\: {1}
+INVALID_QUANTITY_INJECTABLE_FIELDS_AND_INITIALIZER_METHODS=injectableFields and initializerMethods must have the same size.\\n\\nInjectable Fields: {0}\\nInitializerMethods: {1}
ANNOTATION_NOT_QUALIFIER=Annotation {0} is not a qualifier
REDUNDANT_QUALIFIER=Qualifier {0} is already present in the set {1}
UNABLE_TO_FIND_CONSTRUCTOR=Cannot determine constructor to use for {0}
Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/validator_en.properties
===================================================================
--- core/trunk/impl/src/main/resources/org/jboss/weld/messages/validator_en.properties 2010-01-15 13:53:21 UTC (rev 5477)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/validator_en.properties 2010-01-15 13:55:00 UTC (rev 5478)
@@ -5,12 +5,12 @@
NEW_WITH_QUALIFIERS=The injection point {0} is annotated with @New which cannot be combined with other qualifiers
INJECTION_INTO_NON_BEAN=Cannot inject {0} in a class which isn't a bean
INJECTION_INTO_NON_DEPENDENT_BEAN=Cannot inject {0} in a non @Dependent scoped bean
-INJECTION_POINT_WITH_TYPE_VARIABLE=Cannot declare an injection point with a type variable\: {0}
-INJECTION_POINT_HAS_UNSATISFIED_DEPENDENCIES=Injection point has unsatisfied dependencies. Injection point\: {0}; Qualifiers\: {1}
-INJECTION_POINT_HAS_AMBIGUOUS_DEPENDENCIES=Injection point has ambiguous dependencies. Injection point\: {0}; Qualifiers\: {1}
+INJECTION_POINT_WITH_TYPE_VARIABLE=Cannot declare an injection point with a type variable: {0}
+INJECTION_POINT_HAS_UNSATISFIED_DEPENDENCIES=Injection point has unsatisfied dependencies. Injection point: {0}; Qualifiers: {1}
+INJECTION_POINT_HAS_AMBIGUOUS_DEPENDENCIES=Injection point has ambiguous dependencies. Injection point: {0}; Qualifiers: {1}
INJECTION_POINT_HAS_NON_PROXYABLE_DEPENDENCIES=The injection point {0} has non-proxyable dependencies
INJECTION_POINT_HAS_NULLABLE_DEPENDENCIES=Injection point {0} has nullable dependencies
-NON_SERIALIZABLE_BEAN_INJECTED_INTO_PASSIVATING_BEAN=The bean {0} declares passivating scope but the producer returned a non-serializable bean for injection\: {1}
+NON_SERIALIZABLE_BEAN_INJECTED_INTO_PASSIVATING_BEAN=The bean {0} declares passivating scope but the producer returned a non-serializable bean for injection: {1}
INJECTION_POINT_HAS_NON_SERIALIZABLE_DEPENDENCY=The bean {0} declares passivating scope but has non-serializable dependency {1}
INTERCEPTOR_SPECIFIED_TWICE=Enabled interceptor class {0} specified twice
INTERCEPTOR_NOT_ANNOTATED_OR_REGISTERED=Enabled interceptor class {0} is neither annotated @Interceptor nor registered through a portable extension
@@ -20,6 +20,6 @@
ALTERNATIVE_STEREOTYPE_SPECIFIED_MULTIPLE_TIMES=Cannot enable the same alternative stereotype {0} in beans.xml
ALTERNATIVE_BEAN_CLASS_NOT_ANNOTATED=Enabled alternative bean class {0} is not annotated @Alternative
ALTERNATIVE_BEAN_CLASS_SPECIFIED_MULTIPLE_TIMES=Cannot enable the same alternative bean class {0} in beans.xml
-DISPOSAL_METHODS_WITHOUT_PRODUCER=The following disposal methods were declared but did not resolve to a producer method\: {0}
-INJECTION_POINT_HAS_WILDCARD=An injection point of type {0} cannot have a wildcard type parameter\: {0}
-INJECTION_POINT_MUST_HAVE_TYPE_PARAMETER=An injection point of type {0} must have a type parameter\: {1}
+DISPOSAL_METHODS_WITHOUT_PRODUCER=The following disposal methods were declared but did not resolve to a producer method: {0}
+INJECTION_POINT_HAS_WILDCARD=An injection point of type {0} cannot have a wildcard type parameter: {0}
+INJECTION_POINT_MUST_HAVE_TYPE_PARAMETER=An injection point of type {0} must have a type parameter: {1}
Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/xml_en.properties
===================================================================
--- core/trunk/impl/src/main/resources/org/jboss/weld/messages/xml_en.properties 2010-01-15 13:53:21 UTC (rev 5477)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/xml_en.properties 2010-01-15 13:55:00 UTC (rev 5478)
@@ -2,6 +2,6 @@
LOAD_ERROR=Error loading beans.xml {0}
CANNOT_LOAD_CLASS=Could not load class {0}
PARSING_ERROR=Error parsing {0}
-MULTIPLE_ALTERNATIVES=<alternatives> can only be specified once, but appears multiple times\: {0}
-MULTIPLE_DECORATORS=<decorators> can only be specified once, but is specified multiple times\: {0}
-MULTIPLE_INTERCEPTORS=<interceptor> can only be specified once, but it is specified multiple times\: {0}
+MULTIPLE_ALTERNATIVES=<alternatives> can only be specified once, but appears multiple times: {0}
+MULTIPLE_DECORATORS=<decorators> can only be specified once, but is specified multiple times: {0}
+MULTIPLE_INTERCEPTORS=<interceptor> can only be specified once, but it is specified multiple times: {0}
16 years, 3 months
- 1
- 0
Weld SVN: r5477 - in core/trunk: impl/src/main/java/org/jboss/weld/injection and 3 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-15 08:53:21 -0500 (Fri, 15 Jan 2010)
New Revision: 5477
Added:
core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Cow.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/CowShed.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Field.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/GrassyField.java
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.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/injection/ParameterInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ReflectionMessage.java
core/trunk/impl/src/main/resources/org/jboss/weld/messages/reflection_en.properties
core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java
Log:
Test for FieldInjectionPoint, better exceptions
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 2010-01-15 13:41:30 UTC (rev 5476)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2010-01-15 13:53:21 UTC (rev 5477)
@@ -256,15 +256,22 @@
// Without this, the chaining of decorators will fail as the incomplete instance will be resolved
ctx.push(instance);
}
- InjectionPoint originalInjectionPoint = null;
+
if (hasDecorators())
{
- originalInjectionPoint = attachCorrectInjectionPoint();
+ InjectionPoint originalInjectionPoint = null;
+ try
+ {
+ originalInjectionPoint = attachCorrectInjectionPoint();
+ instance = applyDecorators(instance, ctx, originalInjectionPoint);
+
+ }
+ finally
+ {
+ Container.instance().services().get(CurrentInjectionPoint.class).pop();
+ Container.instance().services().get(CurrentInjectionPoint.class).push(originalInjectionPoint);
+ }
}
- if (hasDecorators())
- {
- instance = applyDecorators(instance, ctx, originalInjectionPoint);
- }
if (isInterceptionCandidate() && (hasCdiBoundInterceptors() || hasDirectlyDefinedInterceptors()))
{
instance = applyInterceptors(instance, ctx);
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 2010-01-15 13:41:30 UTC (rev 5476)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2010-01-15 13:53:21 UTC (rev 5477)
@@ -36,6 +36,7 @@
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.Bean;
+import org.jboss.weld.exceptions.ForbiddenStateException;
import org.jboss.weld.exceptions.InvalidObjectException;
import org.jboss.weld.exceptions.InvalidOperationException;
import org.jboss.weld.introspector.ConstructorSignature;
@@ -43,6 +44,7 @@
import org.jboss.weld.introspector.WeldClass;
import org.jboss.weld.introspector.WeldConstructor;
import org.jboss.weld.introspector.WeldParameter;
+import org.jboss.weld.logging.messages.ReflectionMessage;
import org.jboss.weld.manager.BeanManagerImpl;
public class ConstructorInjectionPoint<T> extends ForwardingWeldConstructor<T> implements WeldInjectionPoint<T, Constructor<T>>, Serializable
@@ -234,6 +236,12 @@
private Object readResolve()
{
+ WeldConstructor<T> constructor = getWeldConstructor();
+ Bean<T> bean = getDeclaringBean();
+ if (constructor == null || bean == null)
+ {
+ throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_CONSTRUCTOR_ON_DESERIALIZATION, getDeclaringBeanId(), getWeldClass(), signature);
+ }
return ConstructorInjectionPoint.of(getDeclaringBean(), getWeldConstructor());
}
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 2010-01-15 13:41:30 UTC (rev 5476)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java 2010-01-15 13:53:21 UTC (rev 5477)
@@ -36,9 +36,11 @@
import javax.inject.Inject;
import org.jboss.interceptor.util.InterceptionUtils;
+import org.jboss.weld.exceptions.ForbiddenStateException;
import org.jboss.weld.exceptions.InvalidObjectException;
import org.jboss.weld.introspector.ForwardingWeldField;
import org.jboss.weld.introspector.WeldField;
+import org.jboss.weld.logging.messages.ReflectionMessage;
import org.jboss.weld.manager.BeanManagerImpl;
public class FieldInjectionPoint<T, X> extends ForwardingWeldField<T, X> implements WeldInjectionPoint<T, Field>, Serializable
@@ -163,6 +165,12 @@
private Object readResolve()
{
+ WeldField<T, ?> field = getWeldField();
+ Bean<T> bean = getDeclaringBean();
+ if (field == null || bean == null)
+ {
+ throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_FIELD_ON_DESERIALIZATION, getDeclaringBeanId(), getWeldClass(), fieldName);
+ }
return FieldInjectionPoint.of(getDeclaringBean(), getWeldField());
}
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 2010-01-15 13:41:30 UTC (rev 5476)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java 2010-01-15 13:53:21 UTC (rev 5477)
@@ -35,11 +35,13 @@
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.Bean;
+import org.jboss.weld.exceptions.ForbiddenStateException;
import org.jboss.weld.exceptions.InvalidObjectException;
import org.jboss.weld.introspector.ForwardingWeldMethod;
import org.jboss.weld.introspector.MethodSignature;
import org.jboss.weld.introspector.WeldMethod;
import org.jboss.weld.introspector.WeldParameter;
+import org.jboss.weld.logging.messages.ReflectionMessage;
import org.jboss.weld.manager.BeanManagerImpl;
public class MethodInjectionPoint<T, X> extends ForwardingWeldMethod<T, X> implements WeldInjectionPoint<T, Method>
@@ -324,6 +326,12 @@
private Object readResolve()
{
+ WeldMethod<T, ?> method = getWeldMethod();
+ Bean<T> bean = getDeclaringBean();
+ if (method == null || bean == null)
+ {
+ throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_METHOD_ON_DESERIALIZATION, getDeclaringBeanId(), getWeldClass(), signature);
+ }
return MethodInjectionPoint.of(getDeclaringBean(), getWeldMethod());
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java 2010-01-15 13:41:30 UTC (rev 5476)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java 2010-01-15 13:53:21 UTC (rev 5477)
@@ -44,6 +44,7 @@
import org.jboss.weld.introspector.WeldConstructor;
import org.jboss.weld.introspector.WeldMethod;
import org.jboss.weld.introspector.WeldParameter;
+import org.jboss.weld.logging.messages.ReflectionMessage;
import org.jboss.weld.manager.BeanManagerImpl;
public class ParameterInjectionPoint<T, X> extends ForwardingWeldParameter<T, X> implements WeldInjectionPoint<T, Object>, Serializable
@@ -167,6 +168,12 @@
private Object readResolve()
{
+ WeldParameter<T, ?> parameter = getWeldParameter();
+ Bean<T> bean = getDeclaringBean();
+ if (parameter == null || bean == null)
+ {
+ throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_PARAMETER_ON_DESERIALIZATION, getDeclaringBeanId(), getWeldClass(), methodSignature, parameterPosition);
+ }
return ParameterInjectionPoint.of(getDeclaringBean(), getWeldParameter());
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java 2010-01-15 13:41:30 UTC (rev 5476)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java 2010-01-15 13:53:21 UTC (rev 5477)
@@ -53,6 +53,11 @@
{
return Container.instance().services().get(ClassTransformer.class).loadClass(declaringClass);
}
+
+ protected String getDeclaringBeanId()
+ {
+ return declaringBeanId;
+ }
}
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 2010-01-15 13:41:30 UTC (rev 5476)
+++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ReflectionMessage.java 2010-01-15 13:53:21 UTC (rev 5477)
@@ -28,6 +28,10 @@
@MessageId("000606") UNABLE_TO_GET_PARAMETER_NAME,
@MessageId("000607") ANNOTATION_MAP_NULL,
@MessageId("000608") DECLARED_ANNOTATION_MAP_NULL,
- @MessageId("000609") CLEANING_JAVASSIST_PROXY_CLASS;
+ @MessageId("000609") CLEANING_JAVASSIST_PROXY_CLASS,
+ @MessageId("000610") UNABLE_TO_GET_CONSTRUCTOR_ON_DESERIALIZATION,
+ @MessageId("000611") UNABLE_TO_GET_METHOD_ON_DESERIALIZATION,
+ @MessageId("000612") UNABLE_TO_GET_FIELD_ON_DESERIALIZATION,
+ @MessageId("000613") UNABLE_TO_GET_PARAMETER_ON_DESERIALIZATION;
}
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 2010-01-15 13:41:30 UTC (rev 5476)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/reflection_en.properties 2010-01-15 13:53:21 UTC (rev 5477)
@@ -7,4 +7,8 @@
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
-CLEANING_JAVASSIST_PROXY_CLASS=Cleaning Javassist proxy. Class {0}
\ No newline at end of file
+CLEANING_JAVASSIST_PROXY_CLASS=Cleaning Javassist proxy. Class {0}
+UNABLE_TO_GET_FIELD_ON_DESERIALIZATION=Unable to deserialize field. Declaring bean id {0}, declaring class {1}, field name {2}
+UNABLE_TO_GET_CONSTRUCTOR_ON_DESERIALIZATION=Unable to deserialize constructor. Declaring bean id {0}, declaring class {1}, signature {2}
+UNABLE_TO_GET_METHOD_ON_DESERIALIZATION=Unable to deserialize method. Declaring bean id {0}, declaring class {1}, signature {2}
+UNABLE_TO_GET_PARAMETER_ON_DESERIALIZATION=Unable to deserialize paramter. Declaring bean id {0}, declaring class {1}, parameter {3} of method with signature {2}
\ No newline at end of file
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Cow.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Cow.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Cow.java 2010-01-15 13:53:21 UTC (rev 5477)
@@ -0,0 +1,18 @@
+package org.jboss.weld.tests.injectionPoint;
+
+public class Cow
+{
+
+ private final String name;
+
+ public Cow(String name)
+ {
+ this.name = name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Cow.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/CowShed.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/CowShed.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/CowShed.java 2010-01-15 13:53:21 UTC (rev 5477)
@@ -0,0 +1,20 @@
+package org.jboss.weld.tests.injectionPoint;
+
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.jboss.weld.injection.FieldInjectionPoint;
+
+public class CowShed
+{
+
+ @Produces
+ public Cow get(InjectionPoint ip)
+ {
+ assert ip instanceof FieldInjectionPoint<?, ?>;
+ FieldInjectionPoint<?, ?> fip = (FieldInjectionPoint<?, ?>) ip;
+ assert fip.getDeclaringType().getJavaClass().equals(Field.class);
+ return new Cow("daisy");
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/CowShed.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Field.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Field.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Field.java 2010-01-15 13:53:21 UTC (rev 5477)
@@ -0,0 +1,15 @@
+package org.jboss.weld.tests.injectionPoint;
+
+import javax.inject.Inject;
+
+public class Field
+{
+
+ @Inject Cow cow;
+
+ public Cow getCow()
+ {
+ return cow;
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Field.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/GrassyField.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/GrassyField.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/GrassyField.java 2010-01-15 13:53:21 UTC (rev 5477)
@@ -0,0 +1,6 @@
+package org.jboss.weld.tests.injectionPoint;
+
+public class GrassyField extends Field
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/GrassyField.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java 2010-01-15 13:41:30 UTC (rev 5476)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java 2010-01-15 13:53:21 UTC (rev 5477)
@@ -37,5 +37,11 @@
InjectionPoint ip1 = Utils.deserialize(Utils.serialize(ip));
assert ip1.getMember().getName().equals("str");
}
+
+ @Test
+ public void testGetDeclaringType()
+ {
+ assert getReference(GrassyField.class).getCow().getName().equals("daisy");
+ }
}
16 years, 3 months
- 1
- 0
Weld SVN: r5476 - in servlet/trunk: tests/src/test/java/org/jboss/weld/test/tomcat/examples and 1 other directories.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-01-15 08:41:30 -0500 (Fri, 15 Jan 2010)
New Revision: 5476
Modified:
servlet/trunk/pom.xml
servlet/trunk/tests/src/test/java/org/jboss/weld/test/tomcat/examples/ExampleTest.java
servlet/trunk/tests/src/test/java/org/jboss/weld/test/tomcat/examples/MockExampleTest.java
servlet/trunk/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/LookupTest.java
Log:
fixed tests, use weld 1.0.0-SNAPSHOT
Modified: servlet/trunk/pom.xml
===================================================================
--- servlet/trunk/pom.xml 2010-01-15 12:32:58 UTC (rev 5475)
+++ servlet/trunk/pom.xml 2010-01-15 13:41:30 UTC (rev 5476)
@@ -49,7 +49,7 @@
<properties>
<weld.api.version>1.0</weld.api.version>
- <weld.core.version>1.0.0</weld.core.version>
+ <weld.core.version>1.0.1-SNAPSHOT</weld.core.version>
<!-- Use JSF 2 for all extensions support, despite core using JSF 1.2 -->
<jsf.version>2.0.0-RC</jsf.version>
<tomcat.version>6.0.20</tomcat.version>
Modified: servlet/trunk/tests/src/test/java/org/jboss/weld/test/tomcat/examples/ExampleTest.java
===================================================================
--- servlet/trunk/tests/src/test/java/org/jboss/weld/test/tomcat/examples/ExampleTest.java 2010-01-15 12:32:58 UTC (rev 5475)
+++ servlet/trunk/tests/src/test/java/org/jboss/weld/test/tomcat/examples/ExampleTest.java 2010-01-15 13:41:30 UTC (rev 5476)
@@ -2,6 +2,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.weld.test.AbstractWeldTest;
+import org.jboss.weld.test.Utils;
import org.jboss.weld.test.harness.ServletLifecycleContainersImpl;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -13,12 +14,12 @@
@Test
public void testGameGenerator() throws Exception
{
- Game game1 = getCurrentManager().getInstanceByType(Game.class);
- Game game2 = getCurrentManager().getInstanceByType(Game.class);
+ Game game1 = Utils.getReference(getCurrentManager(), Game.class);
+ Game game2 = Utils.getReference(getCurrentManager(), Game.class);
assert game1!=game2;
assert game1.getNumber()!=game2.getNumber();
- Generator gen1 = getCurrentManager().getInstanceByType(Generator.class);
- Generator gen2 = getCurrentManager().getInstanceByType(Generator.class);
+ Generator gen1 = Utils.getReference(getCurrentManager(), Generator.class);
+ Generator gen2 = Utils.getReference(getCurrentManager(), Generator.class);
assert gen1.getRandom()!=null;
assert gen1.getRandom()==gen2.getRandom();
}
@@ -27,7 +28,7 @@
public void testSentenceTranslator() throws Exception
{
- TextTranslator tt1 = getCurrentManager().getInstanceByType(TextTranslator.class);
+ TextTranslator tt1 = Utils.getReference(getCurrentManager(), TextTranslator.class);
try
{
tt1.translate("hello world");
Modified: servlet/trunk/tests/src/test/java/org/jboss/weld/test/tomcat/examples/MockExampleTest.java
===================================================================
--- servlet/trunk/tests/src/test/java/org/jboss/weld/test/tomcat/examples/MockExampleTest.java 2010-01-15 12:32:58 UTC (rev 5475)
+++ servlet/trunk/tests/src/test/java/org/jboss/weld/test/tomcat/examples/MockExampleTest.java 2010-01-15 13:41:30 UTC (rev 5476)
@@ -3,6 +3,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.jboss.weld.test.AbstractWeldTest;
+import org.jboss.weld.test.Utils;
import org.testng.annotations.Test;
@Artifact
@@ -13,7 +14,7 @@
@Test
public void testMockSentenceTranslator() throws Exception
{
- TextTranslator tt2 = getCurrentManager().getInstanceByType(TextTranslator.class);
+ TextTranslator tt2 = Utils.getReference(getCurrentManager(), TextTranslator.class);
assert "Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.".equals( tt2.translate("Hello world. How's tricks?") );
}
Modified: servlet/trunk/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/LookupTest.java
===================================================================
--- servlet/trunk/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/LookupTest.java 2010-01-15 12:32:58 UTC (rev 5475)
+++ servlet/trunk/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/LookupTest.java 2010-01-15 13:41:30 UTC (rev 5476)
@@ -8,6 +8,7 @@
import org.jboss.testharness.impl.packaging.Resource;
import org.jboss.testharness.impl.packaging.Resources;
import org.jboss.weld.test.AbstractWeldTest;
+import org.jboss.weld.test.Utils;
import org.testng.annotations.Test;
@Artifact(addCurrentPackage=false)
@@ -22,15 +23,15 @@
@Test
public void testManagerInJndi() throws Exception
{
- assert getCurrentManager().getInstanceByType(Mouse.class).getManager() != null;
- assert getCurrentManager().getInstanceByType(Mouse.class).getManager().equals(getCurrentManager());
+ assert Utils.getReference(getCurrentManager(),Mouse.class).getManager() != null;
+ assert Utils.getReference(getCurrentManager(),Mouse.class).getManager().equals(getCurrentManager());
}
@Test
public void testResource() throws Exception
{
- assert getCurrentManager().getInstanceByType(Vole.class).getManager() != null;
- assert getCurrentManager().getInstanceByType(Vole.class).getManager().equals(getCurrentManager());
+ assert Utils.getReference(getCurrentManager(),Vole.class).getManager() != null;
+ assert Utils.getReference(getCurrentManager(),Vole.class).getManager().equals(getCurrentManager());
}
}
16 years, 3 months
- 1
- 0
Weld SVN: r5475 - doc/trunk/reference/pt-BR.
by weld-commits＠lists.jboss.org
Author: brunolmfg
Date: 2010-01-15 07:32:58 -0500 (Fri, 15 Jan 2010)
New Revision: 5475
Modified:
doc/trunk/reference/pt-BR/example.po
Log:
WELD-17: Translated chapter about JSF example.
Modified: doc/trunk/reference/pt-BR/example.po
===================================================================
--- doc/trunk/reference/pt-BR/example.po 2010-01-15 12:21:12 UTC (rev 5474)
+++ doc/trunk/reference/pt-BR/example.po 2010-01-15 12:32:58 UTC (rev 5475)
@@ -6,8 +6,8 @@
"Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: 2009-12-19 18:01-0300\n"
-"Last-Translator: João Paulo Viragine <joao.viragine(a)redhat.com>\n"
+"PO-Revision-Date: 2010-01-15 10:27-0300\n"
+"Last-Translator: Bruno Leonardo Gonçalves <brunolmfg(a)gmail.com>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@
#. Tag: para
#: example.xml:6
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"Let's illustrate these ideas with a full example. We're going to implement "
"user login/logout for an application that uses JSF. First, we'll define a "
@@ -29,14 +29,15 @@
"with constraints defined using annotations from the Bean Validation "
"specification:"
msgstr ""
-"Ilustraremos essas idéias com um exemplo completo. Nós implementaremos um "
+"Vamos ilustrar essas ideias com um exemplo completo. Nós implementaremos um "
"login/logout de usuário de uma aplicação que utiliza JSF. Primeiro, "
-"definiremos um Web Bean que irá armazenar o nome do usuário (username) e a "
-"senha (password) fornecidos durante o login:"
+"definiremos um bean com escopo de solicitação para manter o nome do usuário "
+"(username) e a senha (password) fornecidos durante o login, com as "
+"restrições definidas utilizando anotações da especificação Beans Validation:"
#. Tag: programlisting
#: example.xml:12
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"<![CDATA[@Named @RequestScoped\n"
"public class Credentials {\n"
@@ -57,23 +58,24 @@
" private String username;\n"
" private String password;\n"
" \n"
+" @NotNull @Length(min=3, max=25)\n"
" public String getUsername() { return username; }\n"
" public void setUsername(String username) { this.username = username; }\n"
" \n"
+" @NotNull @Length(min=6, max=20)\n"
" public String getPassword() { return password; }\n"
" public void setPassword(String password) { this.password = password; }\n"
"}]]>"
#. Tag: para
#: example.xml:14
-#, fuzzy, no-c-format
+#, no-c-format
msgid "This bean is bound to the login prompt in the following JSF form:"
-msgstr ""
-"Esse Web Bean é vinculado ao prompt de login do seguinte formulário JSF:"
+msgstr "Esse bean é vinculado ao prompt de login no seguinte formulário JSF:"
#. Tag: programlisting
#: example.xml:16
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"<![CDATA[<h:form>\n"
" <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
@@ -92,10 +94,12 @@
msgstr ""
"<![CDATA[<h:form>\n"
" <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-" <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-" <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-" <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-" <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
+" <f:validateBean>\n"
+" <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+" <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
+" <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+" <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
+" </f:validateBean>\n"
" </h:panelGrid>\n"
" <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
"login.loggedIn}\"/>\n"
@@ -107,11 +111,11 @@
#: example.xml:18
#, no-c-format
msgid "Users are represented by a JPA entity:"
-msgstr ""
+msgstr "Os usuários são representados por uma entidade JPA:"
#. Tag: programlisting
#: example.xml:22
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"<![CDATA[@Entity\n"
"public class User {\n"
@@ -123,16 +127,14 @@
" public String setPassword(String password) { this.password = password; }\n"
"}]]>"
msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-" private String username;\n"
-" private String password;\n"
-" \n"
-" public String getUsername() { return username; }\n"
-" public void setUsername(String username) { this.username = username; }\n"
-" \n"
-" public String getPassword() { return password; }\n"
-" public void setPassword(String password) { this.password = password; }\n"
+"<![CDATA[@Entity\n"
+"public class User {\n"
+" private @NotNull @Length(min=3, max=25) @Id String username;\n"
+" private @NotNull @Length(min=6, max=20) String password;\n"
+" \n"
+" public String getUsername() { return username; }\n"
+" public void setUsername(String username) { this.username = username; }\n"
+" public String setPassword(String password) { this.password = password; }\n"
"}]]>"
#. Tag: para
@@ -143,18 +145,21 @@
"file to configure the JPA persistence unit containing <literal>User</"
"literal>.)"
msgstr ""
+"(Observe que também vamos precisar de um arquivo <literal>persistence.xml</"
+"literal> para configurar a unidade de persistência JPA contendo a entidade "
+"<literal>User</literal>.)"
#. Tag: para
#: example.xml:29
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"The actual work is done by a session-scoped bean that maintains information "
"about the currently logged-in user and exposes the <literal>User</literal> "
"entity to other beans:"
msgstr ""
-"O verdadeiro trabalho é realizado por um Web Bean em escopo de sessão que "
+"O verdadeiro trabalho é realizado por um bean com escopo de sessão que "
"mantém informações sobre o atual usuário conectado e expõe a entidade "
-"<literal>User</literal> para outros Web Beans:"
+"<literal>User</literal> para outros beans:"
#. Tag: programlisting
#: example.xml:34
@@ -243,6 +248,8 @@
"<literal>@LoggedIn</literal> and <literal>@UserDatabase</literal> are custom "
"qualifier annotations:"
msgstr ""
+"<literal>@LoggedIn</literal> e <literal>@UserDatabase</literal> são "
+"anotações de qualificadores personalizados:"
#. Tag: programlisting
#: example.xml:38
@@ -279,28 +286,32 @@
"We need an adaptor bean to expose our typesafe <literal>EntityManager</"
"literal>:"
msgstr ""
+"Precisamos de um bean adaptador para expor nossa <literal>EntityManager</"
+"literal> typesafe:"
#. Tag: programlisting
#: example.xml:46
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"<![CDATA[class UserDatabaseProducer {\n"
" @Produces @UserDatabase @PersistenceContext \n"
" static EntityManager userDatabase;\n"
"}]]>"
msgstr ""
-"<![CDATA[public class UserDatabaseProducer {\n"
-" @Produces @UserDatabase @PersistenceContext EntityManager userDatabase;\n"
+"<![CDATA[class UserDatabaseProducer {\n"
+" @Produces @UserDatabase @PersistenceContext \n"
+" static EntityManager userDatabase;\n"
"}]]>"
#. Tag: para
#: example.xml:48
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"Now <literal>DocumentEditor</literal>, or any other bean, can easily inject "
"the current user:"
msgstr ""
-"Agora, qualquer outro Web Bean pode facilmente injetar o usuário atual:"
+"Agora, <literal>DocumentEditor</literal> ou qualquer outro bean, pode "
+"facilmente injetar o usuário atual:"
#. Tag: programlisting
#: example.xml:50
@@ -332,7 +343,7 @@
#: example.xml:52
#, no-c-format
msgid "Or we can reference the current user in a JSF view:"
-msgstr ""
+msgstr "Ou podemos referenciar o usuário atual em uma visão JSF:"
#. Tag: programlisting
#: example.xml:54
@@ -348,16 +359,11 @@
#. Tag: para
#: example.xml:56
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"Hopefully, this example gave you a taste of the CDI programming model. In "
"the next chapter, we'll explore dependency injection in greater depth."
msgstr ""
-"Esperamos que esse exemplo tenha dado um gostinho do modelo de programação "
-"com Web Beans. No capítulo seguinte, exploraremos a injeção de dependência "
-"da Web Beans em profundidade."
-
-#~ msgid "Of course, <literal>@LoggedIn</literal> is a binding annotation:"
-#~ msgstr ""
-#~ "Certamente, <literal>@LoggedIn</literal> é uma anotação de binding "
-#~ "(binding annotation):"
+"Esperamos que este exemplo tenha dado um gostinho do modelo de programação "
+"em CDI. No capítulo seguinte, exploraremos a injeção de dependência com "
+"maior profundidade."
16 years, 3 months
- 1
- 0
Weld SVN: r5474 - core/trunk/impl/src/main/resources/org/jboss/weld/messages.
by weld-commits＠lists.jboss.org
Author: nickarls
Date: 2010-01-15 07:21:12 -0500 (Fri, 15 Jan 2010)
New Revision: 5474
Modified:
core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties
Log:
minor: bean message
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 2010-01-15 12:16:58 UTC (rev 5473)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties 2010-01-15 12:21:12 UTC (rev 5474)
@@ -86,7 +86,7 @@
CANNOT_DESTROY_NULL_BEAN=Cannot destroy null instance of {0}
CANNOT_DESTROY_ENTERPRISE_BEAN_NOT_CREATED=Cannot destroy session bean instance not created by the container\: {0}
MESSAGE_DRIVEN_BEANS_CANNOT_BE_MANAGED=Message driven beans cannot be Managed Beans\: {0}
-OBSERVER_METHOD_MUST_BE_STATIC_OR_BUSINESS=Observer method must be static or business method\: {0} on {1}
+OBSERVER_METHOD_MUST_BE_STATIC_OR_BUSINESS=Observer method must be static or local business method\: {0} on {1}
TOO_MANY_EJBS_FOR_CLASS=Unable to determine EJB for {0}, multiple EJBs with that class\: {1}
ABSTRACT_METHOD_MUST_MATCH_DECORATED_TYPE=Method {0} defined on {1} does not match a method on decorated type {2}
IP_NOT_CONSTRUCTOR_OR_METHOD=Cannot handle injection point as a constructor or method\: {0}
16 years, 3 months
- 1
- 0
Weld SVN: r5473 - in core/trunk: impl/src/main/java/org/jboss/weld/introspector/jlr and 2 other directories.
by weld-commits＠lists.jboss.org
Author: nickarls
Date: 2010-01-15 07:16:58 -0500 (Fri, 15 Jan 2010)
New Revision: 5473
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bean/interceptor/ClassInterceptionHandlerFactory.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/SecureReflectionAccess.java
core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/SecureReflections.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/ReflectionTest.java
Log:
Only escalating privileges when actually used, was causing problems on GAE
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/interceptor/ClassInterceptionHandlerFactory.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/interceptor/ClassInterceptionHandlerFactory.java 2010-01-14 23:39:20 UTC (rev 5472)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/interceptor/ClassInterceptionHandlerFactory.java 2010-01-15 12:16:58 UTC (rev 5473)
@@ -48,7 +48,7 @@
{
// this is not a managed instance - assume no-argument constructor exists
Constructor<T> constructor = (Constructor<T>) SecureReflections.getDeclaredConstructor(clazz);
- T interceptorInstance = constructor.newInstance();
+ T interceptorInstance = SecureReflections.ensureConstructorAccessible(constructor).newInstance();
// inject
manager.createInjectionTarget(manager.createAnnotatedType(clazz)).inject(interceptorInstance, creationalContext);
return new DirectClassInterceptionHandler<T>(interceptorInstance, clazz);
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java 2010-01-14 23:39:20 UTC (rev 5472)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java 2010-01-15 12:16:58 UTC (rev 5473)
@@ -39,6 +39,7 @@
import org.jboss.weld.resources.ClassTransformer;
import org.jboss.weld.util.reflection.HierarchyDiscovery;
import org.jboss.weld.util.reflection.Reflections;
+import org.jboss.weld.util.reflection.SecureReflections;
import com.google.common.base.Supplier;
import com.google.common.collect.ListMultimap;
@@ -238,7 +239,7 @@
*/
public T newInstance(Object... parameters) throws IllegalArgumentException, InstantiationException, IllegalAccessException, InvocationTargetException
{
- return getDelegate().newInstance(parameters);
+ return SecureReflections.ensureConstructorAccessible(getDelegate()).newInstance(parameters);
}
/**
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java 2010-01-14 23:39:20 UTC (rev 5472)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java 2010-01-15 12:16:58 UTC (rev 5473)
@@ -91,7 +91,7 @@
public void set(Object instance, Object value) throws IllegalArgumentException, IllegalAccessException
{
- field.set(instance, value);
+ SecureReflections.ensureFieldAccessible(field).set(instance, value);
}
public void setOnInstance(Object instance, Object value) throws IllegalArgumentException, SecurityException, IllegalAccessException, NoSuchFieldException
@@ -104,7 +104,7 @@
{
try
{
- return (T) getDelegate().get(instance);
+ return (T) SecureReflections.ensureFieldAccessible(getDelegate()).get(instance);
}
catch (Exception e)
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/SecureReflectionAccess.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/SecureReflectionAccess.java 2010-01-14 23:39:20 UTC (rev 5472)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/SecureReflectionAccess.java 2010-01-15 12:16:58 UTC (rev 5473)
@@ -16,11 +16,8 @@
*/
package org.jboss.weld.util.reflection;
-import java.lang.reflect.AccessibleObject;
import java.lang.reflect.InvocationTargetException;
-import java.security.AccessController;
import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
/**
* Helper class for doing work in a privileged context under the
@@ -34,7 +31,6 @@
* @return The value of the operation
* @throws Exception If the operation failed
*/
- @SuppressWarnings("unchecked")
public Object run() throws Exception
{
// SecurityManager securityManager = System.getSecurityManager();
@@ -78,8 +74,7 @@
/**
* Runs the work and unwraps and NoSuchFieldException from a possible
- * PrivilegedActionException. Wraps any other exceptions in
- * RuntimeException
+ * PrivilegedActionException. Wraps any other exceptions in RuntimeException
*
* @return The result of the work (usually a Field)
* @throws NoSuchFieldException If a field with the specified name is not
@@ -111,12 +106,11 @@
/**
* Runs the work and unwraps and NoSuchMethodException from a possible
- * PrivilegedActionException. Wraps any other exceptions in
- * RuntimeException
+ * PrivilegedActionException. Wraps any other exceptions in RuntimeException
*
* @return The result of the work (usually a Method)
- * @throws NoSuchMethodException If a method with the specified name is
- * not found.
+ * @throws NoSuchMethodException If a method with the specified name is not
+ * found.
*/
public Object runAsMethodAccess() throws NoSuchMethodException
{
@@ -145,22 +139,20 @@
/**
* Runs the work and unwraps any IllegalAccessException,
* IllegalArgumentException or InvocationTargetException from a possible
- * PrivilegedActionException. Wraps any other exceptions in
- * RuntimeException
+ * PrivilegedActionException. Wraps any other exceptions in RuntimeException
*
* @return The return value of the method invoked
* @throws IllegalAccessException If this Method object enforces Java
* language access control and the underlying method is
* inaccessible.
- * @throws IllegalArgumentException If the method is an instance method
- * and the specified object argument is not an instance of the
- * class or interface declaring the underlying method (or of a
- * subclass or implementor thereof); if the number of actual
- * and formal parameters differ; if an unwrapping conversion
- * for primitive arguments fails; or if, after possible
- * unwrapping, a parameter value cannot be converted to the
- * corresponding formal parameter type by a method invocation
- * conversion.
+ * @throws IllegalArgumentException If the method is an instance method and
+ * the specified object argument is not an instance of the class
+ * or interface declaring the underlying method (or of a subclass
+ * or implementor thereof); if the number of actual and formal
+ * parameters differ; if an unwrapping conversion for primitive
+ * arguments fails; or if, after possible unwrapping, a parameter
+ * value cannot be converted to the corresponding formal parameter
+ * type by a method invocation conversion.
* @throws InvocationTargetException I the underlying method throws an
* exception.
*/
@@ -207,16 +199,15 @@
/**
* Runs the work and unwraps any IllegalAccessException,
* InstantiationException or IllegalAccessException from a possible
- * PrivilegedActionException. Wraps any other exceptions in
- * RuntimeException
+ * PrivilegedActionException. Wraps any other exceptions in RuntimeException
*
* @return The result of the work (usually a new instance)
- * @throws InstantiationException If the class or its nullary constructor
- * is not accessible.
- * @throws IllegalAccessException If this Class represents an abstract
- * class, an interface, an array class, a primitive type, or
- * void; or if the class has no nullary constructor; or if the
- * instantiation fails for some other reason.
+ * @throws InstantiationException If the class or its nullary constructor is
+ * not accessible.
+ * @throws IllegalAccessException If this Class represents an abstract class,
+ * an interface, an array class, a primitive type, or void; or if
+ * the class has no nullary constructor; or if the instantiation
+ * fails for some other reason.
*/
public Object runAsInstantiation() throws InstantiationException, IllegalAccessException
{
@@ -250,38 +241,6 @@
}
}
- /**
- * Makes an list of objects accessible. Must be run from within work() or
- * another privileged location
- *
- * @param accessibleObjects The objects to manipulate
- * @return The accessible objects
- */
- protected AccessibleObject[] ensureAccessible(AccessibleObject[] accessibleObjects)
- {
- for (AccessibleObject accessibleObject : accessibleObjects)
- {
- ensureAccessible(accessibleObject);
- }
- return accessibleObjects;
- }
-
- /**
- * Makes an object accessible. Must be run from within work() or another
- * privileged location
- *
- * @param accessibleObjects The object to manipulate
- * @return The accessible object
- */
- protected AccessibleObject ensureAccessible(AccessibleObject accessibleObject)
- {
- if (!accessibleObject.isAccessible())
- {
- accessibleObject.setAccessible(true);
- }
- return accessibleObject;
- }
-
protected abstract Object work() throws Exception;
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/SecureReflections.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/SecureReflections.java 2010-01-14 23:39:20 UTC (rev 5472)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/SecureReflections.java 2010-01-15 12:16:58 UTC (rev 5473)
@@ -19,6 +19,7 @@
import static org.jboss.weld.logging.messages.UtilMessage.ANNOTATION_VALUES_INACCESSIBLE;
import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -73,7 +74,7 @@
@Override
protected Object work() throws Exception
{
- return ensureAccessible(clazz.getDeclaredField(fieldName));
+ return clazz.getDeclaredField(fieldName);
}
}.runAsFieldAccess();
}
@@ -111,7 +112,7 @@
@Override
protected Object work() throws Exception
{
- return ensureAccessible(clazz.getDeclaredFields());
+ return clazz.getDeclaredFields();
}
}.runAndWrap();
}
@@ -155,7 +156,7 @@
@Override
protected Object work() throws Exception
{
- return ensureAccessible(clazz.getDeclaredMethod(methodName, parameterTypes));
+ return clazz.getDeclaredMethod(methodName, parameterTypes);
}
}.runAsMethodAccess();
}
@@ -193,7 +194,7 @@
@Override
protected Object work() throws Exception
{
- return ensureAccessible(clazz.getDeclaredMethods());
+ return clazz.getDeclaredMethods();
}
}.runAndWrap();
}
@@ -235,8 +236,7 @@
@Override
protected Object work() throws Exception
{
- Constructor<?> constructor = clazz.getDeclaredConstructor(parameterTypes);
- return clazz == Class.class ? constructor : ensureAccessible(constructor);
+ return clazz.getDeclaredConstructor(parameterTypes);
}
}.runAsMethodAccess();
}
@@ -274,8 +274,7 @@
@Override
protected Object work() throws Exception
{
- Constructor<?>[] constructors = clazz.getDeclaredConstructors();
- return clazz == Class.class ? constructors : ensureAccessible(constructors);
+ return clazz.getDeclaredConstructors();
}
}.runAndWrap();
@@ -301,12 +300,67 @@
@Override
protected Object work() throws Exception
{
- return ((Method) ensureAccessible(method)).invoke(instance, parameters);
+ return ensureMethodAccessible(method).invoke(instance, parameters);
}
}.runAsInvocation();
}
-
+
/**
+ * Makes a method accessible
+ *
+ * @param method The method to make accessible
+ * @return The accessible method
+ */
+ public static Method ensureMethodAccessible(final Method method)
+ {
+ return (Method) ensureAccessible(method);
+ }
+
+ /**
+ * Makes a field accessible
+ *
+ * @param field The field to make accessible
+ * @return The accessible field
+ */
+ public static Field ensureFieldAccessible(final Field field)
+ {
+ return (Field) ensureAccessible(field);
+ }
+
+ /**
+ * Makes a constructor accessible
+ *
+ * @param constructor The constructor to make accessible
+ * @return The accessible constructor
+ */
+ public static <T> Constructor<T> ensureConstructorAccessible(final Constructor<T> constructor)
+ {
+ return (Constructor<T>) ensureAccessible(constructor);
+ }
+
+ /**
+ * Makes an object accessible.
+ *
+ * @param accessibleObjects The object to manipulate
+ * @return The accessible object
+ */
+ private static AccessibleObject ensureAccessible(final AccessibleObject accessibleObject)
+ {
+ return (AccessibleObject) new SecureReflectionAccess()
+ {
+ @Override
+ protected Object work() throws Exception
+ {
+ if (!accessibleObject.isAccessible())
+ {
+ accessibleObject.setAccessible(true);
+ }
+ return accessibleObject;
+ }
+ }.runAndWrap();
+ }
+
+ /**
* Invokes a given method with given parameters on an instance
*
* @param instance The instance to invoke on
@@ -318,7 +372,7 @@
* @throws InvocationTargetException If there was another error invoking the
* method
* @see java.lang.reflect.Method#invoke(Object, Object...)
- */
+ */
public static Object invoke(final Object instance, final String methodName, final Object... parameters) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException
{
return new SecureReflectionAccess()
@@ -332,7 +386,7 @@
parameterTypes[i] = parameters[i].getClass();
}
Method method = getMethod(instance.getClass(), methodName, parameterTypes);
- return method.invoke(instance, parameters);
+ return ensureMethodAccessible(method).invoke(instance, parameters);
}
}.runAsInvocation();
}
@@ -371,8 +425,8 @@
public static Method lookupMethod(Object instance, Method method) throws NoSuchMethodException
{
return lookupMethod(instance.getClass(), method.getName(), method.getParameterTypes());
- }
-
+ }
+
/**
* Returns a method from the class or any class/interface in the inheritance
* hierarchy
@@ -424,7 +478,7 @@
}
/**
- * Helper class for reading the value of an annotation
+ * Helper class for reading the value of an annotation
*
* @param annotation The annotation to inspect
* @return The array of classes
@@ -445,7 +499,7 @@
/**
* Checks if a method is found in a class
*
- * @param clazz The class to inspect
+ * @param clazz The class to inspect
* @param methodName The name of the method
* @param parameterTypes The parameter types of the method
* @return true if method is present, false otherwise
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/ReflectionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/ReflectionTest.java 2010-01-14 23:39:20 UTC (rev 5472)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/ReflectionTest.java 2010-01-15 12:16:58 UTC (rev 5473)
@@ -1,6 +1,8 @@
package org.jboss.weld.tests.unit.security;
import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -49,9 +51,23 @@
@Test
public void testFieldAccess()
{
- testAllAccessible(SecureReflections.getDeclaredFields(TestObject.class));
+ testAllAccessible(grantAccess(SecureReflections.getDeclaredFields(TestObject.class)));
}
-
+
+ private AccessibleObject[] grantAccess(AccessibleObject[] objects) {
+ for (AccessibleObject object : objects)
+ {
+ if (object instanceof Field) {
+ SecureReflections.ensureFieldAccessible((Field) object);
+ } else if (object instanceof Method) {
+ SecureReflections.ensureMethodAccessible((Method) object);
+ } else if (object instanceof Constructor<?>) {
+ SecureReflections.ensureConstructorAccessible((Constructor<?>)object);
+ }
+ }
+ return objects;
+ }
+
private void testAllAccessible(AccessibleObject[] objects)
{
for (AccessibleObject object : objects)
@@ -102,7 +118,7 @@
@Test
public void testMethodAccess()
{
- testAllAccessible(SecureReflections.getDeclaredMethods(TestObject.class));
+ testAllAccessible(grantAccess(SecureReflections.getDeclaredMethods(TestObject.class)));
}
@Test
@@ -144,7 +160,7 @@
@Test
public void testConstructorAccess()
{
- testAllAccessible(SecureReflections.getDeclaredConstructors(TestObject.class));
+ testAllAccessible(grantAccess(SecureReflections.getDeclaredConstructors(TestObject.class)));
}
@Test
16 years, 3 months
- 1
- 0
Weld SVN: r5472 - in core/trunk: jboss-tck-runner and 1 other directory.
by weld-commits＠lists.jboss.org
Author: dallen6
Date: 2010-01-14 18:39:20 -0500 (Thu, 14 Jan 2010)
New Revision: 5472
Modified:
core/trunk/jboss-as/pom.xml
core/trunk/jboss-tck-runner/pom.xml
Log:
WELD-337 Changes related to moving to JBoss AS 6.0.0-SNAPSHOT
Modified: core/trunk/jboss-as/pom.xml
===================================================================
--- core/trunk/jboss-as/pom.xml 2010-01-14 23:29:02 UTC (rev 5471)
+++ core/trunk/jboss-as/pom.xml 2010-01-14 23:39:20 UTC (rev 5472)
@@ -69,9 +69,9 @@
</goals>
<configuration>
<tasks>
- <property file="${project.directory}/local.build.properties" />
- <property file="${project.directory}/build.properties" />
- <property name="jboss.home" value="${env.JBOSS_HOME}" />s
+ <property file="${basedir}/local.build.properties" />
+ <property file="${basedir}/build.properties" />
+ <property name="jboss.home" value="${env.JBOSS_HOME}" />
<delete
dir="${jboss.home}/server/default/deployers/weld.deployer"
failonerror="false" />
Modified: core/trunk/jboss-tck-runner/pom.xml
===================================================================
--- core/trunk/jboss-tck-runner/pom.xml 2010-01-14 23:29:02 UTC (rev 5471)
+++ core/trunk/jboss-tck-runner/pom.xml 2010-01-14 23:39:20 UTC (rev 5472)
@@ -40,6 +40,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
16 years, 3 months
- 1
- 0
Weld SVN: r5471 - in cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken: nonPassivationCapableProducerField and 1 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-14 18:29:02 -0500 (Thu, 14 Jan 2010)
New Revision: 5471
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java
Log:
WELD-10
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2010-01-14 22:54:30 UTC (rev 5470)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2010-01-14 23:29:02 UTC (rev 5471)
@@ -21,11 +21,10 @@
@ExpectedDeploymentException(DeploymentFailure.class)
public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test
{
- @Test(groups = { "passivation", "ri-wrong-cause" })
+ @Test(groups = { "passivation" })
@SpecAssertions({
@SpecAssertion(section = "6.6.1", id = "db")
})
- // TODO RI is causing a deployement problem, but for the wrong reason
public void testNonPassivationCapableProducerFieldNotOk()
{
assert false;
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2010-01-14 22:54:30 UTC (rev 5470)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2010-01-14 23:29:02 UTC (rev 5471)
@@ -21,11 +21,10 @@
@ExpectedDeploymentException(DeploymentFailure.class)
public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test
{
- @Test(groups = { "passivation", "ri-wrong-cause" })
+ @Test(groups = { "passivation" })
@SpecAssertions({
@SpecAssertion(section = "6.6.4", id = "d")
})
- // TODO RI is erroring, but for the wrong reason
public void testNonPassivationCapableProducerFieldNotOk()
{
assert false;
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2010-01-14 22:54:30 UTC (rev 5470)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2010-01-14 23:29:02 UTC (rev 5471)
@@ -21,12 +21,11 @@
@ExpectedDeploymentException(DeploymentFailure.class)
public class NonPassivationCapableProducerMethodTest extends AbstractJSR299Test
{
- @Test(groups = { "passivation", "ri-wrong-cause" })
+ @Test(groups = { "passivation" })
@SpecAssertions({
@SpecAssertion(section = "6.6.1", id = "cb"),
@SpecAssertion(section = "6.6.4", id = "ca")
})
- // TODO Test passes, but with wrong exception
public void testNonPassivationCapableProducerMethodNotOk()
{
assert false;
16 years, 3 months
- 1
- 0
Weld SVN: r5470 - in core/trunk: impl/src/main/java/org/jboss/weld/ejb and 5 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-14 17:54:30 -0500 (Thu, 14 Jan 2010)
New Revision: 5470
Added:
core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/
core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/Cow.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/
core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/EJBTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/MilkMan.java
core/trunk/tests/src/test/resources/org/jboss/weld/tests/ejb/
core/trunk/tests/src/test/resources/org/jboss/weld/tests/ejb/mdb/
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java
core/trunk/impl/src/main/java/org/jboss/weld/ejb/InternalEjbDescriptor.java
Log:
WELD-353
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java 2010-01-14 22:53:20 UTC (rev 5469)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java 2010-01-14 22:54:30 UTC (rev 5470)
@@ -112,7 +112,10 @@
}
for (InternalEjbDescriptor<?> ejbDescriptor : getEnvironment().getEjbDescriptors())
{
- createSessionBean(ejbDescriptor);
+ if (ejbDescriptor.isSingleton() || ejbDescriptor.isStateful() || ejbDescriptor.isStateless())
+ {
+ createSessionBean(ejbDescriptor);
+ }
}
// Now create the new beans
Modified: core/trunk/impl/src/main/java/org/jboss/weld/ejb/InternalEjbDescriptor.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/ejb/InternalEjbDescriptor.java 2010-01-14 22:53:20 UTC (rev 5469)
+++ core/trunk/impl/src/main/java/org/jboss/weld/ejb/InternalEjbDescriptor.java 2010-01-14 22:54:30 UTC (rev 5470)
@@ -19,7 +19,6 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import org.jboss.weld.ejb.spi.BusinessInterfaceDescriptor;
import org.jboss.weld.ejb.spi.EjbDescriptor;
@@ -45,19 +44,14 @@
public InternalEjbDescriptor(EjbDescriptor<T> ejbDescriptor)
{
this.delegate = ejbDescriptor;
- Iterator<BusinessInterfaceDescriptor<?>> it = ejbDescriptor.getLocalBusinessInterfaces().iterator();
- if (it.hasNext())
- {
- this.objectInterface = it.next().getInterface();
- }
- else
- {
- this.objectInterface = null;
- }
+ this.objectInterface = findObjectInterface(ejbDescriptor.getLocalBusinessInterfaces());
removeMethodSignatures = new ArrayList<MethodSignature>();
- for (Method method : delegate.getRemoveMethods())
+ if (ejbDescriptor.getRemoveMethods() != null)
{
- removeMethodSignatures.add(new MethodSignatureImpl(method));
+ for (Method method : ejbDescriptor.getRemoveMethods())
+ {
+ removeMethodSignatures.add(new MethodSignatureImpl(method));
+ }
}
}
@@ -77,4 +71,16 @@
return removeMethodSignatures;
}
+ private static Class<?> findObjectInterface(Collection<BusinessInterfaceDescriptor<?>> interfaces)
+ {
+ if (interfaces != null && !interfaces.isEmpty())
+ {
+ return interfaces.iterator().next().getInterface();
+ }
+ else
+ {
+ return null;
+ }
+ }
+
}
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/Cow.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/Cow.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/Cow.java 2010-01-14 22:54:30 UTC (rev 5470)
@@ -0,0 +1,21 @@
+package org.jboss.weld.tests.ejb;
+
+import javax.ejb.Stateful;
+
+@Stateful
+public class Cow
+{
+
+ private boolean pinged;
+
+ public boolean isPinged()
+ {
+ return pinged;
+ }
+
+ public void ping()
+ {
+ pinged = true;
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/Cow.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java 2010-01-14 22:54:30 UTC (rev 5470)
@@ -0,0 +1,24 @@
+package org.jboss.weld.tests.ejb;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)Packaging(PackagingType.EAR)
+@IntegrationTest
+public class EJBTest extends AbstractWeldTest
+{
+
+ @Test(groups="broken")
+ public void testNoInterface()
+ {
+ Cow cow = getReference(Cow.class);
+ cow.ping();
+ assert cow.isPinged();
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/EJBTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/EJBTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/EJBTest.java 2010-01-14 22:54:30 UTC (rev 5470)
@@ -0,0 +1,19 @@
+package org.jboss.weld.tests.ejb.mdb;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)Packaging(PackagingType.EAR)
+public class EJBTest extends AbstractWeldTest
+{
+
+ @Test
+ public void testMdbDeploys()
+ {
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/EJBTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/MilkMan.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/MilkMan.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/MilkMan.java 2010-01-14 22:54:30 UTC (rev 5470)
@@ -0,0 +1,20 @@
+package org.jboss.weld.tests.ejb.mdb;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+@MessageDriven(activationConfig={
+ @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+ @ActivationConfigProperty(propertyName="destination", propertyValue="queue/DLQ")
+ })
+public class MilkMan implements MessageListener
+{
+
+ public void onMessage(Message message)
+ {
+
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/MilkMan.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
16 years, 3 months
- 1
- 0