Author: nickarls Date: 2009-12-03 08:31:01 -0500 (Thu, 03 Dec 2009) New Revision: 5202 Modified: core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java core/trunk/impl/src/main/java/org/jboss/weld/Validator.java core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/CallableMethodHandler.java core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/AbstractDecoratorMethodHandler.java core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseBeanProxyMethodHandler.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BootstrapMessage.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/NameBasedResolver.java core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java core/trunk/impl/src/main/java/org/jboss/weld/util/Reflections.java core/trunk/impl/src/main/java/org/jboss/weld/xml/BeansXmlParser.java core/trunk/impl/src/main/java/org/jboss/weld/xml/EnabledClasses.java core/trunk/impl/src/main/java/org/jboss/weld/xml/MergedElements.java core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties Log: Unwrapping of ITE in EJB Methodhandler Removal of invokeAndWrap Using Reflections.invoke instad of method.invoke in some method handlers Removal of duplication checks in beans.xml parser (should be in validator) policy -> alternative with the exception of the inheritance naming problem in beans package Sorry for the mixed commit Modified: core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -237,8 +237,8 @@ * archive accessibility, and the configuration for this bean deployment * archive */ - private transient Collection<Class<?>> enabledPolicyClasses; - private transient Collection<Class<? extends Annotation>> enabledPolicyStereotypes; + private transient Collection<Class<?>> enabledAlternativeClasses; + private transient Collection<Class<? extends Annotation>> enabledAlternativeStereotypes; private transient List<Class<?>> enabledDecoratorClasses; private transient List<Class<?>> enabledInterceptorClasses; private transient final Set<CurrentActivity> currentActivities; @@ -402,8 +402,8 @@ parentManager.getContexts(), parentManager.getCurrentActivities(), parentManager.getSpecializedBeans(), - parentManager.getEnabledPolicyClasses(), - parentManager.getEnabledPolicyStereotypes(), + parentManager.getEnabledAlternativeClasses(), + parentManager.getEnabledAlternativeStereotypes(), parentManager.getEnabledDecoratorClasses(), parentManager.getEnabledInterceptorClasses(), new StringBuilder().append(parentManager.getChildIds().incrementAndGet()).toString(), @@ -429,8 +429,8 @@ ListMultimap<Class<? extends Annotation>, Context> contexts, Set<CurrentActivity> currentActivities, Map<Contextual<?>, Contextual<?>> specializedBeans, - Collection<Class<?>> enabledPolicyClasses, - Collection<Class<? extends Annotation>> enabledPolicyStereotypes, + Collection<Class<?>> enabledAlternativeClasses, + Collection<Class<? extends Annotation>> enabledAlternativeStereotypes, List<Class<?>> enabledDecoratorClasses, List<Class<?>> enabledInterceptorClasses, String id, @@ -447,8 +447,8 @@ this.currentActivities = currentActivities; this.specializedBeans = specializedBeans; this.observers = observers; - this.enabledPolicyClasses = enabledPolicyClasses; - this.enabledPolicyStereotypes = enabledPolicyStereotypes; + this.enabledAlternativeClasses = enabledAlternativeClasses; + this.enabledAlternativeStereotypes = enabledAlternativeStereotypes; setEnabledDecoratorClasses(enabledDecoratorClasses); setEnabledInterceptorClasses(enabledInterceptorClasses); this.namespaces = namespaces; @@ -687,25 +687,25 @@ } /** - * A collection of enabled policy classes + * A collection of enabled alternative classes * */ - public Collection<Class<?>> getEnabledPolicyClasses() + public Collection<Class<?>> getEnabledAlternativeClasses() { - return Collections.unmodifiableCollection(enabledPolicyClasses); + return Collections.unmodifiableCollection(enabledAlternativeClasses); } /** - * @return the enabledPolicySterotypes + * @return the enabled alternative stereotypes */ - public Collection<Class<? extends Annotation>> getEnabledPolicyStereotypes() + public Collection<Class<? extends Annotation>> getEnabledAlternativeStereotypes() { - return Collections.unmodifiableCollection(enabledPolicyStereotypes); + return Collections.unmodifiableCollection(enabledAlternativeStereotypes); } public boolean isBeanEnabled(Bean<?> bean) { - return Beans.isBeanEnabled(bean, getEnabledPolicyClasses(), getEnabledPolicyStereotypes()); + return Beans.isBeanEnabled(bean, getEnabledAlternativeClasses(), getEnabledAlternativeStereotypes()); } /** @@ -724,14 +724,14 @@ return Collections.unmodifiableList(enabledInterceptorClasses); } - public void setEnabledPolicyClasses(Collection<Class<?>> enabledPolicyClasses) + public void setEnabledAlternativeClasses(Collection<Class<?>> enabledAlternativeClasses) { - this.enabledPolicyClasses = enabledPolicyClasses; + this.enabledAlternativeClasses = enabledAlternativeClasses; } - public void setEnabledPolicyStereotypes(Collection<Class<? extends Annotation>> enabledPolicySterotypes) + public void setEnabledAlternativeStereotypes(Collection<Class<? extends Annotation>> enabledAlternativeSterotypes) { - this.enabledPolicyStereotypes = enabledPolicySterotypes; + this.enabledAlternativeStereotypes = enabledAlternativeSterotypes; } public void setEnabledDecoratorClasses(List<Class<?>> enabledDecoratorClasses) @@ -1167,7 +1167,7 @@ { StringBuilder buffer = new StringBuilder(); buffer.append("Manager\n"); - buffer.append("Enabled policies: " + getEnabledPolicyClasses() + " " + getEnabledPolicyStereotypes() + "\n"); + buffer.append("Enabled alternatives: " + getEnabledAlternativeClasses() + " " + getEnabledAlternativeStereotypes() + "\n"); buffer.append("Registered contexts: " + contexts.keySet() + "\n"); buffer.append("Registered beans: " + getBeans().size() + "\n"); buffer.append("Specialized beans: " + specializedBeans.size() + "\n"); @@ -1517,8 +1517,8 @@ this.decorators.clear(); this.enabledDecoratorClasses.clear(); this.enabledInterceptorClasses.clear(); - this.enabledPolicyClasses.clear(); - this.enabledPolicyStereotypes.clear(); + this.enabledAlternativeClasses.clear(); + this.enabledAlternativeStereotypes.clear(); this.enterpriseBeans.clear(); this.interceptorResolver.clear(); this.interceptors.clear(); Modified: core/trunk/impl/src/main/java/org/jboss/weld/Validator.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/Validator.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/Validator.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -268,7 +268,7 @@ validateBeans(manager.getBeans(), new ArrayList<RIBean<?>>(), manager); validateEnabledDecoratorClasses(manager); validateEnabledInterceptorClasses(manager); - validateEnabledPolicies(manager); + validateEnabledAlternatives(manager); validateDisposalMethods(environment); validateBeanNames(manager); } @@ -371,32 +371,32 @@ } - private void validateEnabledPolicies(BeanManagerImpl beanManager) + private void validateEnabledAlternatives(BeanManagerImpl beanManager) { - List<Class<?>> seenPolicies = new ArrayList<Class<?>>(); - for (Class<? extends Annotation> stereotype : beanManager.getEnabledPolicyStereotypes()) + List<Class<?>> seenAlternatives = new ArrayList<Class<?>>(); + for (Class<? extends Annotation> stereotype : beanManager.getEnabledAlternativeStereotypes()) { if (!stereotype.isAnnotationPresent(Alternative.class)) { - throw new DeploymentException("Enabled policy sterotype " + stereotype + " is not annotated @Policy"); + throw new DeploymentException("Enabled alternative sterotype " + stereotype + " is not annotated @Alternative"); } - if (seenPolicies.contains(stereotype)) + if (seenAlternatives.contains(stereotype)) { - throw new DeploymentException("Cannot enable the same policy sterotype " + stereotype + " in beans.xml"); + throw new DeploymentException("Cannot enable the same alternative sterotype " + stereotype + " in beans.xml"); } - seenPolicies.add(stereotype); + seenAlternatives.add(stereotype); } - for (Class<?> clazz : beanManager.getEnabledPolicyClasses()) + for (Class<?> clazz : beanManager.getEnabledAlternativeClasses()) { if (!clazz.isAnnotationPresent(Alternative.class)) { - throw new DeploymentException("Enabled policy bean class " + clazz + " is not annotated @Policy"); + throw new DeploymentException("Enabled alternative bean class " + clazz + " is not annotated @Alternative"); } - if (seenPolicies.contains(clazz)) + if (seenAlternatives.contains(clazz)) { - throw new DeploymentException("Cannot enable the same policy bean class " + clazz + " in beans.xml"); + throw new DeploymentException("Cannot enable the same alternative bean class " + clazz + " in beans.xml"); } - seenPolicies.add(clazz); + seenAlternatives.add(clazz); } } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -115,7 +115,7 @@ { this.policy = true; } - else if (getMergedStereotypes().isPolicy()) + else if (getMergedStereotypes().isAlternative()) { this.policy = true; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/CallableMethodHandler.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/CallableMethodHandler.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/CallableMethodHandler.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -12,11 +12,13 @@ import java.util.HashSet; import java.util.concurrent.Callable; +import javassist.tools.reflect.Reflection; import javassist.util.proxy.MethodHandler; import org.jboss.weld.Container; import org.jboss.weld.NullInstanceException; import org.jboss.weld.bootstrap.api.Service; +import org.jboss.weld.util.Reflections; import org.slf4j.cal10n.LocLogger; public class CallableMethodHandler implements MethodHandler, Serializable @@ -75,7 +77,7 @@ } try { - Object returnValue = proxiedMethod.invoke(instance, args); + Object returnValue = Reflections.invoke(proxiedMethod, instance, args); log.trace(CALL_PROXIED_METHOD, proxiedMethod, instance, args, returnValue == null ? null : returnValue); return returnValue; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/AbstractDecoratorMethodHandler.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/AbstractDecoratorMethodHandler.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/AbstractDecoratorMethodHandler.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -74,7 +74,7 @@ if (Reflections.isAbstract(thisMethod)) { Method method = ((AnnotatedMethod<?>) delegateClass.getWeldMethod(new MethodSignatureImpl(thisMethod))).getJavaMember(); - return method.invoke(delegate, args); + return Reflections.invoke(method, delegate, args); } return proceed.invoke(self, args); Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -110,7 +110,8 @@ } try { - Object returnValue = Reflections.lookupMethod(proxiedMethod, proxiedInstance).invoke(proxiedInstance, args); + Method method = Reflections.lookupMethod(proxiedMethod, proxiedInstance); + Object returnValue = Reflections.invoke(method, proxiedInstance, args); log.trace(CALL_PROXIED_METHOD, proxiedMethod, proxiedInstance, args, returnValue == null ? null : returnValue); return returnValue; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseBeanProxyMethodHandler.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseBeanProxyMethodHandler.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseBeanProxyMethodHandler.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -23,6 +23,7 @@ import static org.jboss.weld.logging.messages.BeanMessage.INVALID_REMOVE_METHOD_INVOCATION; import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Collection; @@ -53,7 +54,7 @@ // The log provider private static final LocLogger log = loggerFactory().getLogger(BEAN); - private final SessionObjectReference reference; + private final SessionObjectReference reference; private final Class<?> objectInterface; private final Collection<MethodSignature> removeMethodSignatures; private final boolean clientCanCallRemoveMethods; @@ -75,7 +76,7 @@ this.stateful = bean.getEjbDescriptor().isStateful(); log.trace(CREATED_SESSION_BEAN_PROXY, bean); } - + /** * Lookups the EJB in the container and executes the method on it * @@ -107,24 +108,38 @@ } return null; } - + if (!clientCanCallRemoveMethods) { // TODO we can certainly optimize this search algorithm! MethodSignature methodSignature = new MethodSignatureImpl(method); if (removeMethodSignatures.contains(methodSignature)) { - throw new InvalidOperationException(INVALID_REMOVE_METHOD_INVOCATION, method ); + throw new InvalidOperationException(INVALID_REMOVE_METHOD_INVOCATION, method); } } Class<?> businessInterface = getBusinessInterface(method); Object proxiedInstance = reference.getBusinessObject(businessInterface); Method proxiedMethod = Reflections.lookupMethod(method, proxiedInstance); - Object returnValue = Reflections.invoke(proxiedMethod, proxiedInstance, args); - log.trace(CALL_PROXIED_METHOD, method, proxiedInstance, args, returnValue); - return returnValue; + try + { + Object returnValue = Reflections.invoke(proxiedMethod, proxiedInstance, args); + log.trace(CALL_PROXIED_METHOD, method, proxiedInstance, args, returnValue); + return returnValue; + } + catch (InvocationTargetException e) + { + if (e.getCause() != null) + { + throw e.getCause(); + } + else + { + throw e; + } + } } - + private Class<?> getBusinessInterface(Method method) { Class<?> businessInterface = method.getDeclaringClass(); @@ -137,5 +152,5 @@ return businessInterface; } } - + } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -20,7 +20,7 @@ import static org.jboss.weld.logging.LoggerFactory.loggerFactory; import static org.jboss.weld.logging.messages.BootstrapMessage.ENABLED_DECORATORS; import static org.jboss.weld.logging.messages.BootstrapMessage.ENABLED_INTERCEPTORS; -import static org.jboss.weld.logging.messages.BootstrapMessage.ENABLED_POLICIES; +import static org.jboss.weld.logging.messages.BootstrapMessage.ENABLED_ALTERNATIVES; import java.util.List; @@ -106,13 +106,13 @@ BeansXmlParser parser = new BeansXmlParser(beanManager.getServices().get(ResourceLoader.class), getBeanDeploymentArchive().getBeansXml()); parser.parse(); - if (parser.getEnabledPolicyClasses() != null) + if (parser.getEnabledAlternativeClasses() != null) { - beanManager.setEnabledPolicyClasses(parser.getEnabledPolicyClasses()); + beanManager.setEnabledAlternativeClasses(parser.getEnabledAlternativeClasses()); } - if (parser.getEnabledPolicyStereotypes() != null) + if (parser.getEnabledAlternativeStereotypes() != null) { - beanManager.setEnabledPolicyStereotypes(parser.getEnabledPolicyStereotypes()); + beanManager.setEnabledAlternativeStereotypes(parser.getEnabledAlternativeStereotypes()); } if (parser.getEnabledDecoratorClasses() != null) { @@ -122,7 +122,7 @@ { beanManager.setEnabledInterceptorClasses(parser.getEnabledInterceptorClasses()); } - log.debug(ENABLED_POLICIES, this.beanManager, beanManager.getEnabledPolicyClasses(), beanManager.getEnabledPolicyStereotypes()); + log.debug(ENABLED_ALTERNATIVES, this.beanManager, beanManager.getEnabledAlternativeClasses(), beanManager.getEnabledAlternativeStereotypes()); log.debug(ENABLED_DECORATORS, this.beanManager, beanManager.getEnabledDecoratorClasses()); log.debug(ENABLED_INTERCEPTORS, this.beanManager, beanManager.getEnabledInterceptorClasses()); } 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-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -22,6 +22,8 @@ import static org.jboss.weld.logging.messages.JsfMessage.IMPROPER_ENVIRONMENT; import static org.jboss.weld.logging.messages.JsfMessage.RESUMING_CONVERSATION; +import java.lang.reflect.InvocationTargetException; + import javax.enterprise.util.AnnotationLiteral; import javax.faces.context.FacesContext; import javax.servlet.ServletContext; @@ -58,7 +60,15 @@ { if (Container.instance().deploymentServices().get(JsfApiAbstraction.class).isApiVersionCompatibleWith(2.0)) { - return (Boolean) Reflections.invokeAndWrap("isPostback", facesContext); + try + { + return (Boolean) Reflections.invoke("isPostback", facesContext); + } + catch (Exception e) + { + // Sorry, guys ;-) --NIK + return false; + } } else { Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BootstrapMessage.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BootstrapMessage.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BootstrapMessage.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -21,7 +21,7 @@ @MessageId("000100") VALIDATING_BEANS, @MessageId("000101") JTA_UNAVAILABLE, - @MessageId("000103") ENABLED_POLICIES, + @MessageId("000103") ENABLED_ALTERNATIVES, @MessageId("000104") ENABLED_DECORATORS, @MessageId("000105") ENABLED_INTERCEPTORS, @MessageId("000106") FOUND_BEAN, 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-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/MergedStereotypes.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -36,8 +36,8 @@ private final Set<Annotation> possibleScopeTypes; // Is the bean name defaulted? private boolean beanNameDefaulted; - // Are any of the sterotypes policies - private boolean policy; + // Are any of the sterotypes alternatives + private boolean alternative; private Set<Class<? extends Annotation>> stereotypes; @@ -71,9 +71,9 @@ { throw new ForbiddenStateException(STEREOTYPE_NOT_REGISTERED, stereotypeAnnotation); } - if (stereotype.isPolicy()) + if (stereotype.isAlternative()) { - policy = true; + alternative = true; } if (stereotype.getDefaultScopeType() != null) { @@ -89,9 +89,9 @@ } } - public boolean isPolicy() + public boolean isAlternative() { - return policy; + return alternative; } /** @@ -130,8 +130,8 @@ @Override public String toString() { - return "Merged stereotype model; Any of the sterotypes is a policy: " + - policy + "; possible scopes " + possibleScopeTypes; + return "Merged stereotype model; Any of the sterotypes is an alternative: " + + alternative + "; possible scopes " + possibleScopeTypes; } } 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-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/StereotypeModel.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -57,8 +57,8 @@ private static final Set<Class<? extends Annotation>> META_ANNOTATIONS = Arrays2.<Class<? extends Annotation>>asSet(Stereotype.class); private static final LocLogger log = loggerFactory().getLogger(REFLECTION); - // Is the stereotype a policy - private boolean policy; + // Is the stereotype an alternative + private boolean alternative; // The default scope type private Annotation defaultScopeType; // Is the bean name defaulted @@ -78,7 +78,7 @@ public StereotypeModel(Class<T> sterotype, ClassTransformer transformer) { super(sterotype, transformer); - initPolicy(); + initAlternative(); initDefaultScopeType(); initBeanNameDefaulted(); initInterceptorBindings(); @@ -154,11 +154,11 @@ /** * Initializes the default deployment type */ - private void initPolicy() + private void initAlternative() { if (getAnnotatedAnnotation().isAnnotationPresent(Alternative.class)) { - this.policy = true; + this.alternative = true; } } @@ -230,9 +230,9 @@ /** * @return */ - public boolean isPolicy() + public boolean isAlternative() { - return policy; + return alternative; } public Set<Annotation> getInheritedSterotypes() Modified: core/trunk/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -83,7 +83,7 @@ matchedBeans.add(bean); } } - return Beans.retainEnabledPolicies(matchedBeans, manager.getEnabledPolicyClasses(), manager.getEnabledPolicyStereotypes()); + return Beans.retainEnabledAlternatives(matchedBeans, manager.getEnabledAlternativeClasses(), manager.getEnabledAlternativeStereotypes()); } }); Modified: core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -75,7 +75,7 @@ @Override protected Set<T> filterResult(Set<T> matched) { - return Beans.retainEnabledPolicies(matched, manager.getEnabledPolicyClasses(), manager.getEnabledPolicyStereotypes()); + return Beans.retainEnabledAlternatives(matched, manager.getEnabledAlternativeClasses(), manager.getEnabledAlternativeStereotypes()); } @Override @@ -100,12 +100,12 @@ Set<Bean<? extends X>> disambiguatedBeans = beans; if (disambiguatedBeans.size() > 1) { - boolean policyPresent = Beans.isPolicyPresent(disambiguatedBeans); + boolean alternativePresent = Beans.isAlternativePresent(disambiguatedBeans); disambiguatedBeans = new HashSet<Bean<? extends X>>(); for (Bean<? extends X> bean : beans) { - if (policyPresent ? bean.isAlternative() : true && !Beans.isSpecialized(bean, beans, manager.getSpecializedBeans())) + if (alternativePresent ? bean.isAlternative() : true && !Beans.isSpecialized(bean, beans, manager.getSpecializedBeans())) { disambiguatedBeans.add(bean); } Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -535,7 +535,7 @@ * @param enabledDeploymentTypes The enabled deployment types * @return The filtered beans */ - public static <T extends Bean<?>> Set<T> retainEnabledPolicies(Set<T> beans, Collection<Class<?>> enabledPolicyClasses, Collection<Class<? extends Annotation>> enabledPolicySterotypes) + public static <T extends Bean<?>> Set<T> retainEnabledAlternatives(Set<T> beans, Collection<Class<?>> enabledAlternativeClasses, Collection<Class<? extends Annotation>> enabledAlternativeSterotypes) { if (beans.size() == 0) { @@ -546,7 +546,7 @@ Set<T> enabledBeans = new HashSet<T>(); for (T bean : beans) { - if (isBeanEnabled(bean, enabledPolicyClasses, enabledPolicySterotypes)) + if (isBeanEnabled(bean, enabledAlternativeClasses, enabledAlternativeSterotypes)) { enabledBeans.add(bean); } @@ -555,11 +555,11 @@ } } - public static boolean isBeanEnabled(Bean<?> bean, Collection<Class<?>> enabledPolicyClasses, Collection<Class<? extends Annotation>> enabledPolicySterotypes) + public static boolean isBeanEnabled(Bean<?> bean, Collection<Class<?>> enabledAlternativeClasses, Collection<Class<? extends Annotation>> enabledAlternativeSterotypes) { if (bean.isAlternative()) { - if (enabledPolicyClasses.contains(bean.getBeanClass())) + if (enabledAlternativeClasses.contains(bean.getBeanClass())) { return true; } @@ -567,7 +567,7 @@ { for (Class<? extends Annotation> stereotype : bean.getStereotypes()) { - if (enabledPolicySterotypes.contains(stereotype)) + if (enabledAlternativeSterotypes.contains(stereotype)) { return true; } @@ -582,12 +582,12 @@ } /** - * Check if any of the beans is a policy + * Check if any of the beans is an alternative * * @param beans * @return */ - public static <X> boolean isPolicyPresent(Set<Bean<? extends X>> beans) + public static <X> boolean isAlternativePresent(Set<Bean<? extends X>> beans) { for (Bean<?> bean : beans) { @@ -607,7 +607,7 @@ } else { - return mergedStereotypes.isPolicy(); + return mergedStereotypes.isAlternative(); } } Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Reflections.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/Reflections.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/util/Reflections.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -21,7 +21,6 @@ import static org.jboss.weld.logging.messages.UtilMessage.ACCESS_ERROR_ON_CONSTRUCTOR; import static org.jboss.weld.logging.messages.UtilMessage.ACCESS_ERROR_ON_FIELD; import static org.jboss.weld.logging.messages.UtilMessage.ANNOTATION_VALUES_INACCESSIBLE; -import static org.jboss.weld.logging.messages.UtilMessage.ERROR_INVOKING_METHOD; import static org.jboss.weld.logging.messages.UtilMessage.NO_SUCH_METHOD; import static org.jboss.weld.logging.messages.UtilMessage.SECURITY_EXCEPTION_SCANNING; @@ -524,61 +523,24 @@ return false; } - /** - * Invokes a method and wraps exceptions - * - * @param method The method to invoke - * @param instance The instance to invoke on - * @param parameters The parameters - * @return The return value - */ - public static Object invokeAndWrap(Method method, Object instance, Object... parameters) - { - try - { - return invoke(method, instance, parameters); - } - catch (IllegalArgumentException e) - { - throw new WeldException(ERROR_INVOKING_METHOD, e, method.getName(), method.getDeclaringClass()); - } - catch (IllegalAccessException e) - { - throw new WeldException(ERROR_INVOKING_METHOD, e, method.getName(), method.getDeclaringClass()); - } - catch (InvocationTargetException e) - { - throw new WeldException(ERROR_INVOKING_METHOD, e, method.getName(), method.getDeclaringClass()); - } - } - public static Object invoke(Method method, Object instance, Object... parameters) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException { ensureAccessible(method); return method.invoke(instance, parameters); } - public static Object invokeAndWrap(String methodName, Object instance, Object... parameters) + public static Object invoke(String methodName, Object instance, Object... parameters) throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException { Class<?>[] parameterTypes = new Class<?>[parameters.length]; for (int i = 0; i < parameters.length; i++) { parameterTypes[i] = parameters[i].getClass(); } - try - { - return invokeAndWrap(instance.getClass().getMethod(methodName, parameterTypes), instance, parameters); - } - catch (SecurityException e) - { - throw new WeldException(ERROR_INVOKING_METHOD, e, methodName, instance.getClass()); - } - catch (java.lang.NoSuchMethodException e) - { - throw new WeldException(ERROR_INVOKING_METHOD, e, methodName, instance.getClass()); - } + Method method = instance.getClass().getMethod(methodName, parameterTypes); + return invoke(method, instance, parameters); } + /** * Gets value of a field and wraps exceptions * Modified: core/trunk/impl/src/main/java/org/jboss/weld/xml/BeansXmlParser.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/xml/BeansXmlParser.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/xml/BeansXmlParser.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -47,14 +47,14 @@ private final ResourceLoader resourceLoader; private EnabledClasses enabledClasses = null; - public List<Class<?>> getEnabledPolicyClasses() + public List<Class<?>> getEnabledAlternativeClasses() { - return enabledClasses.getEnabledPolicyClasses(); + return enabledClasses.getEnabledAlternativeClasses(); } - public List<Class<? extends Annotation>> getEnabledPolicyStereotypes() + public List<Class<? extends Annotation>> getEnabledAlternativeStereotypes() { - return enabledClasses.getEnabledPolicyStereotypes(); + return enabledClasses.getEnabledAlternativeStereotypes(); } public List<Class<?>> getEnabledDecoratorClasses() Modified: core/trunk/impl/src/main/java/org/jboss/weld/xml/EnabledClasses.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/xml/EnabledClasses.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/xml/EnabledClasses.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -31,16 +31,16 @@ */ public class EnabledClasses { - private List<Class<? extends Annotation>> enabledPolicyStereotypes; - private List<Class<?>> enabledPolicyClasses; + private List<Class<? extends Annotation>> enabledAlternativeStereotypes; + private List<Class<?>> enabledAlternativeClasses; private List<Class<?>> enabledDecoratorClasses; private List<Class<?>> enabledInterceptorClasses; private ResourceLoader resourceLoader; private EnabledClasses(MergedElements beanXmlElements, ResourceLoader resourceLoader) { - enabledPolicyStereotypes = new ArrayList<Class<? extends Annotation>>(); - enabledPolicyClasses = new ArrayList<Class<?>>(); + enabledAlternativeStereotypes = new ArrayList<Class<? extends Annotation>>(); + enabledAlternativeClasses = new ArrayList<Class<?>>(); enabledDecoratorClasses = new ArrayList<Class<?>>(); enabledInterceptorClasses = new ArrayList<Class<?>>(); this.resourceLoader = resourceLoader; @@ -54,19 +54,19 @@ private void process(MergedElements beanXmlElements) { - processPolicies(beanXmlElements.getPoliciesElements()); + processAlternatives(beanXmlElements.getAlternativesElements()); enabledDecoratorClasses.addAll(getClassesInElements(beanXmlElements.getDecoratorsElements())); enabledInterceptorClasses.addAll(getClassesInElements(beanXmlElements.getInterceptorsElements())); } - private void processPolicies(List<BeansXmlElement> policyElements) + private void processAlternatives(List<BeansXmlElement> alternativesElements) { - Collection<Class<?>> classes = getClassesInElements(policyElements); + Collection<Class<?>> classes = getClassesInElements(alternativesElements); for (Class<?> clazz : classes) { if (clazz.isAnnotation()) { - enabledPolicyStereotypes.add(clazz.asSubclass(Annotation.class)); + enabledAlternativeStereotypes.add(clazz.asSubclass(Annotation.class)); } else { - enabledPolicyClasses.add(clazz); + enabledAlternativeClasses.add(clazz); } } } @@ -81,14 +81,14 @@ return classes; } - public List<Class<? extends Annotation>> getEnabledPolicyStereotypes() + public List<Class<? extends Annotation>> getEnabledAlternativeStereotypes() { - return enabledPolicyStereotypes; + return enabledAlternativeStereotypes; } - public List<Class<?>> getEnabledPolicyClasses() + public List<Class<?>> getEnabledAlternativeClasses() { - return enabledPolicyClasses; + return enabledAlternativeClasses; } public List<Class<?>> getEnabledDecoratorClasses() Modified: core/trunk/impl/src/main/java/org/jboss/weld/xml/MergedElements.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/xml/MergedElements.java 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/java/org/jboss/weld/xml/MergedElements.java 2009-12-03 13:31:01 UTC (rev 5202) @@ -37,7 +37,7 @@ */ public class MergedElements { - private List<BeansXmlElement> policiesElements = new ArrayList<BeansXmlElement>(); + private List<BeansXmlElement> alternativesElements = new ArrayList<BeansXmlElement>(); private List<BeansXmlElement> decoratorsElements = new ArrayList<BeansXmlElement>(); private List<BeansXmlElement> interceptorsElements = new ArrayList<BeansXmlElement>(); @@ -45,7 +45,7 @@ public void merge(URL url, Document beansXmlDocument) { Element documentElement = beansXmlDocument.getDocumentElement(); - policiesElements.addAll(getNamedElement(url, documentElement, "alternatives", MULTIPLE_ALTERNATIVES)); + alternativesElements.addAll(getNamedElement(url, documentElement, "alternatives", MULTIPLE_ALTERNATIVES)); interceptorsElements.addAll(getNamedElement(url, documentElement, "interceptors", MULTIPLE_INTERCEPTORS)); decoratorsElements.addAll(getNamedElement(url, documentElement, "decorators", MULTIPLE_DECORATORS)); } @@ -69,9 +69,9 @@ } - public List<BeansXmlElement> getPoliciesElements() + public List<BeansXmlElement> getAlternativesElements() { - return policiesElements; + return alternativesElements; } public List<BeansXmlElement> getDecoratorsElements() Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties =================================================================== --- core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties 2009-12-03 12:39:54 UTC (rev 5201) +++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties 2009-12-03 13:31:01 UTC (rev 5202) @@ -1,6 +1,6 @@ VALIDATING_BEANS=Weld initialized. Validating beans JTA_UNAVAILABLE=Transactional services not available. Injection of @Inject UserTransaction not available. Transactional observers will be invoked synchronously. -ENABLED_POLICIES=Enabled policies for {0}: {1} {2} +ENABLED_ALTERNATIVES=Enabled alternatives for {0}: {1} {2} ENABLED_DECORATORS=Enabled decorator types for {0}: {1} ENABLED_INTERCEPTORS=Enabled interceptor types for {0}: {1} FOUND_BEAN=Bean: {0}