Weld SVN: r4261 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-23 23:15:50 -0400 (Fri, 23 Oct 2009)
New Revision: 4261
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
Log:
minor
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-10-24 03:13:58 UTC (rev 4260)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-10-24 03:15:50 UTC (rev 4261)
@@ -29,6 +29,8 @@
* }
* </pre>
*
+ * <p>The bean types of a bean are determined automatically.</p>
+ *
* <p>Almost any Java type may be a bean type of a bean:</tt>
*
* <ul>
15 years, 1 month
Weld SVN: r4260 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-23 23:13:58 -0400 (Fri, 23 Oct 2009)
New Revision: 4260
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
Log:
minor
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-10-24 03:11:51 UTC (rev 4259)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-10-24 03:13:58 UTC (rev 4260)
@@ -246,6 +246,8 @@
* resources, entity manager, entity manager factory, remote EJB instance or
* web service reference from the component environment.</p>
*
+ * <p>A resource may not have an EL name.</p>
+ *
* @see javax.enterprise.inject.Produces
* @see javax.inject.Scope
* @see javax.inject.Named
15 years, 1 month
Weld SVN: r4259 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-23 23:11:51 -0400 (Fri, 23 Oct 2009)
New Revision: 4259
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/Produces.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
Log:
much more info
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/Produces.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/Produces.java 2009-10-24 02:42:35 UTC (rev 4258)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Produces.java 2009-10-24 03:11:51 UTC (rev 4259)
@@ -30,17 +30,6 @@
* <p>Identifies a producer method or field. May be applied to
* a method or field of a bean class.</p>
*
- * <p>A producer method or field acts as a source of objects to be
- * injected, where:</p>
- * <ul>
- * <li>the objects to be injected are not required to be instances
- * of beans, or</li>
- * <li>the concrete type of the objects to be injected may vary at
- * runtime, or</li>
- * <li>the objects require some custom initialization that is not
- * performed by the bean constructor.</li>
- * </ul>
- *
* <p>A producer method must be a non-abstract method of a managed
* bean class or session bean class. A producer method may be
* either static or non-static. If the bean is a session bean, the
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-10-24 02:42:35 UTC (rev 4258)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-10-24 03:11:51 UTC (rev 4259)
@@ -155,6 +155,98 @@
* remote EJBs and web services)</li>
* </ul>
*
+ * <h4>Managed beans</h4>
+ *
+ * <p>A managed bean is a bean that is implemented by a Java class. The basic
+ * lifecycle and semantics of managed beans are defined by the Managed Beans
+ * specification.</p>
+ *
+ * <p>A top-level Java class is a managed bean if it is defined to be a managed
+ * bean by any other Java EE specification, or if it meets all of the following
+ * conditions:</p>
+ *
+ * <ul>
+ * <li>It is not a non-static inner class.</li>
+ * <li>It is a concrete class, or is annotated
+ * {@link javax.enterprise.context.Decorator @Decorator}.</li>
+ * <li>It is not annotated with an EJB component-defining annotation or declared
+ * as an EJB bean class in <tt>ejb-jar.xml</tt>.</li>
+ * <li>It has an appropriate constructor; either the class has a constructor with
+ * no parameters, or the class declares a constructor annotated
+ * {@link javax.inject.Inject @Inject}.</li>
+ * </ul>
+ *
+ * <p>All Java classes that meet these conditions are managed beans and thus no
+ * special declaration is required to define a managed bean.</p>
+ *
+ * <p>If a managed bean has a public field, it must have scope
+ * {@link javax.enterprise.context.Dependent @Dependent}.</p>
+ *
+ * <p>If the managed bean class is a generic type, it must have scope
+ * {@link javax.enterprise.context.Dependent @Dependent}.</p>
+ *
+ * <h4>Session beans</h4>
+ *
+ * <p>A session bean is a bean that is implemented by a session bean with an
+ * EJB 3.x client view. The basic lifecycle and semantics of an EJB session bean
+ * are defined by the EJB specification.</p>
+ *
+ * <p>A stateless session bean must belong to the
+ * {@link javax.enterprise.context.Dependent @Dependent} pseudo-scope. A
+ * singleton bean must belong to either the
+ * {@link javax.enterprise.context.ApplicationScoped @ApplicationScoped}
+ * scope or to the {@link javax.enterprise.context.Dependent @Dependent}
+ * pseudo-scope. A stateful session bean may have any scope.</p>
+ *
+ * <p>If the session bean class is a generic type, it must have scope
+ * {@link javax.enterprise.context.Dependent @Dependent}.</p>
+ *
+ * <p>If a session bean is a stateful session bean:</p>
+ *
+ * <ul>
+ * <li>If the scope is {@link javax.enterprise.context.Dependent @Dependent},
+ * the application may call any EJB remove method of a contextual instance of the
+ * session bean.</li>
+ * <li>Otherwise, the application may not directly call any EJB remove method of
+ * any contextual instance of the session bean.</li>
+ * </ul>
+ *
+ * <h4>Producer methods and fields</h4>
+ *
+ * <p>A {@linkplain javax.enterprise.inject.Produces producer method or field}
+ * acts as a source of objects to be injected, where:</p>
+ *
+ * <ul>
+ * <li>the objects to be injected are not required to be instances
+ * of beans, or</li>
+ * <li>the concrete type of the objects to be injected may vary at
+ * runtime, or</li>
+ * <li>the objects require some custom initialization that is not
+ * performed by the bean constructor.</li>
+ * </ul>
+ *
+ * <h4>Resources</h4>
+ *
+ * <p>A resource is a bean that represents a reference to a resource, persistence
+ * context, persistence unit, remote EJB or web service in the Java EE component
+ * environment.</p>
+ *
+ * <p>A resource may be declared by specifying a Java EE component environment
+ * injection annotation as part of a producer field declaration.</p>
+ *
+ * <ul>
+ * <li>For a Java EE resource, <tt>@Resource</tt> must be specified.</li>
+ * <li>For a persistence context, <tt>@PersistenceContext</tt> must be specified.
+ * <li>For a persistence unit, <tt>@PersistenceUnit</tt> must be specified.
+ * <li>For a remote EJB, <tt>@EJB</tt> must be specified.
+ * <li>or a web service, <tt>@WebServiceRef</tt> must be specified.
+ * </ul>
+ *
+ * <p>The injection annotation specifies the metadata needed to obtain the
+ * resources, entity manager, entity manager factory, remote EJB instance or
+ * web service reference from the component environment.</p>
+ *
+ * @see javax.enterprise.inject.Produces
* @see javax.inject.Scope
* @see javax.inject.Named
*
15 years, 1 month
Weld SVN: r4258 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-23 22:42:35 -0400 (Fri, 23 Oct 2009)
New Revision: 4258
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/CreationException.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/IllegalProductException.java
Log:
fix
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/CreationException.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/CreationException.java 2009-10-24 02:41:10 UTC (rev 4257)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/CreationException.java 2009-10-24 02:42:35 UTC (rev 4258)
@@ -19,7 +19,7 @@
/**
- * Wraps any checked exceptions which occur during creation of an bean
+ * Wraps any checked exceptions which occur during creation of a bean.
*
* @author Pete Muir
*/
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/IllegalProductException.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/IllegalProductException.java 2009-10-24 02:41:10 UTC (rev 4257)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/IllegalProductException.java 2009-10-24 02:42:35 UTC (rev 4258)
@@ -18,8 +18,9 @@
/**
- * Thrown if a producer method returns a null value or a producer field contains
- * a null value, and the scope of the method or field is not @Dependent
+ * Thrown if a producer method returns a null value or a producer
+ * field contains a null value, and the scope of the method or
+ * field is not <tt>@Dependent</tt>.
*/
public class IllegalProductException extends InjectionException
{
15 years, 1 month
Weld SVN: r4257 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-23 22:41:10 -0400 (Fri, 23 Oct 2009)
New Revision: 4257
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java
Log:
fix
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java 2009-10-24 02:40:43 UTC (rev 4256)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java 2009-10-24 02:41:10 UTC (rev 4257)
@@ -20,8 +20,7 @@
/**
- * Thrown if a bean has normal scope and the type cannot be proxied by the
- * container
+ * Thrown if a bean has normal scope and cannot be proxied by the container.
*
* @author Pete Muir
*/
15 years, 1 month
Weld SVN: r4256 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-23 22:40:43 -0400 (Fri, 23 Oct 2009)
New Revision: 4256
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/InjectionException.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java
Log:
fix
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java 2009-10-24 02:36:59 UTC (rev 4255)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java 2009-10-24 02:40:43 UTC (rev 4256)
@@ -19,11 +19,9 @@
/**
- * An AmbiguousDependencyException is thrown when within the set of enabled
- * beans with the API type and bind- ing types declared there exists no unique
- * Web Bean with a higher precedence than all other beans in the set.
+ * Thrown when the set of enabled beans with the required bean type and
+ * qualifiers contains multiple beans.
*
- *
* @author Pete Muir
*/
public class AmbiguousResolutionException extends ResolutionException
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/InjectionException.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/InjectionException.java 2009-10-24 02:36:59 UTC (rev 4255)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/InjectionException.java 2009-10-24 02:40:43 UTC (rev 4256)
@@ -19,9 +19,7 @@
/**
- * An AmbiguousDependencyException is thrown when within the set of enabled
- * beans with the API type and bind- ing types declared there exists no unique
- * Web Bean with a higher precedence than all other beans in the set.
+ * Indicates a problem relating to dependency injection.
*
*
* @author Pete Muir
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java 2009-10-24 02:36:59 UTC (rev 4255)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java 2009-10-24 02:40:43 UTC (rev 4256)
@@ -20,7 +20,8 @@
/**
- * Thrown if no beans can be resolved
+ * Thrown when the set of enabled beans with the required bean type
+ * and qualifiers is empty.
*
* @author Pete Muir
*/
15 years, 1 month
Weld SVN: r4255 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-23 22:36:59 -0400 (Fri, 23 Oct 2009)
New Revision: 4255
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
Log:
package doc for javax.enterprise.inject
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-10-24 01:50:25 UTC (rev 4254)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-10-24 02:36:59 UTC (rev 4255)
@@ -1,7 +1,162 @@
/**
- * This package contains annotations relating to bean and
+ * <p>This package contains annotations relating to bean and
* stereotype definition, built-in qualifiers, and interfaces
- * and classes relating to programmatic lookup.
+ * and classes relating to programmatic lookup.</p>
*
+ * <p>A bean comprises the following attributes:</p>
+ *
+ * <ul>
+ * <li>A (nonempty) set of bean types</li>
+ * <li>A (nonempty) set of qualifiers</li>
+ * <li>A scope</li>
+ * <li>Optionally, a bean EL name</li>
+ * <li>A set of interceptor bindings</li>
+ * <li>A bean implementation</li>
+ * </ul>
+ *
+ * <h3>Bean types</h3>
+ *
+ * <p>A bean type is a client-visible type of the bean. A
+ * bean may have multiple bean types. The following bean has
+ * bean types <tt>BookShop</tt>, <tt>Business</tt> and
+ * <tt>Shop<Book></tt>.</p>
+ *
+ * <pre>
+ * public class BookShop
+ extends Business
+ * implements Shop<Book> {
+ * ...
+ * }
+ * </pre>
+ *
+ * <p>Almost any Java type may be a bean type of a bean:</tt>
+ *
+ * <ul>
+ * <li>A bean type may be an interface, a concrete class or an
+ * abstract class, and may be declared final or have final methods.</li>
+ * <li>A bean type may be a parameterized type with actual type
+ * parameters and type variables.</li>
+ * <li>A bean type may be an array type. Two array types are
+ * considered identical only if the element type is identical.</li>
+ * <li>A bean type may be a primitive type. Primitive types are
+ * considered to be identical to their corresponding wrapper types
+ * in <tt>java.lang</tt>.</li>
+ * <li>A bean type may be a raw type.</li>
+ * </ul>
+ *
+ * <p>A type variable is not a legal bean type. A parameterized type
+ * that contains a wildcard type parameter is not a legal bean type.</p>
+ *
+ * <p>The bean types of a bean may be resticted using the
+ * {@link javax.enterprise.inject.Typed @Typed} annotation.</p>
+ *
+ * <h3>Qualifiers</h3>
+ *
+ * <p>A {@linkplain javax.inject.Qualfiier qualifier} represents some
+ * client-visible semantic associated with a type that is satisfied
+ * by some implementations of the type (and not by others). Qualifiers
+ * are applied to injection points to distinguish which implementation
+ * is required by the client.</p>
+ *
+ * <pre>
+ * @Inject @Synchronous PaymentProcessor paymentProcessor;
+ * </pre>
+ *
+ * <p>The qualifiers of a bean are declared by annotating the bean class
+ * or producer method or field with the qualifier types.</p>
+ *
+ * <pre>
+ * @Synchronous @Reliable
+ * class SynchronousReliablePaymentProcessor
+ * implements PaymentProcessor {
+ * ...
+ * }
+ * </pre>
+ *
+ * <p>A bean may only be injected to an injection point if</p>
+ *
+ * <ul>
+ * <li>the type of the injection point is one of the bean types of the
+ * bean, and</li>
+ * <li>it has all the qualifiers of the injection point.</li>
+ * </ul>
+ *
+ * <h3>Scope</h3>
+ *
+ * <p>All beans have a scope. The scope of a bean determines the lifecycle
+ * of its instances, and which instances of the bean are visible to instances
+ * of other beans.</p>
+ *
+ * <p>The scope of a bean is defined by annotating the bean class or producer
+ * method or field with a scope type or stereotype that declares a default
+ * scope type.</p>
+ *
+ * <pre>
+ * @ConversationScoped
+ * public class Order { ... }
+ * </pre>
+ *
+ * <h3>Bean EL name</h3>
+ *
+ * <p>A bean may have a bean EL name. A bean with an EL name may be referred
+ * to by its name in Unified EL expressions. A valid bean EL name is a
+ * period-separated list of valid EL identifiers.</p>
+ *
+ * <p>To specify the EL name of a bean, the qualifier
+ * {@link javax.inject.Named @Named} is applied to the bean class or
+ * producer method or field.
+ *
+ * <pre>
+ * @Named("currentOrder")
+ * public class Order { ... }
+ * </pre>
+ *
+ * If the <tt>@Named</tt> annotation does not specify the
+ * {@link javax.inject.Named#value() value} member, the EL name is defaulted.
+ *
+ * <h3>Interceptor bindings</h3>
+ *
+ * <p>Interceptor bindings may be used to associate interceptors with any
+ * managed bean that is not itself an interceptor or decorator or with any
+ * EJB session or message-driven bean.</p>
+ *
+ * <p>An interceptor binding may be declared by annotating the bean class,
+ * or a method of the bean class, with an interceptor binding type.</p>
+ *
+ * <p>In the following example, the <tt>TransactionInterceptor</tt> will be
+ * applied at the class level, and therefore applies to all business methods
+ * of the class:
+ *
+ * <pre>
+ * @Transactional
+ * public class ShoppingCart { ... }
+ * </pre>
+ *
+ * <p>In this example, the <tt>TransactionInterceptor</tt> will be applied at
+ * the method level:</p>
+ *
+ * <pre>
+ * public class ShoppingCart {
+ * @Transactional
+ * public void placeOrder() { ... }
+ * }
+ * </pre>
+ *
+ * <h3>Bean implementation</h3>
+ *
+ * <p>The container provides built-in support for injection and contextual
+ * lifecycle management of the following kinds of bean:</p>
+ *
+ * <ul>
+ * <li>Managed beans</li>
+ * <li>Session beans</li>
+ * <li>Producer methods and fields</li>
+ * <li>Resources (Java EE resources, persistence contexts, persistence units,
+ * remote EJBs and web services)</li>
+ * </ul>
+ *
+ * @see javax.inject.Scope
+ * @see javax.inject.Named
+ *
*/
package javax.enterprise.inject;
\ No newline at end of file
15 years, 1 month
Weld SVN: r4254 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-23 21:50:25 -0400 (Fri, 23 Oct 2009)
New Revision: 4254
Added:
api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
Log:
add package-info
Added: api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java (rev 0)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-10-24 01:50:25 UTC (rev 4254)
@@ -0,0 +1,7 @@
+/**
+ * This package contains annotations relating to bean and
+ * stereotype definition, built-in qualifiers, and interfaces
+ * and classes relating to programmatic lookup.
+ *
+ */
+package javax.enterprise.inject;
\ No newline at end of file
15 years, 1 month
Weld SVN: r4253 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-23 21:47:10 -0400 (Fri, 23 Oct 2009)
New Revision: 4253
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/Typed.java
Log:
minor
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java 2009-10-24 01:44:59 UTC (rev 4252)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java 2009-10-24 01:47:10 UTC (rev 4253)
@@ -61,8 +61,8 @@
* <li>the alternative is a producer method, field or resource,
* and the bean class that declares the method or field is listed,
* or</li>
- * <li>any {@link javax.enterprise.inject.Alternative @Alternative}
- * stereotype of the alternative is listed.</li>
+ * <li>any <tt>@Alternative</tt> stereotype of the alternative
+ * is listed.</li>
* </ul>
*
* @author Gavin King
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/Typed.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/Typed.java 2009-10-24 01:44:59 UTC (rev 4252)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Typed.java 2009-10-24 01:47:10 UTC (rev 4253)
@@ -39,11 +39,10 @@
* }
* </pre>
*
- * <p>When a {@link javax.enterprise.inject.Typed @Typed}
- * annotation is specified, only the types whose classes are
- * explicitly listed using the
- * {@link javax.enterprise.inject.Typed#value() value} member
- * are bean types of the bean.</p>
+ * <p>When a <tt>@Typed</tt> annotation is specified,
+ * only the types whose classes are explicitly listed using
+ * the {@link javax.enterprise.inject.Typed#value() value}
+ * member are bean types of the bean.</p>
*
* @author Pete Muir
* @author Gavin King
15 years, 1 month
Weld SVN: r4252 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-23 21:44:59 -0400 (Fri, 23 Oct 2009)
New Revision: 4252
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/Any.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/Default.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/New.java
Log:
minor changes
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/Any.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/Any.java 2009-10-24 01:44:44 UTC (rev 4251)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Any.java 2009-10-24 01:44:59 UTC (rev 4252)
@@ -32,19 +32,18 @@
/**
* <p>The built-in qualifier type.</p>
*
- * <p>Every bean has the built-in qualifier
- * {@link javax.enterprise.inject.Any @Any}, even if it
- * does not explicitly declare this qualifier, except for the
- * special {@link javax.enterprise.inject.New @New}
- * qualified beans.</p>
+ * <p>Every bean has the qualifier <tt>@Any</tt>,
+ * even if it does not explicitly declare this qualifier,
+ * except for the special
+ * {@link javax.enterprise.inject.New @New qualified beans}.</p>
*
- * <p>Every event has the qualifier
- * {@link javax.enterprise.inject.Any @Any}, even if it
- * does not explicitly declare this qualifier.</p>
+ * <p>Every event has the qualifier <tt>@Any</tt>,
+ * even if it was raised without explicitly declaration
+ * of this qualifier.</p>
*
- * <p>The {@link javax.enterprise.inject.Any @Any}
- * qualifier allows an injection point to refer to all
- * beans or all events of a certain bean type.</p>
+ * <p>The <tt>@Any</tt> qualifier allows an injection
+ * point to refer to all beans or all events of a certain
+ * bean type.</p>
*
* <pre>
* @Inject @Any Instance<PaymentProcessor> anyPaymentProcessor;
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/Default.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/Default.java 2009-10-24 01:44:44 UTC (rev 4251)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Default.java 2009-10-24 01:44:59 UTC (rev 4252)
@@ -34,11 +34,11 @@
*
* <p>If a bean does not explicitly declare a qualifier other than
* {@link javax.inject.Named @Named}, the bean has the qualifier
- * {@link javax.enterprise.inject.Default @Default}.</p>
+ * <tt>@Default</tt>.</p>
*
* <p>If an injection point declares no qualifier, the injection point
* has exactly one qualifier, the default qualifier
- * {@link javax.enterprise.inject.Default @Default}.</p>
+ * <tt>@Default</tt>.</p>
*
* <p>The following are equivalent:</p>
*
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/New.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/New.java 2009-10-24 01:44:44 UTC (rev 4251)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/New.java 2009-10-24 01:44:59 UTC (rev 4252)
@@ -32,8 +32,10 @@
/**
* <p>The built-in qualifier type.</p>
*
- * <p>This allows the application to obtain a new instance of a bean which is
- * not bound to the declared scope, but has had dependency injection performed.</p>
+ * <p>The <tt>@New</tt> qualifier allows the application
+ * to obtain a new instance of a bean which is not bound to
+ * the declared scope, but has had dependency injection
+ * performed.</p>
*
* <pre>
* @Produces @ConversationScoped
@@ -43,11 +45,13 @@
* }
* </pre>
*
- * <p>When the qualifier {@link javax.enterprise.inject.New @New} is specified
- * at an injection point and no {@link javax.enterprise.inject.New#value() value}
- * member is explicitly specified, the container defaults the
- * {@link javax.enterprise.inject.New#value() value} to the declared type of the
- * injection point. So the following injection point has qualifier
+ * <p>When the <tt>@New</tt> qualifier is specified
+ * at an injection point and no
+ * {@link javax.enterprise.inject.New#value() value}
+ * member is explicitly specified, the container defaults
+ * the {@link javax.enterprise.inject.New#value() value}
+ * to the declared type of the injection point. So the
+ * following injection point has qualifier
* <tt>@New(Order.class)</tt>:</p>
*
* <pre>
15 years, 1 month