[weld-commits] Weld SVN: r4523 - api/trunk/cdi/src/main/java/javax/enterprise/inject.

[weld-commits at lists.jboss.org]

Author: gavin.king at jboss.com
Date: 2009-11-01 14:02:27 -0500 (Sun, 01 Nov 2009)
New Revision: 4523

Modified:
   api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java
   api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
Log:
sync with new spec lang on modularity

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-01 16:49:32 UTC (rev 4522)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Alternative.java	2009-11-01 19:02:27 UTC (rev 4523)
@@ -37,9 +37,8 @@
  * </pre>
  * 
  * <p>An alternative is never available for injection, 
- * lookup or EL resolution in a Java EE module or library 
- * that is not a bean deployment archive (a module or 
- * library with no <tt>beans.xml</tt> file).</p>
+ * lookup or EL resolution in a module that is not a bean 
+ * deployment archive.</p>
  * 
  * <p>Nor is an alternative available for injection, lookup 
  * or EL resolution in every bean deployment archive. An 

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-01 16:49:32 UTC (rev 4522)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java	2009-11-01 19:02:27 UTC (rev 4523)
@@ -346,16 +346,22 @@
  * 
  * <h3>Inter-module injection</h3>
  * 
- * <p>A bean is available for injection in a certain Java EE module or library if:</p>
+ * <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 <literal>beans.xml</literal> file in the
+ * metadata directory.</para>
+ *
+ * <p>A bean is available for injection in a certain module if:</p>
  * 
  * <ul>
  * <li>the bean is enabled,</li>
- * <li>the bean is either not an alternative, or the module or library is a bean 
- * deployment archive and the bean is a selected alternative of the bean deployment 
+ * <li>the bean is either not an alternative, or the module is a bean deployment 
+ * archive and the bean is a selected alternative of the bean deployment 
  * archive, and</li>
- * <li>the bean class is required to be accessible to classes in the module or 
- * library, according to the class loading requirements of the Java EE platform and 
- * Java Servlet specifications.</li>
+ * <li>the bean class is required to be accessible to classes in the module, 
+ * according to the class accessibility requirements of the module architecture.</li>
  * </ul>
  * 
  * <h3>Dependency injection</h3>
@@ -377,8 +383,8 @@
  * <p>A bean is eligible for injection into a given injection point if:</p>
  * 
  * <ul>
- * <li>it is available for injection in the Java EE module or library that contains 
- * the class that declares the injection point, and</li>
+ * <li>it is available for injection in the module that contains the 
+ * class that declares the injection point, and</li>
  * <li>it is assignable to the injection point.</li>
  * </ul>
  *