[weld-commits] Weld SVN: r4703 - in api/trunk/cdi/src/main/java/javax: enterprise/inject and 1 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Thu Nov 5 16:29:13 EST 2009
Author: gavin.king at jboss.com
Date: 2009-11-05 16:29:12 -0500 (Thu, 05 Nov 2009)
New Revision: 4703
Modified:
api/trunk/cdi/src/main/java/javax/decorator/package-info.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/New.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessBean.java
Log:
"bean archive"
Modified: api/trunk/cdi/src/main/java/javax/decorator/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/decorator/package-info.java 2009-11-05 21:06:01 UTC (rev 4702)
+++ api/trunk/cdi/src/main/java/javax/decorator/package-info.java 2009-11-05 21:29:12 UTC (rev 4703)
@@ -47,21 +47,19 @@
*
* <h3>Enabled decorators</h3>
*
- * <p>By default, a bean deployment archive has no enabled
- * decorators. A decorator must be explicitly enabled by listing
- * its bean class under the <tt><decorators></tt> element
- * of the <tt>beans.xml</tt> file of the bean deployment archive.
- * The order of the decorator declarations determines the decorator
- * ordering. Decorators which occur earlier in the list are called
- * first.</p>
+ * <p>By default, a bean archive has no enabled decorators. A
+ * decorator must be explicitly enabled by listing its bean class
+ * under the <tt><decorators></tt> element of the
+ * <tt>beans.xml</tt> file of the bean archive. The order of the
+ * decorator declarations determines the decorator ordering.
+ * Decorators which occur earlier in the list are called first.</p>
*
* <p>A decorator is bound to a bean if:</p>
*
* <ul>
* <li>The bean is {@linkplain javax.enterprise.inject eligible for injection}
* to the delegate injection point of the decorator.</li>
- * <li>The decorator is enabled in the bean deployment archive of
- * the bean.</li>
+ * <li>The decorator is enabled in the bean archive of the bean.</li>
* </ul>
*
* <p>If a managed bean class is declared final, it may not have
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java 2009-11-05 21:06:01 UTC (rev 4702)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java 2009-11-05 21:29:12 UTC (rev 4703)
@@ -38,19 +38,18 @@
*
* <p>An alternative is not available for injection, lookup
* or EL resolution to classes or JSP/JSF pages in a module
- * unless the module is a bean deployment archive and the
- * alternative is explicitly <em>selected</em> in that bean
- * deployment archive. An alternative is never available for
- * injection, lookup or EL resolution in a module that is not
- * a bean deployment archive.</p>
+ * unless the module is a bean archive and the alternative is
+ * explicitly <em>selected</em> in that bean archive. An
+ * alternative is never available for injection, lookup or EL
+ * resolution in a module that is not a bean archive.</p>
*
- * <p>By default, a bean deployment archive has no selected
- * alternatives. An alternative must be explicitly declared
- * using the <tt><alternatives></tt> element of the
- * <tt>beans.xml</tt> file of the bean deployment archive.
- * The <tt><alternatives></tt> element contains a
- * list of bean classes and stereotypes. An alternative is
- * selected for the bean deployment archive if either:</p>
+ * <p>By default, a bean archive has no selected alternatives.
+ * An alternative must be explicitly declared using the
+ * <tt><alternatives></tt> element of the
+ * <tt>beans.xml</tt> file of the bean archive. The
+ * <tt><alternatives></tt> element contains a list of
+ * bean classes and stereotypes. An alternative is selected
+ * for the bean archive if either:</p>
*
* <ul>
* <li>the alternative is a managed bean or session bean and
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/New.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/New.java 2009-11-05 21:06:01 UTC (rev 4702)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/New.java 2009-11-05 21:29:12 UTC (rev 4703)
@@ -70,12 +70,14 @@
public @interface New
{
/**
- * <p>Selects the bean to be injected. The class
- * must be the bean class of an enabled or disabled
- * bean. The bean class need not be deployed in a
- * bean deployment archive.</p>
+ * <p>Specifies the bean class of the new instance. The class
+ * must be the bean class of an enabled or disabled bean. The
+ * bean class need not be deployed in a bean archive.</p>
*
- * @return the bean class of the bean to be injected
+ * <p>Defaults to the declared type of the injection point if
+ * not specified.</p>
+ *
+ * @return the bean class of the new instance
*/
Class<?> value() default New.class;
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-11-05 21:06:01 UTC (rev 4702)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-11-05 21:29:12 UTC (rev 4703)
@@ -331,14 +331,14 @@
* <p>A bean is said to be enabled if:</p>
*
* <ul>
- * <li>it is deployed in a bean deployment archive, and</li>
+ * <li>it is deployed in a bean archive, and</li>
* <li>it is not a
* {@linkplain javax.enterprise.inject.Produces producer method or field}
* of a disabled bean, and</li>
* <li>it is not {@linkplain javax.enterprise.inject.Specializes specialized}
* by any other enabled bean, and either</li>
* <li>it is not an {@linkplain javax.enterprise.inject.Alternative alternative},
- * or it is a selected alternative of at least one bean deployment archive.</li>
+ * or it is a selected alternative of at least one bean archive.</li>
* </ul>
*
* <p>Otherwise, the bean is said to be disabled.</p>
@@ -347,10 +347,9 @@
*
* <p>Beans and their clients may be deployed in modules in a module architecture
* such as the Java EE environment. In a module architecture, certain modules are
- * considered bean deployment archives. In the Java EE module architecture, any
- * Java EE module or library is a module. The Java EE module or library is a bean
- * deployment archive if it contains a <tt>beans.xml</tt> file in the metadata
- * directory.</para>
+ * considered bean archives. In the Java EE module architecture, any Java EE
+ * module or library is a module. The Java EE module or library is a bean archive
+ * if it contains a <tt>beans.xml</tt> file in the metadata directory.</para>
*
* <p>A bean is available for injection in a certain module if:</p>
*
@@ -416,24 +415,23 @@
* page with the EL expression.</li>
* </ul>
*
- * <p>If an EL name resolves to more than one bean, the container attempts to resolve
- * the ambiguity by eliminating all beans which are not alternatives.</p>
+ * <p>If an EL name resolves to more than one bean, the container attempts to
+ * resolve the ambiguity by eliminating all beans which are not alternatives.</p>
*
* <h3>Enabled interceptors</h3>
*
- * <p>By default, a bean deployment archive has no enabled interceptors. An
- * interceptor must be explicitly enabled by listing its bean class under the
+ * <p>By default, a bean archive has no enabled interceptors. An interceptor
+ * must be explicitly enabled by listing its bean class under the
* <tt><interceptors></tt> element of the <tt>beans.xml</tt> file of the
- * bean deployment archive. The order of the interceptor declarations determines
- * the interceptor ordering. Interceptors which occur earlier in the list are
+ * bean archive. The order of the interceptor declarations determines the
+ * interceptor ordering. Interceptors which occur earlier in the list are
* called first.</p>
*
* <p>An interceptor is bound to a bean if:</p>
*
* <ul>
* <li>The bean has all the interceptor bindings of the interceptor.</li>
- * <li>The interceptor is enabled in the bean deployment archive of
- * the bean.</li>
+ * <li>The interceptor is enabled in the bean archive of the bean.</li>
* </ul>
*
* <p>An interceptor instance is a
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java 2009-11-05 21:06:01 UTC (rev 4702)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java 2009-11-05 21:29:12 UTC (rev 4703)
@@ -19,8 +19,7 @@
/**
* <p>
* The container fires an event of this type for each Java class or interface
- * it discovers in a bean deployment archive, before it reads the declared
- * annotations.
+ * it discovers in a bean archive, before it reads the declared annotations.
* </p>
* <p>
* Any observer of this event is permitted to wrap and/or replace the
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessBean.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessBean.java 2009-11-05 21:06:01 UTC (rev 4702)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessBean.java 2009-11-05 21:29:12 UTC (rev 4703)
@@ -19,7 +19,7 @@
/**
* <p>
* The container fires an event of this type for each enabled bean, interceptor
- * or decorator deployed in a bean deployment archive, before registering the
+ * or decorator deployed in a bean archive, before registering the
* {@link javax.enterprise.inject.spi.Bean} object.
* </p>
* <p>
More information about the weld-commits
mailing list