Author: gavin.king(a)jboss.com Date: 2009-10-25 11:17:19 -0400 (Sun, 25 Oct 2009) New Revision: 4300 Modified: api/trunk/cdi/src/main/java/javax/decorator/Decorator.java api/trunk/cdi/src/main/java/javax/decorator/package-info.java Log: reorg for more consistency Modified: api/trunk/cdi/src/main/java/javax/decorator/Decorator.java =================================================================== --- api/trunk/cdi/src/main/java/javax/decorator/Decorator.java 2009-10-25 15:09:09 UTC (rev 4299) +++ api/trunk/cdi/src/main/java/javax/decorator/Decorator.java 2009-10-25 15:17:19 UTC (rev 4300) @@ -28,39 +28,19 @@ /** * <p>Specifies that a class is a decorator. May be applied to - * a bean class.</p> + * a managed bean class.</p> * * <pre> * &#064;Decorator * class TimestampLogger implements Logger { ... } * </pre> * - * <p>A decorator implements one or more bean types and - * intercepts business method invocations of beans which - * implement those bean types. These bean types are called - * decorated types.</p> - * - * <p>A decorator is a managed bean. The set of decorated types - * of a decorator includes all interfaces implemented directly or - * indirectly by the bean class, except for {@link java.io.Serializable}. - * The decorator bean class and its superclasses are not decorated - * types of the decorator. The decorator class may be abstract.</p> - * * <p>Decorators of a session bean must comply with the bean provider * programming restrictions defined by the EJB specification. * Decorators of a stateful session bean must comply with the rules * for instance passivation and conversational state defined by the * EJB specification.</p> * - * <p>A decorator may be an abstract class, and is not required to - * implement every method of every decorated type.</p> - * - * <p>A decorator intercepts every method:</p> - * <ul> - * <li>declared by a decorated type of the decorator</li> - * <li>that is implemented by the bean class of the decorator.</li> - * </ul> - * * @see javax.decorator.Decorates &#064;Decorates identifies the * delegate injection point of a decorator. * Modified: api/trunk/cdi/src/main/java/javax/decorator/package-info.java =================================================================== --- api/trunk/cdi/src/main/java/javax/decorator/package-info.java 2009-10-25 15:09:09 UTC (rev 4299) +++ api/trunk/cdi/src/main/java/javax/decorator/package-info.java 2009-10-25 15:17:19 UTC (rev 4300) @@ -1,17 +1,43 @@ /** * <p>Annotations relating to decorators.</p> * + * <p>A decorator implements one or more bean types and + * intercepts business method invocations of beans which + * implement those bean types. These bean types are called + * decorated types.</p> + * * <p>Decorators are superficially similar to interceptors, * but because they directly implement operations with business * semantics, they are able to implement business logic and, * conversely, unable to implement the cross-cutting concerns * for which interceptors are optimized.</p> * + * <p>Decorators are called after interceptors.</p> + * * <p>A decorator is a managed bean annotated {@link * javax.decorator.Decorator &#064;Decorator} with a delegate * injection point annotated {@link javax.decorator.Decorates * &#064;Decorates}.</p> * + * <h3>Decorated types</h3> + * + * <p>The set of decorated types + * of a decorator includes all interfaces implemented directly or + * indirectly by the bean class, except for {@link java.io.Serializable}. + * The decorator bean class and its superclasses are not decorated + * types of the decorator. The decorator class may be abstract.</p> + * + * <p>A decorator intercepts every method:</p> + * <ul> + * <li>declared by a decorated type of the decorator</li> + * <li>that is implemented by the bean class of the decorator.</li> + * </ul> + * + * <p>A decorator may be an abstract class, and is not required to + * implement every method of every decorated type.</p> + * + * <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>&lt;decorators&gt;</tt> element @@ -20,8 +46,6 @@ * ordering. Decorators which occur earlier in the list are called * first.</p> * - * <p>Decorators are called after interceptors.</p> - * */ package javax.decorator;