miscellaneous renames

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@3894 1c488680-804c-0410-94cd-c6b725194a0e

dist/readme.txt

@@ -1,4 +1,4 @@
-Web Beans
+Weld
 ------------
 
 Java Contexts and Dependency Injection (JSR-299) is a new Java standard for 

embedded-tck-runner/src/test/resources/log4j.xml

@@ -54,7 +54,7 @@
     </category>
     -->
 
-    <!-- ############### Web Beans logging ################### -->
+    <!-- ############### Weld logging ################### -->
 
     <category name="org.jboss.weld">
         <priority value="WARN"/>

impl/src/main/java/org/jboss/weld/BeanManagerImpl.java

@@ -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 @@ public <T> Bean<T> getBean(WBAnnotated<T, ?> element, Annotation... bindings)
       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();

impl/src/main/java/org/jboss/weld/Container.java

@@ -27,7 +27,7 @@
 import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
 
 /**
- * A Web Beans application container
+ * A Weld application container
  * 
  * @author pmuir
  *

impl/src/main/java/org/jboss/weld/bean/AbstractBean.java

@@ -83,7 +83,7 @@ public abstract class AbstractBean<T, E> extends RIBean<T>
    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 @@ protected boolean isInitialized()
    /**
     * Constructor
     * 
-    * @param manager The Weld manager
+    * @param manager The Bean manager
     */
    public AbstractBean(String idSuffix, BeanManagerImpl manager)
    {

impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java

@@ -88,7 +88,7 @@ public abstract class AbstractClassBean<T> extends AbstractBean<T, Class<T>> imp
     * 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)
    {

impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java

@@ -63,7 +63,7 @@ public abstract class AbstractProducerBean<X, T, S extends Member> extends Abstr
    /**
     * 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)
    {

impl/src/main/java/org/jboss/weld/bean/ManagedBean.java

@@ -91,7 +91,7 @@ public static <T> ManagedBean<T> of(WBClass<T> clazz, BeanManagerImpl manager)
     * 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)
    {

impl/src/main/java/org/jboss/weld/bean/NewManagedBean.java

@@ -38,7 +38,7 @@ public class NewManagedBean<T> extends ManagedBean<T> implements NewBean
     * 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 @@ public static <T> NewManagedBean<T> of(WBClass<T> clazz, BeanManagerImpl manager
     * 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)
    {

impl/src/main/java/org/jboss/weld/bean/NewSessionBean.java

@@ -40,7 +40,7 @@ public class NewSessionBean<T> extends SessionBean<T> implements NewBean
     * 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 @@ public static <T> NewSessionBean<T> of(InternalEjbDescriptor<T> ejbDescriptor, B
     * 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)
    {

impl/src/main/java/org/jboss/weld/bean/ProducerField.java

@@ -59,7 +59,7 @@ public static <X, T> ProducerField<X, T> of(WBField<T, X> field, AbstractClassBe
     * 
     * @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)
    {

impl/src/main/java/org/jboss/weld/bean/SessionBean.java

@@ -92,7 +92,7 @@ public static <T> SessionBean<T> of(InternalEjbDescriptor<T> ejbDescriptor, Bean
     * 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 @@ private void checkEJBTypeAllowed()
    {
       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");
       }
    }
 

impl/src/main/java/org/jboss/weld/bean/builtin/facade/AbstractFacade.java

@@ -42,15 +42,15 @@ public abstract class AbstractFacade<T, X> implements Serializable
 
    // 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;
 
    /**
     * 
     * @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)

impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java

@@ -149,10 +149,10 @@ private BeanDeployment visit(BeanDeploymentArchive beanDeploymentArchive, Map<Be
 
    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 @@ public Bootstrap deployBeans()
             entry.getValue().deployBeans(environment);
          }
          fireAfterBeanDiscoveryEvent();
-         log.debug("Web Beans initialized. Validating beans.");
+         log.debug("Weld initialized. Validating beans.");
       }
       return this;
    }

impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java

@@ -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

impl/src/main/java/org/jboss/weld/event/EventImpl.java

@@ -53,7 +53,7 @@ public static <E> EventImpl<E> of(Type eventType, BeanManagerImpl manager, Set<A
     * 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)

impl/src/main/java/org/jboss/weld/event/ObserverFactory.java

@@ -38,7 +38,7 @@ public class ObserverFactory
     * 
     * @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)

impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java

@@ -73,7 +73,7 @@ public class ObserverMethodImpl<X, T> implements ObserverMethod<X, T>
     * 
     * @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)
    {

impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java

@@ -154,10 +154,12 @@ public void inject(Object declaringInstance, Object value)
     * 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();

impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java

@@ -246,10 +246,12 @@ public void inject(Object declaringInstance, Object value)
     * 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();

impl/src/main/java/org/jboss/weld/introspector/WBMethod.java

@@ -58,7 +58,7 @@ public interface WBMethod<T, X> extends WBCallable<T, X, Method>, AnnotatedMetho
     * 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;

impl/src/main/java/org/jboss/weld/introspector/jlr/AbstractWBMember.java

@@ -123,7 +123,7 @@ public Package getPackage()
    /**
     * 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)

impl/src/main/java/org/jboss/weld/introspector/jlr/WBConstructorImpl.java

@@ -218,7 +218,7 @@ public Constructor<T> getDelegate()
    /**
     * Creates a new instance
     * 
-    * @param manager The Web Beans manager
+    * @param manager The Bean manager
     * @return An instance
     * @throws InvocationTargetException 
     * @throws IllegalAccessException 

impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java

@@ -112,7 +112,7 @@ public static BeanManagerImpl getModuleBeanManager(FacesContext facesContext)
       }
       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");
       }
    }
 

impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java

@@ -39,7 +39,7 @@ public class NameBasedResolver
    // The beans to search
    private final Iterable<? extends Bean<?>> allBeans;
 
-   // The Web Beans manager
+   // The Bean manager
    private final BeanManagerImpl manager;
 
    /**

impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java

@@ -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
  * 

impl/src/main/java/org/jboss/weld/util/Beans.java

@@ -208,7 +208,7 @@ else if (postConstructMethods.size() == 1)
       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)

inject-tck-runner/src/test/resources/log4j.xml

@@ -54,7 +54,7 @@
     </category>
     -->
 
-    <!-- ############### Web Beans logging ################### -->
+    <!-- ############### Weld logging ################### -->
 
     <category name="org.jboss.weld">
         <priority value="WARN"/>

inject-tck-runner/tests.xml

@@ -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>

jboss-as/build.properties

@@ -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
 

jboss-as/build.xml

@@ -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}" />

jboss-tck-runner/src/test/resources/log4j.xml

@@ -54,7 +54,7 @@
     </category>
     -->
 
-    <!-- ############### Web Beans logging ################### -->
+    <!-- ############### Weld logging ################### -->
 
     <category name="org.jboss.weld">
         <priority value="WARN"/>

spi/src/main/java/org/jboss/weld/bootstrap/api/Environment.java

@@ -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
  *

spi/src/main/java/org/jboss/weld/bootstrap/api/Environments.java

@@ -42,7 +42,7 @@ public enum Environments implements Environment
    /**
     * 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 @@ public enum Environments implements Environment
    /**
     * 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
     *