[weld-commits] Weld SVN: r3894 - in ri/trunk: embedded-tck-runner/src/test/resources and 25 other directories.

Author: shane.bryzak(a)jboss.com Date: 2009-10-08 02:11:18 -0400 (Thu, 08 Oct 2009) New Revision: 3894 Modified: ri/trunk/dist/readme.txt ri/trunk/embedded-tck-runner/src/test/resources/log4j.xml ri/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java ri/trunk/impl/src/main/java/org/jboss/weld/Container.java ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java ri/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java ri/trunk/impl/src/main/java/org/jboss/weld/bean/NewManagedBean.java ri/trunk/impl/src/main/java/org/jboss/weld/bean/NewSessionBean.java ri/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java ri/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java ri/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/AbstractFacade.java ri/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java ri/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java ri/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java ri/trunk/impl/src/main/java/org/jboss/weld/event/ObserverFactory.java ri/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java ri/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/weld/introspector/WBMethod.java ri/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/AbstractWBMember.java ri/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WBConstructorImpl.java ri/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java ri/trunk/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java ri/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java ri/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java ri/trunk/inject-tck-runner/src/test/resources/log4j.xml ri/trunk/inject-tck-runner/tests.xml ri/trunk/jboss-as/build.properties ri/trunk/jboss-as/build.xml ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/api/Environment.java ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/api/Environments.java ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/api/Service.java ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/spi/BeanDeploymentArchive.java ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/spi/Deployment.java ri/trunk/spi/src/main/java/org/jboss/weld/ejb/spi/EjbServices.java ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/EjbInjectionServices.java ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/InjectionServices.java ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/JpaInjectionServices.java ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/ResourceInjectionServices.java ri/trunk/spi/src/main/java/org/jboss/weld/manager/api/WeldManager.java ri/trunk/spi/src/main/java/org/jboss/weld/resources/spi/ResourceLoader.java ri/trunk/spi/src/main/java/org/jboss/weld/servlet/api/ServletServices.java ri/trunk/tests/src/test/resources/org/jboss/weld/test/unit/implementation/event/tx/home.xhtml ri/trunk/tests/src/test/resources/org/jboss/weld/test/unit/implementation/event/tx/web.xml Log: miscellaneous renames Modified: ri/trunk/dist/readme.txt =================================================================== --- ri/trunk/dist/readme.txt 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/dist/readme.txt 2009-10-08 06:11:18 UTC (rev 3894) @@ -1,4 +1,4 @@ -Web Beans +Weld ------------ Java Contexts and Dependency Injection (JSR-299) is a new Java standard for Modified: ri/trunk/embedded-tck-runner/src/test/resources/log4j.xml =================================================================== --- ri/trunk/embedded-tck-runner/src/test/resources/log4j.xml 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/embedded-tck-runner/src/test/resources/log4j.xml 2009-10-08 06:11:18 UTC (rev 3894) @@ -54,7 +54,7 @@ </category> --> - <!-- ############### Web Beans logging ################### --> + <!-- ############### Weld logging ################### --> <category name="org.jboss.weld"> <priority value="WARN"/> Modified: ri/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -100,7 +100,7 @@ import com.google.common.collect.Multimaps; /** - * Implementation of the Weld Manager. + * Implementation of the Bean Manager. * * Essentially a singleton for registering Beans, Contexts, Observers, * Interceptors etc. as well as providing resolution @@ -1017,7 +1017,7 @@ Bean<T> bean = (Bean<T>) resolve(getBeans(element, bindings)); if (bean == null) { - throw new UnsatisfiedResolutionException(element + "Unable to resolve any Web Beans"); + throw new UnsatisfiedResolutionException(element + "Unable to resolve any Managed Beans"); } boolean normalScoped = getServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScope()).isNormal(); Modified: ri/trunk/impl/src/main/java/org/jboss/weld/Container.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/Container.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/Container.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -27,7 +27,7 @@ import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive; /** - * A Web Beans application container + * A Weld application container * * @author pmuir * Modified: ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -83,7 +83,7 @@ private Set<WBInjectionPoint<?, ?>> delegateInjectionPoints; // If the type a primitive? private boolean primitive; - // The Web Beans manager + // The Bean manager protected BeanManagerImpl manager; private boolean _serializable; @@ -100,7 +100,7 @@ /** * Constructor * - * @param manager The Weld manager + * @param manager The Bean manager */ public AbstractBean(String idSuffix, BeanManagerImpl manager) { Modified: ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -88,7 +88,7 @@ * Constructor * * @param type The type - * @param manager The Web Beans manager + * @param manager The Bean manager */ protected AbstractClassBean(WBClass<T> type, String idSuffix, BeanManagerImpl manager) { Modified: ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -63,7 +63,7 @@ /** * Constructor * @param declaringBean The declaring bean - * @param manager The Web Beans manager + * @param manager The Bean manager */ public AbstractProducerBean(String idSuffix, AbstractClassBean<X> declaringBean, BeanManagerImpl manager) { Modified: ri/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -91,7 +91,7 @@ * Constructor * * @param type The type of the bean - * @param manager The Web Beans manager + * @param manager The Bean manager */ protected ManagedBean(WBClass<T> type, String idSuffix, BeanManagerImpl manager) { Modified: ri/trunk/impl/src/main/java/org/jboss/weld/bean/NewManagedBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/bean/NewManagedBean.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/bean/NewManagedBean.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -38,7 +38,7 @@ * Creates an instance of a NewSimpleBean from an annotated class * * @param clazz The annotated class - * @param manager The Web Beans manager + * @param manager The Bean manager * @return a new NewSimpleBean instance */ public static <T> NewManagedBean<T> of(WBClass<T> clazz, BeanManagerImpl manager) @@ -52,7 +52,7 @@ * Protected constructor * * @param type An annotated class - * @param manager The Web Beans manager + * @param manager The Bean manager */ protected NewManagedBean(final WBClass<T> type, String idSuffix, BeanManagerImpl manager) { Modified: ri/trunk/impl/src/main/java/org/jboss/weld/bean/NewSessionBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/bean/NewSessionBean.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/bean/NewSessionBean.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -40,7 +40,7 @@ * Creates an instance of a NewEnterpriseBean from an annotated class * * @param clazz The annotated class - * @param manager The Web Beans manager + * @param manager The Bean manager * @return a new NewEnterpriseBean instance */ public static <T> NewSessionBean<T> of(InternalEjbDescriptor<T> ejbDescriptor, BeanManagerImpl manager) @@ -55,7 +55,7 @@ * Protected constructor * * @param type An annotated class - * @param manager The Web Beans manager + * @param manager The Bean manager */ protected NewSessionBean(final WBClass<T> type, InternalEjbDescriptor<T> ejbDescriptor, String idSuffix, BeanManagerImpl manager) { Modified: ri/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -59,7 +59,7 @@ * * @param method The producer field abstraction * @param declaringBean The declaring bean - * @param manager The Web Beans manager + * @param manager The Bean manager */ protected ProducerField(WBField<T, X> field, AbstractClassBean<X> declaringBean, BeanManagerImpl manager) { Modified: ri/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -92,7 +92,7 @@ * Constructor * * @param type The type of the bean - * @param manager The Web Beans manager + * @param manager The Bean manager */ protected SessionBean(WBClass<T> type, InternalEjbDescriptor<T> ejbDescriptor, String idSuffix, BeanManagerImpl manager) { @@ -284,7 +284,7 @@ { if (ejbDescriptor.isMessageDriven()) { - throw new DefinitionException("Message Driven Beans can't be Web Beans"); + throw new DefinitionException("Message Driven Beans can't be Managed Beans"); } } Modified: ri/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/AbstractFacade.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/AbstractFacade.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/AbstractFacade.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -42,7 +42,7 @@ // The binding types the helper operates on private final Set<? extends Annotation> bindings; - // The Web Beans manager + // The Bean manager private final BeanManagerImpl manager; // The type of the operation private final Type type; @@ -50,7 +50,7 @@ /** * * @param type The event type - * @param manager The Web Beans manager + * @param manager The Bean manager * @param bindings The binding types */ protected AbstractFacade(Type type, BeanManagerImpl manager, Set<? extends Annotation> bindings) Modified: ri/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -149,10 +149,10 @@ static { - log.info("Web Beans " + getVersion()); + log.info("Weld " + getVersion()); } - // The Web Beans manager + // The Bean manager private BeanManagerImpl deploymentManager; private Map<BeanDeploymentArchive, BeanDeployment> beanDeployments; private Environment environment; @@ -285,7 +285,7 @@ entry.getValue().deployBeans(environment); } fireAfterBeanDiscoveryEvent(); - log.debug("Web Beans initialized. Validating beans."); + log.debug("Weld initialized. Validating beans."); } return this; } Modified: ri/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -31,7 +31,7 @@ import org.jboss.weld.log.Logging; /** - * An implementation of the Web Beans lifecycle that supports restoring + * An implementation of the Weld lifecycle that supports restoring * and destroying all the built in contexts * * @author Pete Muir Modified: ri/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -53,7 +53,7 @@ * Constructor * * @param eventType The event type - * @param manager The Web Beans manager + * @param manager The Bean manager * @param bindings The binding types */ private EventImpl(Type eventType, BeanManagerImpl manager, Set<Annotation> bindings) Modified: ri/trunk/impl/src/main/java/org/jboss/weld/event/ObserverFactory.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/event/ObserverFactory.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/event/ObserverFactory.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -38,7 +38,7 @@ * * @param method The observer method abstraction * @param declaringBean The declaring bean - * @param manager The Web Beans manager + * @param manager The Bean manager * @return An observer implementation built from the method abstraction */ public static <X, T> ObserverMethodImpl<X, T> create(WBMethod<T, X> method, RIBean<X> declaringBean, BeanManagerImpl manager) Modified: ri/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -73,7 +73,7 @@ * * @param observer The observer * @param declaringBean The observer bean - * @param manager The Web Beans manager + * @param manager The Bean manager */ protected ObserverMethodImpl(final WBMethod<T, X> observer, final RIBean<X> declaringBean, final BeanManagerImpl manager) { Modified: ri/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -154,10 +154,12 @@ * annotated parameters. * * @param parameters The list of annotated parameter to look up - * @param manager The Web Beans manager + * @param manager The Bean manager * @return The object array of looked up values */ - protected Object[] getParameterValues(List<ParameterInjectionPoint<?, ?>> parameters, Object specialVal, Class<? extends Annotation> specialParam, BeanManagerImpl manager, CreationalContext<?> creationalContext) + protected Object[] getParameterValues(List<ParameterInjectionPoint<?, ?>> parameters, + Object specialVal, Class<? extends Annotation> specialParam, + BeanManagerImpl manager, CreationalContext<?> creationalContext) { Object[] parameterValues = new Object[parameters.size()]; Iterator<ParameterInjectionPoint<?, ?>> iterator = parameters.iterator(); Modified: ri/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -246,10 +246,12 @@ * annotated parameters. * * @param parameters The list of annotated parameter to look up - * @param manager The Web Beans manager + * @param manager The Bean manager * @return The object array of looked up values */ - protected Object[] getParameterValues(List<ParameterInjectionPoint<?, ?>> parameters, Class<? extends Annotation> specialParam, Object specialVal, BeanManagerImpl manager, CreationalContext<?> creationalContext) + protected Object[] getParameterValues(List<ParameterInjectionPoint<?, ?>> parameters, + Class<? extends Annotation> specialParam, Object specialVal, + BeanManagerImpl manager, CreationalContext<?> creationalContext) { Object[] parameterValues = new Object[parameters.size()]; Iterator<ParameterInjectionPoint<?, ?>> iterator = parameters.iterator(); Modified: ri/trunk/impl/src/main/java/org/jboss/weld/introspector/WBMethod.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/introspector/WBMethod.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/introspector/WBMethod.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -58,7 +58,7 @@ * class. Useful with proxies * * @param instance The instance to invoke - * @param manager The Web Beans manager + * @param manager The Bean manager * @return A reference to the instance */ public T invokeOnInstance(Object instance, Object... parameters) throws IllegalArgumentException, SecurityException, IllegalAccessException, InvocationTargetException, NoSuchMethodException; Modified: ri/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/AbstractWBMember.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/AbstractWBMember.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/AbstractWBMember.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -123,7 +123,7 @@ /** * Gets the current value of the member * - * @param beanManager The Web Beans manager + * @param beanManager The Bean manager * @return The current value * public T getValue(BeanManager beanManager) Modified: ri/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WBConstructorImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WBConstructorImpl.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WBConstructorImpl.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -218,7 +218,7 @@ /** * Creates a new instance * - * @param manager The Web Beans manager + * @param manager The Bean manager * @return An instance * @throws InvocationTargetException * @throws IllegalAccessException Modified: ri/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -112,7 +112,7 @@ } else { - throw new IllegalStateException("Web Beans doesn not support using JSF in an non-servlet environment"); + throw new IllegalStateException("Weld doesn not support using JSF in an non-servlet environment"); } } Modified: ri/trunk/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -39,7 +39,7 @@ // The beans to search private final Iterable<? extends Bean<?>> allBeans; - // The Web Beans manager + // The Bean manager private final BeanManagerImpl manager; /** Modified: ri/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -35,7 +35,7 @@ import org.jboss.weld.log.Logging; /** - * Implementation of the Web Beans lifecycle that can react to servlet events + * Implementation of the Weld lifecycle that can react to servlet events * and drives the Session, Conversation and Request (for Servlet requests) * lifecycle * Modified: ri/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -208,7 +208,7 @@ if (preDestroyMethods.size() > 1) { // TODO actually this is wrong, in EJB you can have @PreDestroy methods - // on the superclass, though the Web Beans spec is silent on the issue + // on the superclass, though the CDI spec is silent on the issue throw new DefinitionException("Cannot have more than one pre destroy method annotated with @PreDestroy for " + type); } else if (preDestroyMethods.size() == 1) Modified: ri/trunk/inject-tck-runner/src/test/resources/log4j.xml =================================================================== --- ri/trunk/inject-tck-runner/src/test/resources/log4j.xml 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/inject-tck-runner/src/test/resources/log4j.xml 2009-10-08 06:11:18 UTC (rev 3894) @@ -54,7 +54,7 @@ </category> --> - <!-- ############### Web Beans logging ################### --> + <!-- ############### Weld logging ################### --> <category name="org.jboss.weld"> <priority value="WARN"/> Modified: ri/trunk/inject-tck-runner/tests.xml =================================================================== --- ri/trunk/inject-tck-runner/tests.xml 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/inject-tck-runner/tests.xml 2009-10-08 06:11:18 UTC (rev 3894) @@ -1,8 +1,8 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" > -<suite name="Web Beans AtInject TCK" verbose="2" > +<suite name="Weld AtInject TCK" verbose="2" > - <test name="Web Beans RI" junit="true"> + <test name="Weld" junit="true"> <classes> <class name="org.jboss.weld.atinject.tck.AtInjectTCK"></class> </classes> Modified: ri/trunk/jboss-as/build.properties =================================================================== --- ri/trunk/jboss-as/build.properties 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/jboss-as/build.properties 2009-10-08 06:11:18 UTC (rev 3894) @@ -1,4 +1,4 @@ -# Container a number of properties associated with installing Web Beans into JBoss AS and running the TCK in JBoss AS +# Container a number of properties associated with installing Weld into JBoss AS and running the TCK in JBoss AS jboss.home=/Applications/jboss-5.2.0.Beta org.jboss.testharness.container.javaOpts=-Xms128m -Xmx384m -XX:MaxPermSize=128m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 Modified: ri/trunk/jboss-as/build.xml =================================================================== --- ri/trunk/jboss-as/build.xml 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/jboss-as/build.xml 2009-10-08 06:11:18 UTC (rev 3894) @@ -13,7 +13,7 @@ <delete dir="target" failonerror="false" /> </target> - <target name="update" depends="install-weld.deployer, install-javassist-update" description="Update JBoss 5.x or 6.x for Web Beans" /> + <target name="update" depends="install-weld.deployer, install-javassist-update" description="Update JBoss 5.x or 6.x for Weld" /> <target name="install-weld.deployer"> <echo message="Installing Weld ${weld.version} to ${jboss.home}" /> Modified: ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml =================================================================== --- ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml 2009-10-08 06:11:18 UTC (rev 3894) @@ -54,7 +54,7 @@ </category> --> - <!-- ############### Web Beans logging ################### --> + <!-- ############### Weld logging ################### --> <category name="org.jboss.weld"> <priority value="WARN"/> Modified: ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/api/Environment.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/api/Environment.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/api/Environment.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -19,7 +19,7 @@ import java.util.Set; /** - * Represents an environment. Specifies the services Web Beans requires + * Represents an environment. Specifies the services Weld requires * * @author Pete Muir * Modified: ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/api/Environments.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/api/Environments.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/api/Environments.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -42,7 +42,7 @@ /** * Java EE5 or Java EE6 * - * In this environment, Web Beans requires that {@link JpaInjectionServices}, + * In this environment, Weld requires that {@link JpaInjectionServices}, * {@link ResourceInjectionServices} and {@link EjbInjectionServices} are * present, and so will perform EE-style field injection on managed beans * itself @@ -62,7 +62,7 @@ /** * Java EE5 or Java EE6 * - * In this environment, Web Beans requires that {@link InjectionServices} are + * In this environment, Weld requires that {@link InjectionServices} are * present, and expects the container to use this callback to perform EE-style * injection * Modified: ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/api/Service.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/api/Service.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/api/Service.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -17,7 +17,7 @@ package org.jboss.weld.bootstrap.api; /** - * Marks a Service which is used by Web Beans to interact with it's environment + * Marks a Service which is used by Weld to interact with it's environment * @author Pete Muir * */ @@ -25,7 +25,7 @@ { /** - * Called by Web beans when it is shutting down, allowing the service to + * Called by Weld when it is shutting down, allowing the service to * perform any cleanup needed. */ public void cleanup(); Modified: ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/spi/BeanDeploymentArchive.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/spi/BeanDeploymentArchive.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/spi/BeanDeploymentArchive.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -53,7 +53,7 @@ * deployment archive and adjacent to it in the deployment archive graph. * * Cycles in the accessible BeanDeploymentArchive graph are allowed. If a - * cycle is detected by Web Beans, it will be automatically removed by Web + * cycle is detected by Weld, it will be automatically removed by Web * Beans. This means any implementor of this interface don't need to worry * about circularities. * Modified: ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/spi/Deployment.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/spi/Deployment.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/spi/src/main/java/org/jboss/weld/bootstrap/spi/Deployment.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -42,13 +42,13 @@ * <h3>Deployment structure representation</h3> * * <p> - * Web Beans will request the bean archive deployment structure during the bean + * Weld will request the bean archive deployment structure during the bean * discovery initialization step. After this step, CDI allows users to define * bean's programmatically, possibly with bean classes from a deployment archive - * which is currently not a bean deployment archive. Web Beans will request the + * which is currently not a bean deployment archive. Weld will request the * {@link BeanDeploymentArchive} for each programmatically using * {@link #loadBeanDeploymentArchive(Class)}. If any unknown - * {@link BeanDeploymentArchive}s are loaded, before Web Beans proceeds to + * {@link BeanDeploymentArchive}s are loaded, before Weld proceeds to * validating the deployment, the bean archive deployment structure will * re-requested. * </p> @@ -121,7 +121,7 @@ * all Java EE modules such as WARs, EJB jars and RARs. * * Cycles in the accessible BeanDeploymentArchive graph are allowed. If a - * cycle is detected by Web Beans, it will be automatically removed by Web + * cycle is detected by Weld, it will be automatically removed by Web * Beans. This means any implementor of this interface don't need to worry * about circularities. * Modified: ri/trunk/spi/src/main/java/org/jboss/weld/ejb/spi/EjbServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/weld/ejb/spi/EjbServices.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/spi/src/main/java/org/jboss/weld/ejb/spi/EjbServices.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -21,7 +21,7 @@ import org.jboss.weld.ejb.api.SessionObjectReference; /** - * A container should implement this interface to allow Web Beans to + * A container should implement this interface to allow Weld to * resolve EJB and discover EJBs * * {@link EjbServices} is a per-deployment service. Modified: ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/EjbInjectionServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/EjbInjectionServices.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/EjbInjectionServices.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -22,7 +22,7 @@ import org.jboss.weld.bootstrap.api.Service; /** - * A container should implement this interface to allow Web Beans to + * A container should implement this interface to allow Weld to * resolve EJB. * * {@link EjbInjectionServices} is a per-module service. Modified: ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/InjectionServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/InjectionServices.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/InjectionServices.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -19,7 +19,7 @@ import org.jboss.weld.bootstrap.api.Service; /** - * Provides callbacks to the container when Web Beans performs injection on an + * Provides callbacks to the container when Weld performs injection on an * InjectionTarget, managed bean or session bean * * This service may be used to provide EE-style injection. Modified: ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/JpaInjectionServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/JpaInjectionServices.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/JpaInjectionServices.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -23,7 +23,7 @@ import org.jboss.weld.bootstrap.api.Service; /** - * A container should implement this interface to allow the Web Beans RI to + * A container should implement this interface to allow the Weld RI to * resolve JPA persistence units and discover entities * * {@link JpaInjectionServices} is a per-module service. Modified: ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/ResourceInjectionServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/ResourceInjectionServices.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/ResourceInjectionServices.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -21,7 +21,7 @@ import org.jboss.weld.bootstrap.api.Service; /** - * A container should implement this interface to allow the Web Beans RI to + * A container should implement this interface to allow the Weld to * resolve Resources * * {@link ResourceInjectionServices} is per-module service. Modified: ri/trunk/spi/src/main/java/org/jboss/weld/manager/api/WeldManager.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/weld/manager/api/WeldManager.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/spi/src/main/java/org/jboss/weld/manager/api/WeldManager.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -28,7 +28,7 @@ import org.jboss.weld.ejb.spi.EjbDescriptor; /** - * Functionality provided by the Web Beans Manager over and above the JSR-299 + * Functionality provided by the Weld Manager over and above the JSR-299 * Manager. * * @author Pete Muir @@ -62,7 +62,7 @@ public WeldManager setCurrent(Class<? extends Annotation> scopeType); /** - * The injection target for the given EJB, or null if Web Beans was not + * The injection target for the given EJB, or null if Weld was not * given this descriptor in the deployment. * * @param <T> @@ -72,7 +72,7 @@ public <T> InjectionTarget<T> createInjectionTarget(EjbDescriptor<T> descriptor); /** - * Get the Bean object for the given EJB, or null if Web Beans was not given + * Get the Bean object for the given EJB, or null if Weld was not given * this descriptor in the deployment. * * @param <T> Modified: ri/trunk/spi/src/main/java/org/jboss/weld/resources/spi/ResourceLoader.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/weld/resources/spi/ResourceLoader.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/spi/src/main/java/org/jboss/weld/resources/spi/ResourceLoader.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -23,7 +23,7 @@ import org.jboss.weld.bootstrap.api.Service; /** - * Resource loading/class creation services for Web Beans. By default an + * Resource loading/class creation services for Weld. By default an * implementation which uses the Thread Context ClassLoader if available, * otherwise the classloading of the implementation is used. * Modified: ri/trunk/spi/src/main/java/org/jboss/weld/servlet/api/ServletServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/weld/servlet/api/ServletServices.java 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/spi/src/main/java/org/jboss/weld/servlet/api/ServletServices.java 2009-10-08 06:11:18 UTC (rev 3894) @@ -23,7 +23,7 @@ /** * Allows the container to identify BDA in use for a request. This method will - * be called, in the same thread as the request, every time Web Beans needs to + * be called, in the same thread as the request, every time Weld needs to * identify a request. * * {@link ServletServices} is a per-deployment service. Modified: ri/trunk/tests/src/test/resources/org/jboss/weld/test/unit/implementation/event/tx/home.xhtml =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/weld/test/unit/implementation/event/tx/home.xhtml 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/tests/src/test/resources/org/jboss/weld/test/unit/implementation/event/tx/home.xhtml 2009-10-08 06:11:18 UTC (rev 3894) @@ -6,14 +6,14 @@ <h:head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>JSF 2.0 Web Beans Example</title> + <title>JSF 2.0 Weld Example</title> </h:head> <h:body> <h:form id="NumberGuessMain"> <h:panelGrid styleClass="title-panel"> <h:outputText value="Guess Number" styleClass="title-panel-text"/> - <h:outputText value="Powered By JavaServer Faces 2.0 and Web Beans" styleClass="title-panel-subtext"/> + <h:outputText value="Powered By JavaServer Faces 2.0 and Weld" styleClass="title-panel-subtext"/> </h:panelGrid> <div style="color: black; font-size: 20px;"> Modified: ri/trunk/tests/src/test/resources/org/jboss/weld/test/unit/implementation/event/tx/web.xml =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/weld/test/unit/implementation/event/tx/web.xml 2009-10-08 05:51:23 UTC (rev 3893) +++ ri/trunk/tests/src/test/resources/org/jboss/weld/test/unit/implementation/event/tx/web.xml 2009-10-08 06:11:18 UTC (rev 3894) @@ -5,7 +5,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - <display-name>Web Beans Test</display-name> + <display-name>Weld Test</display-name> <!-- JSF -->