Weld SVN: r4311 - api/trunk/cdi/src/main/java/javax/decorator.
by weld-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-25 14:01:52 -0400 (Sun, 25 Oct 2009)
New Revision: 4311
Modified:
api/trunk/cdi/src/main/java/javax/decorator/package-info.java
Log:
link
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 18:01:36 UTC (rev 4310)
+++ api/trunk/cdi/src/main/java/javax/decorator/package-info.java 2009-10-25 18:01:52 UTC (rev 4311)
@@ -2,7 +2,8 @@
* <p>Annotations relating to decorators.</p>
*
* <p>A decorator implements one or more bean types and
- * intercepts business method invocations of beans which
+ * intercepts business method invocations of
+ * {@linkplain javax.enterprise.inject beans} which
* implement those bean types. These bean types are called
* decorated types.</p>
*
15 years, 2 months
Weld SVN: r4310 - api/trunk/cdi/src/main/java/javax/enterprise/context.
by weld-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-25 14:01:36 -0400 (Sun, 25 Oct 2009)
New Revision: 4310
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/context/package-info.java
Log:
fix injected ref validity
Modified: api/trunk/cdi/src/main/java/javax/enterprise/context/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/context/package-info.java 2009-10-25 18:01:10 UTC (rev 4309)
+++ api/trunk/cdi/src/main/java/javax/enterprise/context/package-info.java 2009-10-25 18:01:36 UTC (rev 4310)
@@ -1,10 +1,13 @@
/**
* <p>Annotations and interfaces relating to scopes and contexts.</p>
*
+ * <p>A scope type is a Java annotation annotated
+ * {@link javax.inject.Scope @Scope}.</p>
+ *
* <p>Associated with every scope type is a context object. The
* context object determines the lifecycle and visibility of
- * instances of all beans with that scope. In particular, the
- * context object defines:</p>
+ * instances of all {@linkplain javax.enterprise.inject beans} with
+ * that scope. In particular, the context object defines:</p>
*
* <ul>
* <li>When a new instance of any bean with that scope is created</li>
@@ -88,14 +91,14 @@
* {@link javax.enterprise.context.Dependent @Dependent} and
* {@link javax.inject.Singleton @Singleton} pseudo-scopes.</p>
*
- * <h3>Contextual reference validity</h3>
+ * <h3>Contextual and injected reference validity</h3>
*
- * <p>A reference to a bean obtained from the container via injection
- * or programmatic lookup is called a contextual reference. A contextual
- * reference for a bean with a normal scope refers to the current instance
- * of the bean. Contextual reference of a bean are valid only for a
- * certain period of time. The application should not invoke a method of
- * an invalid reference.</p>
+ * <p>A reference to a bean obtained from the container via {@linkplain
+ * javax.enterprise.inject.Instance programmatic lookup} is called a
+ * contextual reference. A contextual reference for a bean with a normal
+ * scope refers to the current instance of the bean. A contextual
+ * reference for a bean are valid only for a certain period of time. The
+ * application should not invoke a method of an invalid reference.</p>
*
* <p>The validity of a contextual reference depends upon whether the
* scope of the injected bean is a normal scope or a pseudo-scope:</p>
@@ -114,5 +117,21 @@
* that has already been destroyed, the behavior is undefined.</li>
* </ul>
*
+ * <p>A reference to a bean obtained from the container via {@linkplain
+ * javax.inject.Inject dependency injection} is a special kind of
+ * contextual reference, called an injected reference. Additional
+ * restrictions apply to the validity of an injected reference:</p>
+ *
+ * <ul>
+ * <li>A reference to a bean injected into a field, bean constructor or
+ * initializer method is only valid until the object into which it was
+ * injected is destroyed.</li>
+ * <li>A reference to a bean injected into a producer method is only
+ * valid until the producer method bean instance that is being produced
+ * is destroyed.<li>
+ * <li>A reference to a bean injected into a disposer method or observer
+ * method is only valid until the invocation of the method completes.</li>
+ * </ul>
+ *
*/
package javax.enterprise.context;
\ No newline at end of file
15 years, 2 months
Weld SVN: r4309 - api/trunk/cdi/src/main/java/javax/enterprise/event.
by weld-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-25 14:01:10 -0400 (Sun, 25 Oct 2009)
New Revision: 4309
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/event/package-info.java
Log:
improve preamble
Modified: api/trunk/cdi/src/main/java/javax/enterprise/event/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/event/package-info.java 2009-10-25 17:56:07 UTC (rev 4308)
+++ api/trunk/cdi/src/main/java/javax/enterprise/event/package-info.java 2009-10-25 18:01:10 UTC (rev 4309)
@@ -1,12 +1,13 @@
/**
* <p>Annotations and interfaces relating to events.<p>
*
- * <p>Beans may produce and consume events. This facility allows
- * beans to interact in a completely decoupled fashion, with no
- * compile-time dependency between the two beans. Most importantly,
- * it allows stateful beans in one architectural or physical tier
- * of the application to synchronize their internal state with
- * state changes that occur in a different tier.</p>
+ * <p>{@linkplain javax.enterprise.inject Beans} may produce and
+ * consume events. Events allows beans to interact in a completely
+ * decoupled fashion, with no compile-time dependency between the
+ * interacting beans. Most importantly, it allows stateful beans
+ * in one architectural tier of the application to synchronize
+ * their internal state with state changes that occur in a
+ * different tier.</p>
*
* <p>An event comprises:</p>
*
15 years, 2 months
Weld SVN: r4308 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits@lists.jboss.org
Author: dallen6
Date: 2009-10-25 13:56:07 -0400 (Sun, 25 Oct 2009)
New Revision: 4308
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java
Log:
Updated JavaDocs for some additional container lifecycle events.
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java 2009-10-25 17:16:47 UTC (rev 4307)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java 2009-10-25 17:56:07 UTC (rev 4308)
@@ -18,14 +18,75 @@
import javax.enterprise.context.spi.Context;
+/**
+ * <p>
+ * The event type of the second event fired by the container when it has fully
+ * completed the bean discovery process, validated that there are no definition
+ * errors relating to the discovered beans, and registered
+ * {@link javax.enterprise.inject.spi.Bean} and
+ * {@link javax.enterprise.inject.spi.ObserverMethod} objects for the discovered
+ * beans, but before detecting deployment problems.
+ * </p>
+ * <p>
+ * A portable extension may take advantage of this event to register
+ * {@linkplain javax.enterprise.inject.spi.Bean beans},
+ * {@linkplain javax.enterprise.inject.spi.Interceptor interceptors},
+ * {@linkplain javax.decorator.Decorator decorators},
+ * {@linkplain javax.enterprise.event.Observes observer methods} and
+ * {@linkplain javax.enterprise.context custom context} objects with the
+ * container.
+ * </p>
+ *
+ * <pre>
+ * void afterBeanDiscovery(@Observes AfterBeanDiscovery event, BeanManager manager) { ... }
+ * </pre>
+ * <p>
+ * If any observer method of the {@code AfterBeanDiscovery} event throws an
+ * exception, the exception is treated as a definition error by the container.
+ * </p>
+ *
+ * @author David Allen
+ */
public interface AfterBeanDiscovery
{
+ /**
+ * Registers a definition error with the container, causing the container to
+ * abort deployment after all observers have been notified.
+ *
+ * @param t The definition error as a {@link java.lang.Throwable}
+ */
public void addDefinitionError(Throwable t);
+ /**
+ * Fires an event of type {@link javax.enterprise.inject.spi.ProcessBean}
+ * containing the given {@link javax.enterprise.inject.spi.Bean} and then
+ * registers the {@link javax.enterprise.inject.spi.Bean} with the container,
+ * thereby making it available for injection into other beans. The given
+ * {@link javax.enterprise.inject.spi.Bean} may implement
+ * {@link javax.enterprise.inject.spi.Interceptor} or
+ * {@link javax.decorator.Decorator}.
+ *
+ * @param bean The bean to add to the deployment
+ */
public void addBean(Bean<?> bean);
+ /**
+ * Fires an event of type
+ * {@link javax.enterprise.inject.spi.ProcessObserverMethod} containing the
+ * given {@link javax.enterprise.inject.spi.ObserverMethod} and then
+ * registers the {@link javax.enterprise.inject.spi.ObserverMethod} with the
+ * container, thereby making it available for event notifications.
+ *
+ * @param observerMethod The custom observer method to add to the deployment
+ */
public void addObserverMethod(ObserverMethod<?, ?> observerMethod);
+ /**
+ * Registers a custom {@link javax.enterprise.context.spi.Context} object
+ * with the container.
+ *
+ * @param context The custom context to add to the deployment
+ */
public void addContext(Context context);
}
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java 2009-10-25 17:16:47 UTC (rev 4307)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java 2009-10-25 17:56:07 UTC (rev 4308)
@@ -16,9 +16,30 @@
*/
package javax.enterprise.inject.spi;
-public interface AfterDeploymentValidation
+/**
+ * <p>
+ * The event type of the third event fired by the container after it has
+ * validated that there are no deployment problems and before creating contexts
+ * or processing requests. If any observer method of the {@code
+ * AfterDeploymentValidation} event throws an exception, the exception is
+ * treated as a deployment problem by the container.
+ * </p>
+ * <p>
+ * No requests will be processed by the deployment until all observers of this
+ * event return.
+ * </p>
+ *
+ * @author David Allen
+ */
+public interface AfterDeploymentValidation
{
-
+
+ /**
+ * Registers a deployment problem with the container, causing the container
+ * to abort deployment after all observers have been notified.
+ *
+ * @param t The deployment problem as a {@link java.lang.Throwable}
+ */
public void addDeploymentProblem(Throwable t);
}
15 years, 2 months
Weld SVN: r4307 - api/trunk/cdi.
by weld-commits@lists.jboss.org
Author: dallen6
Date: 2009-10-25 13:16:47 -0400 (Sun, 25 Oct 2009)
New Revision: 4307
Modified:
api/trunk/cdi/pom.xml
Log:
Added javax.interceptor dependency for conceptual dependencies in JavaDoc.
Modified: api/trunk/cdi/pom.xml
===================================================================
--- api/trunk/cdi/pom.xml 2009-10-25 17:10:38 UTC (rev 4306)
+++ api/trunk/cdi/pom.xml 2009-10-25 17:16:47 UTC (rev 4307)
@@ -23,12 +23,18 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <optional>true</optional>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-api</artifactId>
+ <version>${interceptor.api.version}</version>
+ </dependency>
+
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
15 years, 2 months
Weld SVN: r4306 - api/trunk/cdi/src/main/java/javax/enterprise/context.
by weld-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-25 13:10:38 -0400 (Sun, 25 Oct 2009)
New Revision: 4306
Added:
api/trunk/cdi/src/main/java/javax/enterprise/context/package-info.java
Log:
package doc for context pkg
Added: api/trunk/cdi/src/main/java/javax/enterprise/context/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/context/package-info.java (rev 0)
+++ api/trunk/cdi/src/main/java/javax/enterprise/context/package-info.java 2009-10-25 17:10:38 UTC (rev 4306)
@@ -0,0 +1,118 @@
+/**
+ * <p>Annotations and interfaces relating to scopes and contexts.</p>
+ *
+ * <p>Associated with every scope type is a context object. The
+ * context object determines the lifecycle and visibility of
+ * instances of all beans with that scope. In particular, the
+ * context object defines:</p>
+ *
+ * <ul>
+ * <li>When a new instance of any bean with that scope is created</li>
+ * <li>When an existing instance of any bean with that scope is
+ * destroyed</li>
+ * <li>Which injected references refer to any instance of a bean
+ * with that scope</li>
+ * </ul>
+ *
+ * <p>The context implementation collaborates with the container via
+ * the {@link javax.enterprise.context.spi.Context Context} and
+ * {@link javax.enterprise.context.spi.Contextual Contextual}
+ * interfaces to create and destroy contextual instances.</p>
+ *
+ * <h3>Built-in scopes</h3>
+ *
+ * <p>The following built-in scopes are provided:
+ * {@link javax.enterprise.context.Dependent @Dependent},
+ * {@link javax.enterprise.context.RequestScoped @RequestScoped},
+ * {@link javax.enterprise.context.ConversationScoped @ConversationScoped},
+ * {@link javax.enterprise.context.SessionScoped @SessionScoped},
+ * {@link javax.enterprise.context.ApplicationScoped @ApplicationScoped},
+ * {@link javax.inject.Singleton @Singleton}.</p>
+ *
+ * <p>The container provides an implementation of the <tt>Context</tt>
+ * interface for each of the built-in scopes. The built-in request,
+ * session, and application contexts support servlet, web service
+ * and EJB invocations. The built-in conversation context supports
+ * JSF requests.</p>
+ *
+ * <p>For other kinds of invocations, a portable extension may define
+ * a custom context object for any or all of the built-in scopes. For
+ * example, a third-party web application framework might provide a
+ * conversation context object for the built-in conversation scope.</p>
+ *
+ * <p>For each of the built-in normal scopes, contexts propagate across
+ * any Java method call, including invocation of EJB local business methods.
+ * The built-in contexts do not propagate across remote method invocations
+ * or to asynchronous processes such as JMS message listeners or EJB timer
+ * service timeouts.</p>
+ *
+ * <h3>Normal scopes and pseudo-scopes</h3>
+ *
+ * <p>Most scopes are normal scopes. The context object for a normal
+ * scope type is a mapping from each contextual type with that scope
+ * to an instance of that contextual type. There may be no more than
+ * one mapped instance per contextual type per thread. The set of all
+ * mapped instances of contextual types with a certain scope for a
+ * certain thread is called the context for that scope associated with
+ * that thread.</p>
+ *
+ * <p>A context may be associated with one or more threads. A context
+ * with a certain scope is said to propagate from one point in the
+ * execution of the program to another when the set of mapped instances
+ * of contextual types with that scope is preserved.</p>
+ *
+ * <p>The context associated with the current thread is called the
+ * current context for the scope. The mapped instance of a contextual
+ * type associated with a current context is called the current instance
+ * of the contextual type.<p>
+ *
+ * <p>Contexts with normal scopes must obey the following rule:</p>
+ *
+ * <p><em>Suppose beans A, B and Z all have normal scopes. Suppose A
+ * has an injection point x, and B has an injection point y. Suppose
+ * further that both x and y resolve to bean Z according to the rules
+ * of typesafe resolution. If a is the current instance of A, and b
+ * is the current instance of B, then both a.x and b.y refer to the
+ * same instance of Z. This instance is the current instance of Z.</em></p>
+ *
+ * <p>Any scope that is not a normal scope is called a pseudo-scope.
+ * The concept of a current instance is not well-defined in the case
+ * of a pseudo-scope.</p>
+ *
+ * <p>All normal scopes must be explicitly declared
+ * {@link javax.enterprise.context.NormalScope @NormalScope}. All
+ * pseudo-scopes must be explicitly declared
+ * {@link javax.inject.Scope @Scope}.</p>
+ *
+ * <p>All built-in scopes are normal scopes, except for the
+ * {@link javax.enterprise.context.Dependent @Dependent} and
+ * {@link javax.inject.Singleton @Singleton} pseudo-scopes.</p>
+ *
+ * <h3>Contextual reference validity</h3>
+ *
+ * <p>A reference to a bean obtained from the container via injection
+ * or programmatic lookup is called a contextual reference. A contextual
+ * reference for a bean with a normal scope refers to the current instance
+ * of the bean. Contextual reference of a bean are valid only for a
+ * certain period of time. The application should not invoke a method of
+ * an invalid reference.</p>
+ *
+ * <p>The validity of a contextual reference depends upon whether the
+ * scope of the injected bean is a normal scope or a pseudo-scope:</p>
+ *
+ * <ul>
+ * <li>Any reference to a bean with a normal scope is valid as long as
+ * the application maintains a hard reference to it. However, it may
+ * only be invoked when the context associated with the normal scope is
+ * active. If it is invoked when the context is inactive, a
+ * {@link javax.enterprise.context.ContextNotActiveException} is thrown
+ * by the container.</li>
+ * <li>Any reference to a bean with a pseudo-scope is valid until the
+ * bean instance to which it refers is destroyed. It may be invoked
+ * even if the context associated with the pseudo-scope is not active.
+ * If the application invokes a method of a reference to an instance
+ * that has already been destroyed, the behavior is undefined.</li>
+ * </ul>
+ *
+ */
+package javax.enterprise.context;
\ No newline at end of file
15 years, 2 months
Weld SVN: r4305 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-25 12:25:41 -0400 (Sun, 25 Oct 2009)
New Revision: 4305
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
Log:
preamble
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-25 15:44:57 UTC (rev 4304)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-10-25 16:25:41 UTC (rev 4305)
@@ -3,6 +3,22 @@
* built-in qualifiers, and interfaces and classes relating
* to programmatic lookup.</p>
*
+ * <p>A bean is a source of contextual objects which define application
+ * state and/or logic. These objects are called contextual instances of
+ * the bean. The container creates and destroys these instances and
+ * associates them with the appropriate
+ * {@linkplain javax.enterprise.context.spi.Context context}. Contextual
+ * instances of a bean may be injected into other objects (including
+ * other bean instances) that execute in the same context, and may be
+ * used in Unified EL expressions that are evaluated in the same
+ * context.</p>
+ *
+ * <p>The lifecycle of contextual instances is managed by the container
+ * according to the
+ * {@linkplain javax.enterprise.context lifecycle context model}.
+ * Annotations define the lifecycle of the bean and its interactions
+ * with other beans.</p>
+ *
* <p>A bean comprises the following attributes:</p>
*
* <ul>
15 years, 2 months
Weld SVN: r4304 - api/trunk/cdi/src/main/java/javax/decorator.
by weld-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-25 11:44:57 -0400 (Sun, 25 Oct 2009)
New Revision: 4304
Modified:
api/trunk/cdi/src/main/java/javax/decorator/Decorates.java
api/trunk/cdi/src/main/java/javax/decorator/package-info.java
Log:
more reorg
Modified: api/trunk/cdi/src/main/java/javax/decorator/Decorates.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/decorator/Decorates.java 2009-10-25 15:29:20 UTC (rev 4303)
+++ api/trunk/cdi/src/main/java/javax/decorator/Decorates.java 2009-10-25 15:44:57 UTC (rev 4304)
@@ -49,21 +49,10 @@
* }
* </pre>
*
- * <p>All decorators have a delegate injection point. A delegate
- * injection point is an injection point of the bean class. The
- * type and qualifiers of the injection point are called the
- * delegate type and delegate qualifiers. The decorator applies to
- * any bean that is eligible for injection to the delegate injection
- * point.</p>
- *
* <p>A decorator must have exactly one delegate injection point. The
* delegate injection point must be an injected field, initializer
* method parameter or bean constructor method parameter.</p>
*
- * <p>The delegate type of a decorator must implement or extend every
- * decorated type. A decorator is not required to implement the delegate
- * type.</p>
- *
* <p>The container injects a delegate object to the delegate injection
* point. The delegate object implements the delegate type and delegates
* method invocations along the decorator stack. When the container calls
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:29:20 UTC (rev 4303)
+++ api/trunk/cdi/src/main/java/javax/decorator/package-info.java 2009-10-25 15:44:57 UTC (rev 4304)
@@ -6,19 +6,16 @@
* implement those bean types. These bean types are called
* decorated types.</p>
*
+ * <p>A decorator is a managed bean annotated {@link
+ * javax.decorator.Decorator @Decorator}.</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>
+ * for which interceptors are optimized. Decorators are called
+ * after interceptors.</p>
*
- * <p>Decorators are called after interceptors.</p>
- *
- * <p>A decorator is a managed bean annotated {@link
- * javax.decorator.Decorator @Decorator} with a delegate
- * injection point annotated {@link javax.decorator.Decorates
- * @Decorates}.</p>
- *
* <h3>Decorated types</h3>
*
* <p>The set of decorated types
@@ -35,7 +32,21 @@
*
* <p>A decorator may be an abstract class, and is not required to
* implement every method of every decorated type.</p>
- *
+ *
+ * <h3>Delegate injection points</h3>
+ *
+ * <p>All decorators have a
+ * {@linkplain javax.decorator.Decorates delegate injection point}.
+ * The decorator applies to any bean that is eligible for injection
+ * to the delegate injection point.</p>
+ *
+ * <p>A delegate injection point is an injection point of the bean
+ * class annotated {@link javax.decorator.Decorates @Decorates}.</p>
+ *
+ * <p>The type of the delegate injection point must implement or
+ * extend every decorated type. A decorator is not required to
+ * implement the type of the delegate injection point.</p>
+ *
* <h3>Enabled decorators</h3>
*
* <p>By default, a bean deployment archive has no enabled
@@ -46,6 +57,9 @@
* ordering. Decorators which occur earlier in the list are called
* first.</p>
*
+ * @see javax.decorator.Decorator
+ * @see javax.decorator.Decorates
+ *
*/
package javax.decorator;
15 years, 2 months
Weld SVN: r4303 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-25 11:29:20 -0400 (Sun, 25 Oct 2009)
New Revision: 4303
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-25 15:28:49 UTC (rev 4302)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-10-25 15:29:20 UTC (rev 4303)
@@ -64,9 +64,8 @@
* </pre>
*
* <p>A qualifier type is a Java annotation annotated
- * {@link javax.inject.Qualifier @Qualifier}.</p>
- *
- * <p>The qualifiers of a bean are declared by annotating the bean class
+ * {@link javax.inject.Qualifier @Qualifier}.
+ * The qualifiers of a bean are declared by annotating the bean class
* or producer method or field with the qualifier types.</p>
*
* <pre>
@@ -92,12 +91,11 @@
* instances of the bean are visible to instances of other beans.</p>
*
* <p>A scope type is a Java annotation annotated
- * {@link javax.inject.Scope @Scope}.</p>
+ * {@link javax.inject.Scope @Scope}.
+ * The scope of a bean is defined by annotating the bean class or producer
+ * method or field with a scope type or with a stereotype that declares a
+ * default scope.</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 { ... }
@@ -131,11 +129,11 @@
* EJB session or message-driven bean.</p>
*
* <p>An interceptor binding type is a Java annotation annotated
- * {@link javax.interceptor.InterceptorBinding @InterceptorBinding}.</p>
+ * {@link javax.interceptor.InterceptorBinding @InterceptorBinding}.
+ * An interceptor binding of a bean may be declared by annotating the bean
+ * class, or a method of the bean class, with an interceptor binding type
+ * or with a stereotype that declares the interceptor binding.</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:
@@ -242,7 +240,7 @@
* </ul>
*
* <p>A producer method or field is a method or field of a bean class annotated
- * {@link javax.enterprise..inject.Produces @Produces}.</p>
+ * {@link javax.enterprise.inject.Produces @Produces}.</p>
*
* <h4>Resources</h4>
*
15 years, 2 months
Weld SVN: r4302 - api/trunk/cdi/src/main/java/javax/enterprise/event.
by weld-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-25 11:28:49 -0400 (Sun, 25 Oct 2009)
New Revision: 4302
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/event/Observes.java
api/trunk/cdi/src/main/java/javax/enterprise/event/package-info.java
Log:
slight reorg
Modified: api/trunk/cdi/src/main/java/javax/enterprise/event/Observes.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/event/Observes.java 2009-10-25 15:18:41 UTC (rev 4301)
+++ api/trunk/cdi/src/main/java/javax/enterprise/event/Observes.java 2009-10-25 15:28:49 UTC (rev 4302)
@@ -32,17 +32,12 @@
* public void afterLogin(@Observes LoggedInEvent event) { ... }
* </pre>
*
- * <p>An observer method allows the application to receive and respond to event
- * notifications.</p>
- *
* <p>An observer method is a non-abstract
* method of a managed bean class or session bean class. An observer method may
* be either static or non-static. If the bean is a session bean, the observer
* method must be either a business method of the EJB or a static method of the
* bean class.</p>
*
- * <p>A bean may declare multiple observer methods.</p>
- *
* <p>Each observer method must have exactly one event parameter, of the same
* type as the event type it observes. Event qualifiers may be declared
* by annotating the event parameter. When searching for observer methods for
@@ -54,6 +49,8 @@
*
* <p>The event parameter type may contain a type variable or wildcard.</p>
*
+ * <p>A bean may declare multiple observer methods.</p>
+ *
* @author Gavin King
* @author Pete Muir
* @author David Allen
Modified: api/trunk/cdi/src/main/java/javax/enterprise/event/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/event/package-info.java 2009-10-25 15:18:41 UTC (rev 4301)
+++ api/trunk/cdi/src/main/java/javax/enterprise/event/package-info.java 2009-10-25 15:28:49 UTC (rev 4302)
@@ -35,7 +35,8 @@
* <h3>Observer methods</h3>
*
* <p>An {@linkplain javax.enterprise.event.Observes observer method}
- * acts as event consumer, observing events of a specific type, with a
+ * allows the application to receive and respond to event notifications.
+ * It acts as event consumer, observing events of a specific type, with a
* specific set of qualifiers. Any Java type may be observed by an
* observer method.</p>
*
15 years, 2 months