[webbeans-commits] Webbeans SVN: r3045 - tck/trunk/impl/src/main/resources.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Mon Jul 13 22:20:22 EDT 2009


Author: shane.bryzak at jboss.com
Date: 2009-07-13 22:20:21 -0400 (Mon, 13 Jul 2009)
New Revision: 3045

Modified:
   tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
updated sections 5, 6, 7, 8, 9 and 10 to latest version of spec

Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml	2009-07-13 03:41:42 UTC (rev 3044)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml	2009-07-14 02:20:21 UTC (rev 3045)
@@ -1,501 +1,501 @@
-<specification 
+<specification
     xmlns="http://jboss.com/products/webbeans/tck/audit"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://jboss.com/products/webbeans/tck/audit http://snapshots.jboss.org/maven2/org/hibernate/tck-utils-api/0.9-SNAPSHOT/tck-utils-api-0.9-20090220.134140-13-audit.xsd"
-    name="JSR-299: Java Contexts and Dependency Injection" 
+    name="JSR-299: Java Contexts and Dependency Injection"
     version="20090625">
 
   <section id="2" title="Concepts">
-  
+
     <assertion id="a">
       <text>A bean comprises of a (nonempty) set of bean types.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>A bean comprises of a (nonempty) set of bindings.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A bean comprises of a scope.</text>
     </assertion>
-        
+
     <assertion id="e">
       <text>A bean comprises of an optional bean EL name.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>A bean comprises of a set of interceptor bindings.</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>A bean comprises of a bean implementation.</text>
     </assertion>
   </section>
-  
+
   <section id="2.2" title="Bean types">
-  
+
     <assertion id="a">
       <text>A bean may have multiple bean types.</text>
     </assertion>
-       
+
     <assertion id="l">
       <text>All beans have the bean type java.lang.Object</text>
     </assertion>
-      
+
   </section>
-  
+
   <section id="2.2.1" title="Legal bean types">
     <assertion id="a">
       <text>A bean type may be an interface.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>A bean type may be a concrete class.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A bean type may be an abstract class.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>A bean type may be declared final.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>A bean type may have final methods.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>A bean type may be a parameterized type with actual type parameters.</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>A bean type may be a parameterized type with type variables.</text>
     </assertion>
-    
+
     <assertion id="i">
       <text>A bean type may be an array type.  Two array types are considered identical only if the element type is identical.</text>
     </assertion>
-    
+
     <assertion id="j">
       <text>A bean type may be a primitive type. Primitive types are considered to be identical to their corresponding wrapper types in java.lang.</text>
     </assertion>
-    
+
     <assertion id="k">
       <text>A bean type may be a raw type.</text>
     </assertion>
-    
+
     <assertion id="la">
       <text>A type variable is not a legal bean type</text>
     </assertion>
-    
+
     <assertion id="lb">
       <text>A parameterized type that contains a wildcard type parameter is not a legal bean type.</text>
-    </assertion>    
+    </assertion>
   </section>
-  
-  <section id="2.2.2" title="Typecasting between bean types">    
+
+  <section id="2.2.2" title="Typecasting between bean types">
     <assertion id="a">
       <text>A client of a bean may typecast its contextual reference to a bean to any bean type of the bean which is a Java interface.  However, the client may not in general typecast its contextual reference to an arbitrary concrete bean type of the bean.</text>
     </assertion>
   </section>
-  
+
   <section id="2.3" title="Bindings">
-  
+
   </section>
-    
+
   <section id="2.3.1" title="Built-in binding types">
 
     <assertion id="a0">
       <text>Every bean has the built-in binding |@Any|, even if it does not explicitly declare this binding, except for beans with the built-in binding |@New| defined in Section 3.11, "Beans with the @New binding".</text>
     </assertion>
-  
+
     <assertion id="aa">
       <text>If a bean does not explicitly declare a binding, the bean has exactly one additional binding, of type |@Current|.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The default binding is also assumed for any injection point that does not explicitly declare a binding.</text>
     </assertion>
   </section>
-  
+
   <section id="2.3.2" title="Defining new binding types">
     <assertion id="aa" testable="false">
       <text>A binding type is a Java annotation defined as |@Target({METHOD, FIELD, PARAMETER, TYPE})|~ and |@Retention(RUNTIME)|~.</text>
     </assertion>
-    
+
     <assertion id="ab" testable="false">
       <text>A binding type is a Java annotation defined as ~|@Target({METHOD, FIELD, PARAMETER, TYPE})| and ~|@Retention(RUNTIME)|.</text>
       <note>Non-runtime retention annotations are discarded by the compiler</note>
     </assertion>
-    
+
     <assertion id="ba">
       <text>A binding type may be declared by specifying the |@javax.enterprise.inject.BindingType| meta-annotation.</text>
     </assertion>
-        
+
     <assertion id="d" testable="false">
       <text>A binding type may define annotation members.</text>
       <note>This is true by default in the JLS</note>
     </assertion>
   </section>
-    
-  <section id="2.3.3" title="Declaring the bindings of a bean">  
+
+  <section id="2.3.3" title="Declaring the bindings of a bean">
     <assertion id="a">
       <text>A bean's bindings are declared by annotating the bean class with the binding types.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>A bean's bindings are declared by annotating the producer method with the binding types.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A bean's bindings are declared by annotating the producer field with the binding types.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>Any bean may declare multiple binding types.</text>
     </assertion>
   </section>
-  
-  <section id="2.3.4" title="Specifying bindings of an injected field">  
+
+  <section id="2.3.4" title="Specifying bindings of an injected field">
     <assertion id="a">
       <text>Binding types may be applied to injected fields (see Section 3.8, "Injected fields") to determine the bean that is injected, according to the rules of typesafe resolution defined in Section 5.3, "Typesafe resolution".</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>A bean may only be injected to an injection point if it has all the bindings of the injection point.</text>
     </assertion>
   </section>
-  
+
   <section id="2.3.5" title="Specifying bindings of a method or constructor parameter">
     <assertion id="a">
       <text>Binding types may be applied to parameters of producer methods (see Chapter 3, Bean implementation) to determine the bean instance that is passed when the method is called by the container.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>Binding types may be applied to parameters of initializer methods (see Chapter 3, Bean implementation) to determine the bean instance that is passed when the method is called by the container.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Binding types may be applied to parameters of disposal methods (see Chapter 3, Bean implementation) to determine the bean instance that is passed when the method is called by the container.</text>
     </assertion>
-    
+
     <assertion id="ca">
-      <text>Binding types may be applied to parameters of observer methods (see Chapter 3, Bean implementation) to determine the bean instance that is passed when the method is called by the container.</text>      
+      <text>Binding types may be applied to parameters of observer methods (see Chapter 3, Bean implementation) to determine the bean instance that is passed when the method is called by the container.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>Binding types may be applied to parameters of bean constructors (see Chapter 3, Bean implementation) to determine the bean instance that is passed when the method is called by the container.</text>
     </assertion>
   </section>
-  
-  <section id="2.4" title="Scopes">  
+
+  <section id="2.4" title="Scopes">
     <assertion id="a">
       <text>All beans have a scope.</text>
     </assertion>
-    
+
     <assertion id="b" testable="false">
       <text>A scope type is represented by an annotation type.</text>
       <note>This is a statement of intent</note>
     </assertion>
-    
+
     <assertion id="c">
       <text>The set of scope types is extensible.</text>
-    </assertion>    
+    </assertion>
   </section>
-  
+
   <section id="2.4.1" title="Built-in scope types">
     <assertion id="a" testable="false">
       <text>The |@RequestScoped|, |@ApplicationScoped| and |@SessionScoped| annotations defined in Section 6.7, "Context management for built-in scopes" represent the standard scopes defined by the Java Servlets specification</text>
       <note>This is a statement of intent</note>
     </assertion>
-    
+
     <assertion id="b" testable="false">
       <text>The |@ConversationScoped| annotation represents the conversation scope defined in Section 6.7.4, "Conversation context lifecycle".</text>
       <note>This is a statement of intent</note>
     </assertion>
-    
+
     <assertion id="c" testable="false">
       <text>The |@Dependent| pseudo-scope is for dependent objects, as defined in Section 6.4, "Dependent pseudo-scope"</text>
       <note>This is a statement of intent</note>
     </assertion>
   </section>
-  
+
   <section id="2.4.2" title="Defining new scope types">
     <assertion id="aa">
       <text>A scope type is a Java annotation defined as |@Target({TYPE, METHOD, FIELD})|~ and |@Retention(RUNTIME)|~.</text>
     </assertion>
-    
+
     <assertion id="ab" testable="false">
       <text>A scope type is a Java annotation defined as ~|@Target({TYPE, METHOD, FIELD})| and ~|@Retention(RUNTIME)|.</text>
       <note>Non-runtime retention annotations are discarded by the compiler</note>
     </assertion>
-    
+
     <assertion id="ba">
       <text>All scope types must specify the |@javax.enterprise.context.ScopeType| meta-annotation.</text>
     </assertion>
-        
+
   </section>
-  
+
   <section id="2.4.3" title="Declaring the bean scope">
     <assertion id="a">
       <text>The bean's scope is defined by annotating the bean class or producer method or field with a scope type.</text>
     </assertion>
-    
+
     <assertion id="ba">
       <text>A bean class or producer method or field may specify at most one scope type annotation. If a bean class or producer method or field specifies multiple scope type annotations, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A scope type may be specified using a stereotype annotation, as defined in Section 2.7.2, "Declaring the stereotypes for a bean"</text>
     </assertion>
   </section>
-  
+
   <section id="2.4.4" title="Default scope">
     <assertion id="aa">
       <text>When no scope is explicitly declared by annotating the bean class or producer method or field the scope of a bean is defaulted.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>If the bean does not declare any stereotype with a declared default scope, the default scope for the bean is |@Dependent|.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>If all stereotypes declared by the bean that have some declared default scope have the same default scope, then that scope is the default scope for the bean.</text>
     </assertion>
-    
+
     <assertion id="da">
       <text>If there are two different stereotypes declared by the bean that declare different default scopes, then there is no default scope and the bean must explicitly declare a scope. If it does not explicitly declare a scope, the container automatically
 detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If a bean explicitly declares a scope, any default scopes declared by stereotypes are ignored.</text>
     </assertion>
   </section>
-    
+
   <section id="2.5" title="Bean EL names">
-  
+
     <assertion id="a">
       <text>A valid bean EL name is a period-separated list of valid EL identifiers</text>
     </assertion>
   </section>
-  
+
   <section id="2.5.1" title="Declaring the bean EL name">
-  
+
     <assertion id="a">
       <text>To specify the EL name of a bean, the |@javax.enterprise.inject.Named| annotation is applied to the bean class.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>To specify the EL name of a bean, the |@javax.enterprise.inject.Named| annotation is applied to the producer method.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>To specify the EL name of a bean, the |@javax.enterprise.inject.Named| annotation is applied to the producer field.</text>
     </assertion>
-    
+
     <assertion id="d">
     <text>If the |@Named| annotation does not specify the value member, the default EL name is assumed.</text>
     </assertion>
   </section>
-  
+
   <section id="2.5.2" title="Default bean EL names">
-  
+
     <assertion id="a">
       <text>A default EL name must be assigned by the container when a bean class declares a |@Named| annotation and no EL name is explicitly specified by the value member.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>A default EL name must be assigned by the container when a producer method of a bean declares a |@Named| annotation and EL no name is explicitly specified by the value member.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A default EL name must be assigned by the container when a producer field of a bean declares a |@Named| annotation and no EL name is explicitly specified by the value member.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>A default EL name must be assigned by the container when a bean declares a stereotype that declares an empty |@Named| annotation, and the bean does not explicitly specify an EL name.</text>
     </assertion>
   </section>
-  
+
   <section id="2.5.3" title="Beans with no EL name">
-  
+
     <assertion id="a">
       <text>If |@Named| is not declared by the bean, nor by its stereotypes, a bean has no EL name.</text>
     </assertion>
   </section>
-  
+
   <section id="2.6" title="Policies">
     <assertion id="a">
       <text>A policy is a bean that must be explicitly declared in the in the beans.xml file if it should be available for lookup, injection or EL resolution.</text>
-    </assertion>    
+    </assertion>
   </section>
-  
+
   <section id="2.6.1" title="Declaring a policy">
     <assertion id="a">
       <text>A policy may be declared by annotating the bean class with the |@Policy| annotation.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>A policy may be declared by annotating a bean with a stereotype that declares a |@Policy| annotation.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A policy may be declared by annotating a producer method with a stereotype that declares a |@Policy| annotation.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>A policy may be declared by annotating a producer field with a stereotype that declares a |@Policy| annotation.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If a bean is a policy, all producer methods and fields of the bean are also policies.</text>
     </assertion>
   </section>
-  
+
   <section id="2.7" title="Stereotypes">
-  
+
     <assertion id="a">
       <text>A stereotype may specify that all beans with the stereotype have defaulted bean EL names.</text>
     </assertion>
-    
+
     <assertion id="aa">
       <text>A stereotype may specify that all beans with the stereotype are policies.</text>
     </assertion>
-    
+
     <assertion id="b" testable="false">
       <text>A bean may declare zero stereotypes.</text>
       <note>Not testable through API</note>
     </assertion>
-  
+
     <assertion id="c">
       <text>A bean may declare one stereotype.</text>
     </assertion>
-  
+
     <assertion id="d">
       <text>A bean may declare multiple stereotypes.</text>
     </assertion>
-  
+
   </section>
-  
+
   <section id="2.7.1" title="Defining new stereotypes">
     <assertion id="aa" testable="false">
       <text>A beans stereotype is a Java annotation defined as |@Target({TYPE, METHOD, FIELD})|~, |@Target(TYPE)|, |@Target(METHOD)|, |@Target(FIELD)| or |@Target({METHOD, FIELD})| and |@Retention(RUNTIME)|~.</text>
     </assertion>
-    
+
     <assertion id="ab" testable="false">
       <text>A beans stereotype is a Java annotation defined as ~|@Target({TYPE, METHOD, FIELD})|,~ |@Target(TYPE)|~, |@Target(METHOD)|, |@Target(FIELD)| or |@Target({METHOD, FIELD})| and |@Retention(RUNTIME)|~.</text>
     </assertion>
-    
+
     <assertion id="ac" testable="false">
       <text>A beans stereotype is a Java annotation defined as ~|@Target({TYPE, METHOD, FIELD})|, |@Target(TYPE)|, |@Target(METHOD)|, ~|@Target(FIELD)| ~or |@Target({METHOD, FIELD})| and |@Retention(RUNTIME)|~.</text>
     </assertion>
-    
+
     <assertion id="ad" testable="false">
       <text>A beans stereotype is a Java annotation defined as ~|@Target({TYPE, METHOD, FIELD})|, |@Target(TYPE)|, |@Target(METHOD)|, |@Target(FIELD)| or~ |@Target({METHOD, FIELD})|~ and |@Retention(RUNTIME)|~.</text>
     </assertion>
-    
+
     <assertion id="ae" testable="false">
       <text>A beans stereotype is a Java annotation defined as ~|@Target({TYPE, METHOD, FIELD})|, |@Target(TYPE)|, |@Target(METHOD)|, |@Target(FIELD)| or |@Target({METHOD, FIELD})| and~ |@Retention(RUNTIME)|.</text>
       <note>Non-runtime retention annotations are discarded by the compiler</note>
     </assertion>
-    
+
     <assertion id="b">
       <text>A stereotype may be declared by specifying the |@javax.enterprise.inject.stereotype.Stereotype| meta-annotation.</text>
     </assertion>
-    
+
     <assertion id="da">
       <text>A stereotype may not declare any binding annotation. If a stereotype declares a binding annotation, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
   </section>
-  
+
   <section id="2.7.1.1" title="Declaring the default scope for a stereotype">
     <assertion id="aa">
       <text>A stereotype may declare at most one scope. If a stereotype declares more than one scope, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the
 container".</text>
-    </assertion>    
+    </assertion>
   </section>
-  
+
   <section id="2.7.1.2" title="Specifying interceptor bindings for a stereotype">
     <assertion id="a">
       <text>A stereotype may declare zero interceptor bindings.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>A stereotype may declare one interceptor bindings.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A stereotype may declare multiple interceptor bindings.</text>
     </assertion>
   </section>
-  
+
   <section id="2.7.1.3" title="Declaring a @Named stereotype">
     <assertion id="aaa">
       <text>A stereotype may declare an empty |@Named| annotation, which specifies that every bean with the stereotype has a defaulted name when a name is not explicitly specified by the bean.</text>
     </assertion>
-    
+
     <assertion id="aab">
       <text>If a stereotype declares a non-empty |@Named| annotation, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
   </section>
-  
+
   <section id="2.7.1.4" title="Declaring a @Policy stereotype">
     <assertion id="a">
       <text>A stereotype may declare a @Policy annotation, which specifies that every bean with the stereotype is a policy.</text>
     </assertion>
   </section>
-   
+
   <section id="2.7.1.5" title="Stereotypes with additional stereotypes">
     <assertion id="a">
       <text>A stereotype may declare other stereotypes.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>Stereotype declarations are transitive - a stereotype declared by a second stereotype is inherited by all beans and other stereotypes that declare the second stereotype.</text>
     </assertion>
-    
+
     <assertion id="c" >
       <text>Stereotypes declared |@Target(TYPE)| may not be applied to stereotypes declared |@Target({TYPE, METHOD, FIELD})|.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>Stereotypes declared |@Target(TYPE)| may not be applied to stereotypes declared |@Target(METHOD)|.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>Stereotypes declared |@Target(TYPE)| may not be applied to stereotypes declared |@Target(FIELD)|.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>Stereotypes declared |@Target(TYPE)| may not be applied to stereotypes declared |@Target({METHOD, FIELD})|.</text>
     </assertion>
-    
+
   </section>
-  
+
   <section id="2.7.2" title="Declaring the stereotypes for a bean">
     <assertion id="a">
       <text>Stereotype annotations may be applied to a bean class.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>Stereotype annotations may be applied to a producer method.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Stereotype annotations may be applied to a producer field.</text>
     </assertion>
-        
+
     <assertion id="db">
     <text>The default scope declared by the stereotype may be overridden by the bean.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>Multiple stereotypes may be applied to the same bean.</text>
     </assertion>
   </section>
-  
+
   <section id="2.7.3" title="Built-in stereotypes">
     <assertion id="aa" testable="false">
       <text>The built-in stereotype |@javax.enterprise.inject.stereotype.Model| is intended for use with beans that define the model layer of an MVC web application architecture such as JSF.</text>
@@ -504,50 +504,50 @@
   </section>
 
   <section id="3" title="Programming model">
-  
+
   </section>
-      
-  <section id="3.1" title="Managed beans">    
+
+  <section id="3.1" title="Managed beans">
     <assertion id="f0">
-      <text>If the bean class of a managed bean is annotated with both the |@Interceptor| and |@Decorator| stereotypes, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>      
+      <text>If the bean class of a managed bean is annotated with both the |@Interceptor| and |@Decorator| stereotypes, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-       
+
     <assertion id="fa">
       <text>If a managed bean has a public field, it must have scope |@Dependent|.</text>
       <note>Check that a dependent scoped bean with a public field does work</note>
     </assertion>
-    
+
     <assertion id="fba">
       <text>If a managed bean with a public field declares any scope other than |@Dependent|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>If the managed bean class is a generic type, it must have scope |@Dependent|. If a managed bean with a parameterized bean class declares any scope other than |@Dependent|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the  container".</text>
-    </assertion>            
+    </assertion>
   </section>
-  
+
   <section id="3.1.1" title="Which Java classes are managed beans?">
     <assertion id="b">
       <text>A top-level Java class is not a managed bean if it is a non-static inner class.</text>
     </assertion>
-    
+
     <assertion id="ba">
-      <text>A top-level Java class that is a static inner class can be a managed bean.</text>      
+      <text>A top-level Java class that is a static inner class can be a managed bean.</text>
       <note>Implied as the inverse of assertion 3.1.1.b</note>
     </assertion>
-    
+
     <assertion id="ca">
       <text>A top-level Java class is not a managed bean if it is an abstract class, unless it is annotated |@Decorator|.</text>
     </assertion>
-    
+
     <assertion id="cb">
       <text>A top-level Java class is not a managed bean if it is an interface, unless it is annotated |@Decorator|.</text>
     </assertion>
-                      
+
     <assertion id="f">
       <text>A top-level Java class is not a managed bean if it is annotated with any of the EJB component-defining annotations</text>
     </assertion>
-        
+
     <assertion id="n">
       <text>A top-level Java class is not a managed bean if it is declared as an EJB bean class in |ejb-jar.xml|</text>
     </assertion>
@@ -555,143 +555,143 @@
     <assertion id="p">
       <text>A top-level Java class is only a managed bean if it has an appropriate constructor - a constructor with no parameters.</text>
     </assertion>
-    
+
     <assertion id="q">
       <text>A top-level Java class is only a managed bean if it has an appropriate constructor - a constructor annotated |@Initializer|.</text>
-    </assertion>    
+    </assertion>
   </section>
-  
+
   <section id="3.1.2" title="Bean types of a managed bean">
     <assertion id="a">
       <text>The set of bean types for a managed bean contains the bean class, every superclass and all interfaces it implements directly or indirectly.</text>
-    </assertion>  
+    </assertion>
   </section>
-  
+
   <section id="3.1.3" title="Declaring a managed bean">
     <assertion id="a">
       <text>A managed bean with a constructor that takes no parameters does not require any special annotations</text>
     </assertion>
-    
+
     <assertion id="ba">
       <text>A bean class may also specify a scope~, name, deployment type, stereotypes and/or bindings~</text>
     </assertion>
-    
+
     <assertion id="bb">
       <text>A bean class may also specify a ~scope,~ name~, deployment type, stereotypes and/or bindings~</text>
     </assertion>
-    
+
     <assertion id="bc">
       <text>A bean class may also specify a ~scope, name, ~deployment type~, stereotypes and/or bindings~</text>
     </assertion>
-    
+
     <assertion id="bd">
       <text>A bean class may also specify ~a scope, name, deployment type, ~stereotypes~ and/or bindings~</text>
     </assertion>
-    
+
     <assertion id="be">
       <text>A bean class may also specify ~a scope, name, deployment type, stereotypes and/or~ bindings</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A managed bean may extend another managed bean</text>
     </assertion>
   </section>
-    
-  <section id="3.1.4" title="Bean constructors">    
+
+  <section id="3.1.4" title="Bean constructors">
     <assertion id="a">
       <text>When the container instantiates a managed bean, it calls the bean constructor. The bean constructor is a constructor of the bean class</text>
-    </assertion>    
+    </assertion>
   </section>
-  
+
   <section id="3.1.4.1" title="Declaring a bean constructor">
     <assertion id="a">
       <text>The bean constructor may be identified by annotating the constructor |@Initializer|</text>
     </assertion>
-    
+
     <assertion id="ba">
       <text>If a managed bean does not explicitly declare a constructor using |@Initializer|, the constructor that accepts no parameters is the bean constructor</text>
       <note>Can't check implicit constructor</note>
     </assertion>
-    
+
     <assertion id="ca">
       <text>If a managed bean has more than one constructor annotated |@Initializer|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="da">
       <text>If a bean constructor has a parameter annotated |@Disposes|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-  
+
     <assertion id="ea">
       <text>If a bean constructor has a parameter annotated |@Observes|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-    </assertion>  
+    </assertion>
   </section>
-  
-  <section id="3.1.4.2" title="Bean constructor parameters">    
+
+  <section id="3.1.4.2" title="Bean constructor parameters">
     <assertion id="b">
       <text>A bean constructor may have any number of parameters.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>All parameters of a bean constructor are injection points.</text>
     </assertion>
   </section>
-  
+
   <section id="3.1.5" title="Specializing a managed bean">
     <assertion id="aa">
       <text>If a bean class of a managed bean X is annotated @Specializes, then the bean class of X must directly extend the bean class of another managed bean Y. Then X directly specializes Y, as defined in Section 4.3, "Specialization".</text>
     </assertion>
-    
+
     <assertion id="da">
       <text>If the bean class of X does not directly extend the bean class of another managed bean, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
   </section>
-  
+
   <section id="3.1.6" title="Default name for a managed bean">
     <assertion id="a">
       <text>The default name for a managed bean is the unqualified class name of the bean class, after converting the first character to lower case</text>
     </assertion>
   </section>
-  
+
   <section id="3.2" title="Session beans">
     <assertion id="aa" testable="false">
       <text>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.</text>
       <note>This is a reference to the EJB specification</note>
     </assertion>
-    
+
     <assertion id="b">
       <text>A stateless session bean must belong to the |@Dependent| pseudo-scope</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A singleton bean must belong to either the |@ApplicationScoped| scope or to the |@Dependent| pseudo-scope</text>
     </assertion>
-    
+
     <assertion id="da">
       <text>If a session bean specifies an illegal scope, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>A stateful session bean may have any scope.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>When a contextual instance of a session bean is obtained via the dependency injection service, the behavior of |SessionContext.getInvokedBusinessInterface()| is specific to the container implementation. Portable applications should not rely upon the value returned by this method.</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>If the bean class of a session bean is annotated |@Interceptor|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="h">
       <text>If the bean class of a session bean is annotated |@Decorator|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="i">
       <text>If the session bean class is a generic type, it must have scope |@Dependent|. If a session bean with a parameterized bean class declares any scope other than |@Dependent|, the container automatically detects the problem and treats it as a
 definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-    </assertion>    
+    </assertion>
   </section>
-  
+
   <section id="3.2.1" title="EJB remove methods of session beans">
     <assertion id="a">
       <text>If a session bean is a stateful session bean, and the scope is |@Dependent|, the application may call any EJB remove method of an instance of the session bean.</text>
@@ -700,479 +700,479 @@
     <assertion id="b">
       <text>If a session bean is a stateful session bean, and the scope is not |@Dependent|, the application may not directly call any EJB remove method of any instance of the session bean</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>If the application directly calls an EJB remove method of an instance of a session bean that is a stateful session bean and declares any scope other than |@Dependent|, an |UnsupportedOperationException| is thrown</text>
     </assertion>
-    
+
     <assertion id="da">
       <text>If the application directly calls an EJB remove method of an instance of a session bean that is a stateful session bean and has scope |@Dependent| then no parameters are passed to the method by the container.</text>
     </assertion>
-    
+
     <assertion id="dba">
       <text>If the application directly calls an EJB remove method of an instance of a session bean that is a stateful session bean and has scope |@Dependent| then the container ignores the instance instead of destroying it when |Contextual.destroy()| is called, as defined in Section 6.5, "Lifecycle of stateful session beans"</text>
-    </assertion>    
+    </assertion>
   </section>
-    
-  <section id="3.2.2" title="Bean types of a session bean">    
-    <assertion id="aa"> 
+
+  <section id="3.2.2" title="Bean types of a session bean">
+    <assertion id="aa">
       <text>The set of bean types for a session bean contains all local interfaces of the bean and their superinterfaces.</text>
     </assertion>
-    
+
     <assertion id="ba">
       <text>If the session bean has a bean class local view, the set of bean types contains the bean class and all superclasses.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>|java.lang.Object| is a bean type of every session bean</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>Remote interfaces are not included in the set of bean types</text>
     </assertion>
   </section>
-  
+
   <section id="3.2.3" title="Declaring a session bean">
     <assertion id="a">
       <text>A session bean does not require any special annotations</text>
     </assertion>
-    
+
     <assertion id="ba">
       <text>A bean class may also specify a scope~, name, deployment type, stereotypes and/or bindings~</text>
     </assertion>
-    
+
     <assertion id="bb">
       <text>A bean class may also specify a ~scope, ~name~, deployment type, stereotypes and/or bindings~</text>
     </assertion>
-    
+
     <assertion id="bc">
       <text>A bean class may also specify a ~scope, name, ~deployment type~, stereotypes and/or bindings~</text>
     </assertion>
-    
+
     <assertion id="bd">
       <text>A bean class may also specify a ~scope, name, deployment type, ~stereotypes ~and/or bindings~</text>
     </assertion>
-    
+
     <assertion id="be">
       <text>A bean class may also specify a ~scope, name, deployment type, stereotypes and/or~ bindings~</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A session bean class may extend another bean class</text>
     </assertion>
   </section>
-  
-  <section id="3.2.4" title="Specializing a session bean">  
+
+  <section id="3.2.4" title="Specializing a session bean">
     <assertion id="aa">
       <text>If a bean class of a session bean X is annotated |@Specializes|, then the bean class of X must directly extend the bean class of another session bean Y. Then X directly specializes Y, as defined in Section 4.3 "Specialization".</text>
     </assertion>
-    
+
     <assertion id="da">
       <text>If the bean class of X does not directly extend the bean class of another session bean, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-    </assertion>    
+    </assertion>
   </section>
-  
+
   <section id="3.2.5" title="Default name for a session bean">
     <assertion id="a">
       <text>The default name for a managed bean is the unqualified class name of the session bean class, after converting the first character to lower case.</text>
     </assertion>
   </section>
-   
+
   <section id="3.3" title="Producer methods">
     <assertion id="aa">
       <text>A producer method must be a non-abstract method of a managed bean class or session bean class.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>A producer method may be static.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A producer method may be non-static.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>If the bean is a session bean, the producer method must be either a business method of the EJB or a static method of the bean class</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If a producer method sometimes returns a null value, then the producer method must have scope |@Dependent|.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>If a producer method returns a null value at runtime, and the producer method declares scope other than |@Dependent|, an |IllegalProductException| is thrown by the container. This restriction allows the container to use a client proxy, as defined in Section 5.5, "Client proxies".</text>
     </assertion>
-    
+
     <assertion id="ga">
       <text>If the producer method return type is a parameterized type, it must specify an actual type parameter or type variable for each type parameter.</text>
     </assertion>
-    
+
     <assertion id="ha">
       <text>If a producer method return type contains a wildcard type parameter the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="ia">
       <text>If the producer method return type is a parameterized type with a type variable, it must have scope |@Dependent|. If a producer method with a parameterized return type with a type variable declares any scope other than |@Dependent|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="ib">
       <text>If a producer method return type is a type variable the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="j" testable="false">
       <text>The application may call producer methods directly. However, if the application calls a producer method directly, no parameters will be passed to the producer method by the container; the returned object is not bound to any context; and its lifecycle is not managed by the container.</text>
     </assertion>
-    
+
     <assertion id="k">
       <text>A bean may declare multiple producer methods.</text>
     </assertion>
   </section>
-  
-  <section id="3.3.1" title="Bean types of a producer method">  
+
+  <section id="3.3.1" title="Bean types of a producer method">
     <assertion id="a">
       <text>If the return type of a producer method is an interface, the set of bean types contains the return type, all interfaces it extends directly or indirectly and |java.lang.Object|</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>If a return type of a producer method is primitive or is a Java array type, the set of bean types contains exactly two types: the method return type and |java.lang.Object|.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>If the return type of a producer method is a class, the set of bean types contains the return type, every superclass and all interfaces it implements directly or indirectly.</text>
     </assertion>
   </section>
-  
+
   <section id="3.3.2" title="Declaring a producer method">
-  
+
     <assertion id="a">
       <text>A producer method may be declared by annotating a method with the |@javax.enterprise.inject.Produces| annotation</text>
     </assertion>
-    
+
     <assertion id="ba">
       <text>A producer method may specify a scope</text>
     </assertion>
-    
+
     <assertion id="bb">
       <text>A producer method may specify a name</text>
     </assertion>
-        
+
     <assertion id="bd">
       <text>A producer method may specify stereotypes</text>
     </assertion>
-    
+
     <assertion id="be">
       <text>A producer method may specify a binding type</text>
     </assertion>
-    
+
     <assertion id="ca">
       <text>If a producer method is annotated |@Initializer|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="da">
       <text>If a producer method has a parameter annotated |@Disposes|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="ea">
       <text>If a producer method has a parameter annotated |@Observes|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="fa">
       <text>If a non-static method of a session bean class is annotated |@Produces|, and the method is not a business method of the session bean, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>Interceptors and decorators may not declare producer methods. If an interceptor or decorator has a method annotated |@Produces|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
   </section>
-  
-  <section id="3.3.3" title="Producer method parameters">    
+
+  <section id="3.3.3" title="Producer method parameters">
     <assertion id="b">
       <text>A producer method may have any number of parameters.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>All producer method parameters are injection points.</text>
     </assertion>
   </section>
-  
+
   <section id="3.3.4" title="Specializing a producer method">
     <assertion id="aa">
       <text>If a producer method X is annotated |@Specializes|, then it must be non-static and directly override another producer method Y. Then X directly specializes Y, as defined in Section 4.3 "Specialization".</text>
     </assertion>
-    
+
     <assertion id="ba">
       <text>If a producer method is static, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4 "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="ca">
       <text>If a producer method does not directly override another producer method, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4 "Problems detected automatically by the container".</text>
     </assertion>
   </section>
-  
-  <section id="3.3.5" title="Disposer methods">    
+
+  <section id="3.3.5" title="Disposer methods">
     <assertion id="a">
       <text>A disposer method must be a method of a managed bean class or session bean class.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>A disposer method may be static.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A disposer method may be non-static.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>If the bean is a session bean, the disposer method must be a business method of the EJB or a static method of the bean class.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>A bean may declare multiple disposer methods.</text>
     </assertion>
   </section>
-  
-  <section id="3.3.6" title="Disposed parameter of a disposer method">    
+
+  <section id="3.3.6" title="Disposed parameter of a disposer method">
     <assertion id="a">
       <text>Each disposer method must have exactly one disposed parameter, of the same type as the corresponding producer method return type.</text>
     </assertion>
-    
+
     <assertion id="ba">
       <text>When searching for disposer methods for a producer method, the container considers the type and bindings of the disposed parameter. If a disposed parameter resolves to a producer method declared by the same bean class, according to the rules of typesafe resolution defined in Section 5.3 "Typesafe resolution", the container must call this method when destroying an instance returned by that producer method.</text>
     </assertion>
-    
+
     <assertion id="da">
       <text>A disposer method may resolve to multiple producer methods declared by the bean class, in which case the container must call it when destroying any instance returned by any of these producer methods.</text>
     </assertion>
   </section>
-  
-  <section id="3.3.7" title="Declaring a disposer method">    
+
+  <section id="3.3.7" title="Declaring a disposer method">
     <assertion id="a">
       <text>A disposer method may be declared by annotating a parameter |@javax.enterprise.inject.Disposes|. That parameter is the disposed parameter</text>
     </assertion>
-    
+
     <assertion id="b0">
       <text>Bindings may be declared by annotating the disposed parameter.</text>
     </assertion>
-    
+
     <assertion id="ba">
   <text>If a method has more than one parameter annotated |@Disposes|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4 "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="ca">
       <text>If a disposal method is annotated |@Produces|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4 "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="da">
       <text>If a disposal method is annotated |@Initializer|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4 "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="ea">
       <text>If a disposal method has a parameter annotated |@Observes|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4 "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="fa">
       <text>If a non-static method of a session bean class has a parameter annotated |@Disposes|, and the method is not a business method of the session bean, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4 "Problems detected automatically by the container".</text>
     </assertion>
   </section>
-  
-  <section id="3.3.8" title="Disposer method parameters">  
+
+  <section id="3.3.8" title="Disposer method parameters">
     <assertion id="a">
       <text>In addition to the disposed parameter, a disposer method may declare additional parameters, which may also specify bindings. These additional parameters are injection points.</text>
     </assertion>
   </section>
-  
-  <section id="3.3.9" title="Disposer method resolution">  
+
+  <section id="3.3.9" title="Disposer method resolution">
     <assertion id="aa">
       <text>When searching for disposer methods for a producer method, the container searches for disposer methods which are declared by the same bean class as the producer method, and for which the disposed parameter resolves to the producer method, according to the typesafe resolution algorithm defined in Section 5.3, "Typesafe resolution".</text>
     </assertion>
-    
+
     <assertion id="ba">
       <text>If there are multiple disposer methods for a single producer method, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="ca">
       <text>If the disposed parameter of a disposer method does not resolve to any producer method declared by the bean class, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
   </section>
-  
-  <section id="3.3.10" title="Default name for a producer method">  
+
+  <section id="3.3.10" title="Default name for a producer method">
     <assertion id="a">
       <text>The default name for a producer method is the method name, unless the method follows the JavaBeans property getter naming convention, in which case the default name is the JavaBeans property name</text>
     </assertion>
   </section>
-  
-  <section id="3.4" title="Producer fields">  
+
+  <section id="3.4" title="Producer fields">
     <assertion id="a">
       <text>A producer field must be a field of a managed bean class or session bean class</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>A producer field may be static.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A producer field may be non-static.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>If a producer field sometimes contains a null value when accessed, then the producer field must have scope |@Dependent|</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If a producer method contains a null value at runtime, and the producer field declares any other scope, an |IllegalProductException| is thrown by the container. This restriction allows the container to use a client proxy, as defined in Section 5.5, "Client proxies"</text>
     </assertion>
-    
+
     <assertion id="fa">
       <text>If the producer field type is a parameterized type, it must specify an actual type parameter or type variable for each type parameter</text>
     </assertion>
-    
+
     <assertion id="ga">
       <text>If a producer field type contains a wildcard type parameter the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="gb">
       <text>If the producer field type is a parameterized type with a type variable, it must have scope |@Dependent|. If a producer field with a parameterized type with a type variable declares any scope other than |@Dependent|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="ha">
       <text>If a producer field type is a type variable the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="i" testable="false">
       <text>The application may access producer fields directly. However, if the application accesses a producer field directly, the returned object is not bound to any context; and its lifecycle is not managed by the container</text>
       <note>This is a statement of intent</note>
     </assertion>
-    
+
     <assertion id="j">
       <text>A bean may declare multiple producer fields</text>
     </assertion>
   </section>
-  
-  <section id="3.4.1" title="Bean types of a producer field">    
+
+  <section id="3.4.1" title="Bean types of a producer field">
     <assertion id="a">
       <text>The bean types of a producer field depend upon the field type.  If the field type is an interface, the set of bean types contains the field type, all interfaces it extends directly or indirectly and java.lang.Object</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The bean types of a producer field depend upon the field type.  If a field type is primitive or is a Java array type, the set of bean types contains exactly two types: the field type and java.lang.Object</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>The bean types of a producer field depend upon the field type.  If the field type is a class, the set of bean types contains the field type, every superclass and all interfaces it implements directly or indirectly</text>
     </assertion>
   </section>
-  
-  <section id="3.4.2" title="Declaring a producer field">  
+
+  <section id="3.4.2" title="Declaring a producer field">
     <assertion id="a">
       <text>A producer field may be declared by annotating a field with the |@javax.enterprise.inject.Produces| annotation</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>A producer field may specify a scope.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A producer field may specify a name.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>A producer field may specify stereotypes.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>A producer field may specify bindings.</text>
     </assertion>
   </section>
-  
+
   <section id="3.4.3" title="Default name for a producer field">
     <assertion id="a">
       <text>The default name for a producer field is the field name</text>
     </assertion>
   </section>
-  
-  <section id="3.5" title="Resources">    
+
+  <section id="3.5" title="Resources">
     <assertion id="ka">
       <text>The container is not required to support resources with scope other than |@Dependent|.</text>
     </assertion>
-    
+
     <assertion id="l">
       <text>A resource may not declare a bean EL name</text>
     </assertion>
   </section>
-  
-  <section id="3.5.1" title="Declaring a resource">    
+
+  <section id="3.5.1" title="Declaring a resource">
     <assertion id="aa">
-      <text>A resource may be declared by specifying a Java EE component environment injection annotation as part of a producer field declaration.</text>      
+      <text>A resource may be declared by specifying a Java EE component environment injection annotation as part of a producer field declaration.</text>
     </assertion>
-    
+
     <assertion id="bb">
-      <text>For a Java EE resource, |@Resource| must be specified.</text> 
+      <text>For a Java EE resource, |@Resource| must be specified.</text>
     </assertion>
-    
+
     <assertion id="cc">
       <text>For a persistence context, |@PersistenceContext| must be specified.</text>
     </assertion>
-    
+
     <assertion id="dd">
       <text>For a persistence unit, |@PersistenceUnit| must be specified.</text>
     </assertion>
-    
+
     <assertion id="ee">
       <text>For a remote EJB, |@EJB| must be specified.</text>
     </assertion>
-    
+
     <assertion id="ff">
       <text>For a web service, |@WebServiceRef| must be specified.</text>
     </assertion>
-    
+
     <assertion id="gg">
       <text>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.</text>
     </assertion>
-    
+
     <assertion id="hh">
       <text>The bean type, bindings and deployment type of the resource are determined by the producer field declaration.</text>
     </assertion>
-  
+
   </section>
-  
+
   <section id="3.5.2" title="Bean types of a resource">
     <assertion id="a">
       <text>The bean types of a resource are the declared type of the field declaration, together with |java.lang.Object|.</text>
     </assertion>
   </section>
-  
+
   <section id="3.6" title="Additional built-in beans">
     <assertion id="a">
       <text>A Java EE or embeddable EJB container must provide a bean with binding |@Current| and bean type |javax.transaction.UserTransaction|, allowing injection of a reference to the JTA |UserTransaction|.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>A Java EE or embeddable EJB container must provide a bean with binding |@Current| and bean type |javax.security.Principal|, allowing injection of a |Principal| representing the current caller identity.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A Java EE or embeddable EJB container must provide a bean with binding |@Current| and bean type |javax.validation.ValidationFactory|, allowing injection of the default Bean Validation |ValidationFactory|.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>A Java EE or embeddable EJB container must provide a bean with binding |@Current| and bean type |javax.validation.Validator|, allowing injection of a |Validator| for the default Bean Validation |ValidationFactory|.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If a Java EE component class has an injection point of type |UserTransaction| and binding |@Current|, and may not validly make use of the JTA |UserTransaction| according to the Java EE platform specification, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-  </section>  
-  
-  <section id="3.7" title="Injected fields">  
+  </section>
+
+  <section id="3.7" title="Injected fields">
     <assertion id="aa">
       <text>An injected field is a non-static~, non-final~ field of a bean class.</text>
     </assertion>
-    
+
     <assertion id="ab">
       <text>An injected field is a ~non-static, ~non-final field of a bean class.</text>
     </assertion>
-    
+
     <assertion id="ba">
       <text>An injected field is a non-static, ~non-final~ field of any Java EE component class supporting injection.</text>
     </assertion>
@@ -1180,1440 +1180,1410 @@
     <assertion id="bb">
       <text>An injected field is a ~non-static~, non-final field of any Java EE component class supporting injection.</text>
     </assertion>
-        
+
     <assertion id="ea">
       <text>Injected fields are initialized by the container before initializer methods are called, and before the |@PostConstruct| callback occurs.</text>
     </assertion>
-        
+
     <assertion id="h">
       <text>If a field is a producer field, it is not an injected field</text>
-    </assertion>    
+    </assertion>
   </section>
-  
-  <section id="3.7.1" title="Declaring an injected field">    
+
+  <section id="3.7.1" title="Declaring an injected field">
     <assertion id="a">
       <text>An injected field may be declared by annotating the field with any binding type.</text>
     </assertion>
   </section>
-  
+
   <section id="3.8" title="Initializer methods">
     <assertion id="aa">
       <text>An initializer method is a non-static method of a bean class.</text>
     </assertion>
-    
+
     <assertion id="ca">
-      <text>An initializer method is a non-static method of any Java EE component class supporting injection.</text>  
+      <text>An initializer method is a non-static method of any Java EE component class supporting injection.</text>
     </assertion>
-   
+
     <assertion id="e">
       <text>If the bean is a session bean, the initializer method is not required to be a business method of the session bean</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>A bean class may declare multiple (or zero) initializer methods</text>
     </assertion>
-    
+
     <assertion id="ea">
       <text>Initializer methods are called by the container after injected fields are initialized, and before the |@PostConstruct| callback occurs.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>Method interceptors are never called when the container calls an initializer method</text>
     </assertion>
-    
+
     <assertion id="h" testable="false">
       <text>The application may call initializer methods directly, but then no parameters will be passed to the method by the container</text>
       <note>This is a statement of intent</note>
     </assertion>
   </section>
-    
+
   <section id="3.8.1" title="Declaring an initializer method">
     <assertion id="a">
       <text>An initializer method may be declared by annotating the method |@javax.enterprise.inject.Initializer|</text>
     </assertion>
-    
+
     <assertion id="ab">
       <text>If a generic method of a bean is annotated |@Initializer|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="ba">
       <text>If an initializer method is annotated |@Produces|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="ca">
       <text>If an initializer method has a parameter annotated |@Disposes|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="da">
       <text>If an initializer method has a parameter annotated |@Observes|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
   </section>
-  
+
   <section id="3.8.2" title="Initializer method parameters">
     <assertion id="aa">
       <text>An initializer method may have any number of parameters.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>All initializer method parameters are injection points.</text>
     </assertion>
   </section>
-  
+
   <section id="3.9" title="The default binding at injection points">
     <assertion id="a">
       <text>If an injection point declares no binding, the default binding |@Current| is assumed.</text>
     </assertion>
   </section>
-  
+
   <section id="3.10" title="Beans with the @New binding">
     <assertion id="d">
       <text>For each managed bean, a second bean exists which has the same bean class.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>For each managed bean, a second bean exists which has the same bean types.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>For each managed bean, a second bean exists which has the same bean constructor.</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>For each managed bean, a second bean exists which has the same initializer methods.</text>
     </assertion>
-    
+
     <assertion id="h">
       <text>For each managed bean, a second bean exists which has the same injected fields.</text>
     </assertion>
-    
+
     <assertion id="i">
       <text>For each managed bean, a second bean exists which has the same interceptor bindings.</text>
     </assertion>
-    
+
     <assertion id="j">
       <text>For each session bean, a second bean exists which has the same bean class.</text>
     </assertion>
-    
+
     <assertion id="k">
       <text>For each session bean, a second bean exists which has the same bean types.</text>
     </assertion>
-    
+
     <assertion id="l">
       <text>For each session bean, a second bean exists which has the same bean constructor.</text>
     </assertion>
-    
+
     <assertion id="m">
       <text>For each session bean, a second bean exists which has the same initializer methods.</text>
     </assertion>
-    
+
     <assertion id="n">
       <text>For each session bean, a second bean exists which has the same injected fields.</text>
     </assertion>
-    
+
     <assertion id="o">
       <text>For each session bean, a second bean exists which has the same interceptor bindings.</text>
     </assertion>
-    
+
     <assertion id="p">
       <text>This second bean has scope |@Dependent|.</text>
     </assertion>
-        
+
     <assertion id="r">
       <text>This second bean has exactly one binding: |@javax.enterprise.inject.New(X.class)| where |x| is the bean class.</text>
     </assertion>
-    
+
     <assertion id="s">
       <text>This second bean has no bean EL name.</text>
     </assertion>
-    
+
     <assertion id="t">
       <text>This second bean has no stereotypes.</text>
     </assertion>
-    
+
     <assertion id="u">
       <text>This second bean has no observer methods.</text>
     </assertion>
-    
+
     <assertion id="v">
       <text>This second bean has no producer methods.</text>
     </assertion>
-    
+
     <assertion id="w">
       <text>This second bean has no producer fields.</text>
     </assertion>
-    
+
     <assertion id="x">
       <text>This second bean has no disposer methods.</text>
     </assertion>
-    
+
     <assertion id="xb">
       <text>This second bean is not a policy.</text>
     </assertion>
-    
+
     <assertion id="z">
       <text>When the binding |@New| is specified at an injection point and no value member is explicitly specified, the container defaults the value to the declared type of the injection point.</text>
     </assertion>
   </section>
-  
+
   <section id="4" title="Inheritance and specialization">
 
   </section>
-  
-  <section id="4.1" title="Inheritance of type-level metadata">              
+
+  <section id="4.1" title="Inheritance of type-level metadata">
     <assertion id="aa">
       <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an annotation of type Z.</text>
-    </assertion>    
-    
+    </assertion>
+
     <assertion id="ab">
       <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an annotation of type Z.</text>
-    </assertion>     
-    
+    </assertion>
+
     <assertion id="ad">
       <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an annotation of type Z.</text>
-    </assertion>    
-    
+    </assertion>
+
     <assertion id="ae">
       <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an annotation of type Z.</text>
-    </assertion>            
-    
+    </assertion>
+
     <assertion id="ag">
       <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares an annotation of type Z.</text>
-    </assertion>    
-    
+    </assertion>
+
     <assertion id="ah">
       <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares an annotation of type Z.</text>
-    </assertion>          
-    
+    </assertion>
+
     <assertion id="aj">
       <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares an annotation of type Z.</text>
-    </assertion>    
-    
+    </assertion>
+
     <assertion id="ak">
       <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares an annotation of type Z.</text>
-    </assertion>     
+    </assertion>
 
     <assertion id="ba">
       <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare a scope type.</text>
     </assertion>
-    
+
     <assertion id="bb">
       <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare a scope type.</text>
     </assertion>
-    
+
     <assertion id="bc">
       <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares a scope type.</text>
     </assertion>
-    
+
     <assertion id="bd">
       <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares a scope type.</text>
     </assertion>
-        
+
     <assertion id="hhh">
       <text>A scope type explicitly declared by X and inherited by Y from X takes precedence over default scopes of stereotypes declared or inherited by Y.</text>
     </assertion>
-        
+
     <assertion id="i" testable="false">
       <text>For annotations defined by the bean specification, all built-in _scope types_ are declared |@Inherited|</text>
       <note>sigtest</note>
     </assertion>
-    
+
     <assertion id="j" testable="false">
       <text>For annotations defined by the bean specification, all built-in _stereotypes_ are declared |@Inherited|</text>
       <note>sigtest</note>
     </assertion>
-    
+
     <assertion id="k" testable="false">
       <text>For annotations defined by the bean specification, _no built-in binding type is declared |@Inherited|_</text>
       <note>sigtest</note>
     </assertion>
-    
+
     <assertion id="m" testable="false">
       <text>The |@Named| annotation is not declared |@Inherited| and bean EL names are not inherited unless specialization is used</text>
       <note>sigtest</note>
     </assertion>
-    
+
   </section>
-  
+
   <section id="4.2" title="Inheritance of member-level metadata">
-    
+
     <assertion id="aa">
       <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X declares an injected field x then Y inherits x.</text>
     </assertion>
-    
+
     <assertion id="ab">
       <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X declares an injected field x then Y inherits x.</text>
     </assertion>
-    
+
     <assertion id="ac">
       <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X declares an injected field x then Y inherits x.</text>
     </assertion>
-    
+
     <assertion id="ad">
       <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X declares an injected field x then Y inherits x.</text>
     </assertion>
-        
+
     <assertion id="baa">
       <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X declares a _|@PostConstruct|_ method x() then Y inherits x() if and only if Y does not override the method x()</text>
     </assertion>
-    
+
     <assertion id="bab">
       <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X declares a _|@PostConstruct|_ method x() then Y inherits x() if and only if Y does not override the method x()</text>
     </assertion>
-    
+
     <assertion id="bac">
       <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X declares a _|@PostConstruct|_ method x() then Y inherits x() if and only if neither Y nor any intermediate class that is a subclass of X and a superclass of Y overrides the method x()</text>
     </assertion>
-    
+
     <assertion id="bad">
       <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X declares a _|@PostConstruct|_ method x() then Y inherits x() if and only if neither Y nor any intermediate class that is a subclass of X and a superclass of Y overrides the method x()</text>
     </assertion>
-        
+
     <assertion id="bba">
       <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X declares a _|@PreDestroy|_ method x() then Y inherits x() if and only if Y does not override the method x()</text>
     </assertion>
-    
+
     <assertion id="bbb">
       <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X declares a _|@PreDestroy|_ method x() then Y inherits x() if and only if Y does not override the method x()</text>
     </assertion>
-    
+
     <assertion id="bbc">
       <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X declares a _|@PreDestroy|_ method x() then Y inherits x() if and only if neither Y nor any intermediate class that is a subclass of X and a superclass of Y overrides the method x()</text>
     </assertion>
-    
+
     <assertion id="bbd">
       <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X declares a _|@PreDestroy|_ method x() then Y inherits x() if and only if neither Y nor any intermediate class that is a subclass of X and a superclass of Y overrides the method x()</text>
     </assertion>
-    
+
     <assertion id="da">
       <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X declares a _non-static producer method_ x() then Y does not inherit this method unless Y is explicitly declared to specialize X</text>
     </assertion>
-    
+
     <assertion id="db">
       <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X declares a _non-static disposer method_ x() then Y does not inherit this method unless Y is explicitly declared to specialize X</text>
     </assertion>
-    
+
     <assertion id="dc">
       <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X declares a _non-static observer method_ x() then Y does not inherit this method unless Y is explicitly declared to specialize X</text>
     </assertion>
-    
+
     <assertion id="dd">
       <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X declares a _non-static producer method_ x() then Y does not inherit this method unless Y is explicitly declared to specialize X</text>
     </assertion>
-    
+
     <assertion id="de">
       <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X declares a _non-static disposer method_ x() then Y does not inherit this method unless Y is explicitly declared to specialize X</text>
     </assertion>
-    
+
     <assertion id="df">
       <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X declares a _non-static observer method_ x() then Y does not inherit this method unless Y is explicitly declared to specialize X</text>
     </assertion>
-    
+
     <assertion id="dg">
       <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X declares a _non-static producer method_ x() then Y does not inherit this method unless Y is explicitly declared to specialize X</text>
     </assertion>
-    
+
     <assertion id="dh">
       <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X declares a _non-static disposer method_ x() then Y does not inherit this method unless Y is explicitly declared to specialize X</text>
     </assertion>
-    
+
     <assertion id="di">
       <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X declares a _non-static observer method_ x() then Y does not inherit this method unless Y is explicitly declared to specialize X</text>
     </assertion>
-    
+
     <assertion id="dj">
       <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X declares a _non-static producer method_ x() then Y does not inherit this method unless Y is explicitly declared to specialize X</text>
     </assertion>
-    
+
     <assertion id="dk">
       <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X declares a _non-static disposer method_ x() then Y does not inherit this method unless Y is explicitly declared to specialize X</text>
     </assertion>
-    
+
     <assertion id="dl">
       <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X declares a _non-static observer method_ x() then Y does not inherit this method unless Y is explicitly declared to specialize X</text>
-    </assertion>    
-       
+    </assertion>
+
     <assertion id="ea">
       <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X declares a _non-static producer field_ x then Y does not inherit this field unless Y is explicitly declared to specialize X.</text>
     </assertion>
-    
+
     <assertion id="eb">
       <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X declares a _non-static producer field_ x then Y does not inherit this field unless Y is explicitly declared to specialize X.</text>
     </assertion>
-    
+
     <assertion id="ec">
       <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X declares a _non-static producer field_ x then Y does not inherit this field unless Y is explicitly declared to specialize X.</text>
     </assertion>
-    
+
     <assertion id="ed">
       <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X declares a _non-static producer field_ x then Y does not inherit this field unless Y is explicitly declared to specialize X.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>If X is a generic type, and an injection point declared by X is inherited by Y, and the declared type of the injection point contains type variables declared by X, the type of the injection point inherited in Y is the declared type, after substitution of actual type arguments declared by Y or any intermediate class that is a subclass of X and a superclass of Y.</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>If X is a generic type, and a producer method declared by X is inherited by Y, and the declared type of the producer method contains type variables declared by X, the type of the producer method inherited in Y is the declared type, after substitution of actual type arguments declared by Y or any intermediate class that is a subclass of X and a superclass of Y.</text>
     </assertion>
-    
+
     <assertion id="h">
       <text>If X is a generic type, and a producer field declared by X is inherited by Y, and the declared type of the producer field contains type variables declared by X, the type of the producer field inherited in Y is the declared type, after substitution of actual type arguments declared by Y or any intermediate class that is a subclass of X and a superclass of Y.</text>
     </assertion>
-    
+
     <assertion id="i">
       <text>If X is a generic type, and a disposer method declared by X is inherited by Y, and the declared type of the disposed parameter contains type variables declared by X, the type of the disposed parameter inherited in Y is the declared type, after substitution of actual type arguments declared by Y or any intermediate class that is a subclass of X and a superclass of Y.</text>
     </assertion>
-    
+
     <assertion id="j">
       <text>If X is a generic type, and an observer method declared by X is inherited by Y, and the declared type of the event parameter contains type variables declared by X, the type of the event parameter inherited in Y is the declared type, after substitution of actual type arguments declared by Y or any intermediate class that is a subclass of X and a superclass of Y.</text>
     </assertion>
   </section>
-  
+
   <section id="4.3" title="Specialization">
     <assertion id="a" testable="false">
       <text>If two beans both support a certain bean type, and share at least one binding, then they are both eligible for injection to any injection point with that declared type and binding.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>If the bean with the lower priority deployment type declares a binding that is not declared by the bean with the higher priority deployment type, then the bean with the higher priority deployment type will not be eligible for injection to an injection point with that binding.</text>
     </assertion>
-    
+
     <assertion id="ca">
       <text>The only way one bean can completely override a lower-priority bean at all injection points is if it implements all the bean types and declares all the bindings of the lower-priority bean. However, if the lower-priority bean declares a producer method or observer method, then even this is not enough to ensure that the lower-priority bean is never called.</text>
     </assertion>
-  
+
   </section>
-  
+
   <section id="4.3.1" title="Direct and indirect specialization">
     <assertion id="i">
-      <text>A bean X is said to specialize another bean Y if X directly specializes Y.</text>      
+      <text>A bean X is said to specialize another bean Y if X directly specializes Y.</text>
     </assertion>
-    
+
     <assertion id="i">
-      <text>A bean X is said to specialize another bean Y if a bean Z exists, such that X directly specializes Z and Z specializes Y.</text>     
+      <text>A bean X is said to specialize another bean Y if a bean Z exists, such that X directly specializes Z and Z specializes Y.</text>
     </assertion>
-    
+
     <assertion id="j">
       <text>A bean X that specializes bean Y will include all bindings of Y, together with all bindings declared explicitly by X.</text>
     </assertion>
-    
+
     <assertion id="k">
       <text>A bean X that specializes bean Y will have the same name as Y if Y has a name.</text>
     </assertion>
-    
+
     <assertion id="l">
       <text>If X declares a name explicitly, using @Named, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="m">
       <text>X must have all the bean types of Y. If X does not support some bean type of Y, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
   </section>
-  
+
   <section id="4.3.2" title="Most specialized enabled bean for a bean">
     <assertion id="a">
       <text>Non-static producer methods, producer fields, disposal methods and observer methods of a bean are invoked upon an instance of the most specialized enabled bean that specializes the bean, as defined by Section 5.6.6, "Invocation of producer or disposal methods", Section 5.6.7, "Access to producer field values" and Section 5.6.8, "Invocation of observer methods".</text>
     </assertion>
-    
+
   </section>
-    
-  <section id="4.3.3" title="Inconsistent specialization">    
+
+  <section id="4.3.3" title="Inconsistent specialization">
     <assertion id="c">
       <text>If, for an enabled bean X that directly specializes a second bean Y, there is another enabled bean that directly specializes Y, we say that inconsistent specialization exists.  The container automatically detects inconsistent specialization and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>If, for an enabled bean X that directly specializes a second bean Y, there is an injection point that matches Y and not X, according to the typesafe resolution algorithm defined in Section 5.3 "Typesafe resolution", we say that inconsistent specialization exists.  The container automatically detects inconsistent specialization and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
   </section>
-  
-  <section id="5" title="Lookup, dependency injection and EL resolution">
-    
+
+  <section id="5" title="Dependency injection, lookup, and EL">
+
     <assertion id="b">
-      <text>The container is required to support circularities in the bean dependency graph</text>
+      <text>The container is required to support circularities in the bean dependency graph.</text>
       <note>The RI has unit tests for this atm</note>
     </assertion>
   </section>
-  
-  <section id="5.1" title="Typesafe resolution algorithm">
-          
-    <assertion id="faa">
-    <text>When the container is resolving a bean by type, it identifies the set of matching enabled beans which have a bean type that matches the required type.</text>
+
+  <section id="5.1" title="Inter-module accessibility in Java EE">
+
+  </section>
+
+  <section id="5.2" title="Policy enablement">
+    <assertion id="a">
+      <text>A policy 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 beans.xml file).</text>
     </assertion>
-    
-    <assertion id="fb">
-      <text>Primitive types are considered to be identical to their corresponding wrapper types in |java.lang|.</text>
+
+    <assertion id="b">
+      <text>Nor is a policy available for injection, lookup or EL resolution in every bean deployment archive. A policy must be explicitly enabled in every bean deployment archive in which the policy should be available for injection, lookup and EL resolution.</text>
     </assertion>
-    
-    <assertion id="fc">
-      <text>Array types are considered identical only if their element types are identical.</text>
+
+    <assertion id="c">
+      <text>By default, a bean deployment archive has no enabled policies. A policy must be explicitly declared using the &lt;policies&gt; element of the |beans.xml| file of the bean deployment archive.</text>
     </assertion>
-    
-    <assertion id="fd">
-      <text>Parameterized types are considered identical only if both the type and all type parameters are identical.</text>
+
+    <assertion id="d" testable="false">
+      <text>The &lt;policies&gt; element contains a list of bean classes and stereotypes. </text>
     </assertion>
-        
-    <assertion id="gaa">
-      <text>_If no bindings were explicitly specified, the container assumes the binding |@Current|_. </text>
+
+    <assertion id="e">
+      <text>A policy is enabled for the bean deployment archive if the policy is a managed bean or session bean and the bean class of the bean is listed.</text>
     </assertion>
-    
-    <assertion id="gba">
-    <text>The container narrows the set of matching beans to just those where for each required binding, the bean declares a matching binding with _(a) the same type_ and (b) the same annotation member value for each member which is not annotated |@javax.enterprise.inject.NonBinding|.</text>
+
+    <assertion id="f">
+      <text>A policy is enabled for the bean deployment archive if the policy is a producer method, field or resource, and the bean class that declares the method or field is listed.</text>
     </assertion>
-    
-    <assertion id="gca">
-    <text>The container narrows the set of matching beans to just those where for each required binding, the bean declares a matching binding with (a) the same type and _(b) the same annotation member value for each member_ which is not annotated |javax.enterprise.inject. at NonBinding|.</text>
+
+    <assertion id="g">
+      <text>A policy is enabled for the bean deployment archive if any |@Policy| stereotype of the policy is listed.</text>
     </assertion>
-           
-    <assertion id="ha">
-      <text>When the container is resolving a bean by type, it examines the deployment types of the matching beans, as defined in Section 2.5.6, "Deployment type precedence", and returns the set of beans with the highest precedence deployment type that occurs in the set.</text>
+
+    <assertion id="h">
+      <text>Each child &lt;class&gt; element must specify the name of a policy bean class.  If there is no class with the specified name, or if the class with the specified name is not a policy bean class, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
-    <assertion id="hb">
-      <text>When the container is resolving a bean by type, it examines the deployment types of the matching beans, as defined in Section 2.5.6, "Deployment type precedence", and returns the set of beans with the highest precedence deployment type that occurs in the set. _If there are no matching beans, an empty set is returned_</text>
-    </assertion>    
+
+    <assertion id="i">
+      <text>Each child &lt;stereotype&gt; element must specify the name of a |@Policy| stereotype annotation. If there is no annotation with the specified name, or the annotation is not a |@Policy| stereotype, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    </assertion>
+
+    <assertion id="j">
+      <text>If the same type is listed twice under the &lt;policies&gt; element, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    </assertion>
+
+    <assertion id="k">
+      <text>For a custom implementation of the |Bean| interface defined in Section 11.1, "The Bean interface", the container calls |isPolicy()| to determine whether the bean is a policy, and |getBeanClass()| and |getStereotypes()| to determine whether a policy is enabled in a certain bean deployment archive.</text>
+    </assertion>
+
+    <assertion id="l" testable="false">
+      <text>A bean is said to be enabled if it is not a policy, or if it is enabled in at least one bean deployment archive.</text>
+    </assertion>
   </section>
-  
-  <section id="5.1.1" title="Assignability of raw and parameterized types">
-  
+
+  <section id="5.3" title="Typesafe resolution">
+    <assertion id="i">
+      <text>When resolving beans that are eligible for injection to an injection point, the container identifies the set of matching beans which are not interceptors or decorators and which have a bean type that matches the required type. For this purpose, primitive types are considered to match their corresponding wrapper types in |java.lang| ~and array types are considered to match only if their element types are identical. Parameterized and raw types are considered to match if they are identical or if the bean type is assignable to the required type, as defined in Section 5.3.3, "Assignability of raw and parameterized types".~</text>
+    </assertion>
+
+    <assertion id="j">
+      <text>When resolving beans that are eligible for injection to an injection point, the container identifies the set of matching beans which are not interceptors or decorators and which have a bean type that matches the required type. For this purpose, ~primitive types are considered to match their corresponding wrapper types in |java.lang| and~ array types are considered to match only if their element types are identical. ~Parameterized and raw types are considered to match if they are identical or if the bean type is assignable to the required type, as defined in Section 5.3.3, "Assignability of raw and parameterized types".~</text>
+    </assertion>
+
+    <assertion id="k">
+      <text>When resolving beans that are eligible for injection to an injection point, the container identifies the set of matching beans which are not interceptors or decorators and which have a bean type that matches the required type. For this purpose, ~primitive types are considered to match their corresponding wrapper types in |java.lang| and array types are considered to match only if their element types are identical.~ Parameterized and raw types are considered to match if they are identical or if the bean type is assignable to the required type, as defined in Section 5.3.3, "Assignability of raw and parameterized types".</text>
+    </assertion>
+
+    <assertion id="l">
+      <text>When resolving beans that are eligible for injection to an injection point, the container identifies the set of matching beans which are not interceptors or decorators and which have the required bindings. If no required bindings were explicitly specified, the container assumes the required binding |@Current|. The container narrows the set of matching beans to just those where for each required binding, the bean declares a matching binding with (a) the same type and (b) the same annotation member value for each member which is not annotated |@javax.enterprise.inject.NonBinding| (see Section 5.3.5, "Binding annotations with members").</text>
+    </assertion>
+
+    <assertion id="m">
+      <text>When resolving beans that are eligible for injection to an injection point, the container identifies the set of matching beans which are not interceptors or decorators.  In a Java EE or servlet container, the bean class is required to be accessible to the class that declares the injection point, according to the class loading requirements of the Java EE platform and Java Servlet specifications.</text>
+    </assertion>
+
+    <assertion id="n">
+  <text>When resolving beans that are eligible for injection to an injection point, the container identifies the set of matching beans which are not interceptors or decorators and which are not a policy, or is an enabled policy of the bean deployment archive of the class that declares the injection point. For a custom implementation of the |Bean| interface defined in Section 11.1, "The Bean interface", the container calls |getTypes()| and |getBindings()| to determine the bean types and bindings.</text>
+    </assertion>
+  </section>
+
+  <section id="5.3.1" title="Unsatisfied and ambiguous dependencies">
+    <assertion id="aa">
+      <text>The container must validate all injection points of all enabled beans when the application is initialized to ensure that there are no unsatisfied or ambiguous dependencies. If an unsatisfied or ambiguous dependency exists, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+      <note>These need expanding out - one for each assertion that results in an exception in 5.7.1</note>
+    </assertion>
+
+    <assertion id="b">
+      <text>For a custom implementation of the Bean interface defined in Section 11.1, "The Bean interface", the container calls  |getInjectionPoints()| to determine the injection points of the bean.</text>
+    </assertion>
+  </section>
+
+  <section id="5.3.3" title="Assignability of raw and parameterized types">
     <assertion id="a">
       <text>A parameterized bean type is considered assignable to a raw required type if the raw types are identical and all type parameters of the bean type are either unbounded type variables or |java.lang.Object|.</text>
-    </assertion>  
-    
+    </assertion>
+
     <assertion id="b">
-      <text>A parameterized bean type is considered assignable to a parameterized required type if they have identical raw type and for each parameter the required type parameter and the bean type parameter are actual types with identical raw type, and, if the type is parameterized, the bean type is assignable to the required type according to these rules.</text>
+      <text>A parameterized bean type is considered assignable to a parameterized required type if they have identical raw type and for each parameter the required type parameter and the bean type parameter are actual types with identical raw type, and, if the type is parameterized, the bean type parameter is assignable to the required type according to these rules.</text>
     </assertion>
-    
+
     <assertion id="c">
-      <text>A parameterized bean type is considered assignable to a parameterized required type if they have identical raw type and for each parameter the required type parameter is a wildcard, the bean type parameter is an actual type and the actual type is a subtype of the upper bound, if any, of the wildcard and a supertype of the upper bound, if any, or the wildcard.
-      </text>
+      <text>A parameterized bean type is considered assignable to a parameterized required type if they have identical raw type and for each parameter the required type parameter is a wildcard, the bean type parameter is an actual type and the actual type is assignable to the upper bound, if any, of the wildcard and assignable from the lower bound, if any, of the wildcard.</text>
     </assertion>
-      
+
     <assertion id="d">
-      <text>A parameterized bean type is considered assignable to a parameterized required type if they have identical raw type and for each parameter the required type parameter is a wildcard with no lower bound, the bean type parameter is a type variable and the upper bound of the type variable is aa subtype of the upper bound, if any, of the wildcard.</text>
+    <text>A parameterized bean type is considered assignable to a parameterized required type if they have identical raw type and for each parameter the required type parameter is a wildcard, the bean type parameter is a type variable and the upper bound of the type variable is assignable to the upper bound, if any, of the wildcard and assignable from the lower bound, if any, of the wildcard.</text>
     </assertion>
-      
+
     <assertion id="e">
-      <text>A parameterized bean type is considered assignable to a parameterized required type if they have identical raw type and for each parameter the required type parameter is an actual type, the bean type parameter is a type variable and the actual type is a subtype of the upper bound, if any, of the type variable.</text>
+      <text>A parameterized bean type is considered assignable to a parameterized required type if they have identical raw type and for each parameter the required type parameter is an actual type, the bean type parameter is a type variable and the actual type is assignable to the upper bound, if any, of the type variable.</text>
     </assertion>
-      
+
     <assertion id="f">
-      <text>A parameterized bean type is considered assignable to a parameterized required type if they have identical raw type and for each parameter the required type parameter and the bean type parameter are both type variables and the upper bound of the required type parameter is a subtype of the upper bound, if any, of the bean type parameter</text>
+      <text>A parameterized bean type is considered assignable to a parameterized required type if they have identical raw type and for each parameter the required type parameter and the bean type parameter are both type variables and the upper bound of the required type parameter is assignable to the upper bound, if any, of the bean type parameter.</text>
     </assertion>
-    
-    <assertion id="g">
-      <text>If the injection point is declared by a parameterized superclass, and the type declaration of the injection point contains type parameters declared by the superclass, the required type is the declared type, after substitution of actual type arguments declared by subclasses.</text>
-    </assertion>
-  
   </section>
-  
-  <section id="5.1.2" title="Unsatisfied and ambiguous dependencies">
+
+  <section id="5.3.4" title="Primitive types and null values">
+
     <assertion id="aa">
-      <text>The container must validate all injection points of all enabled beans when the application is initialized to ensure that there are no unsatisfied or ambiguous dependencies. If an unsatisfied or ambiguous dependency exists, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-      <note>These need expanding out - one for each assertion that results in an exception in 5.7.1</note>
-    </assertion>    
-    
-    <assertion id="b">
-      <text>For a custom implementation of the Bean interface defined in Section 11.1, "The Bean interface", the container calls  |getInjectionPoints()| to determine the injection points of the bean.</text>
-    </assertion>
-    
-  </section>  
-  
-  <section id="5.1.3" title="Primitive types and null values">  
-  
-    <assertion id="aa">
       <text>If necessary, the container performs boxing ~or unboxing~ when it injects a value to a field or parameter of primitive or wrapper type.</text>
     </assertion>
     <assertion id="ab">
       <text>If necessary, the container performs ~boxing or~ unboxing when it injects a value to a field or parameter of primitive or wrapper type.</text>
-    </assertion> 
- 
+    </assertion>
+
     <assertion id="aa">
       <text>If an injection point of primitive type resolves to a bean that may have null values, such as a producer method with a nonprimitive return type or a producer field with a non-primitive type, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4 "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="ba">
       <text>For a custom implementation of the Bean interface defined in Section 11.1, "The Bean interface", the container calls |isNullable()| to determine whether the bean may have null values.</text>
     </assertion>
   </section>
-  
-  <section id="5.1.4" title="Binding annotations with members">
+
+  <section id="5.3.5" title="Binding annotations with members">
     <assertion id="a" testable="false">
       <text>Binding types with members are supported</text>
       <note>A statement of intent</note>
     </assertion>
-    
+
     <assertion id="b">
       <text>An annotation member may be excluded from consideration using the |@NonBinding| annotation</text>
     </assertion>
-    
+
     <assertion id="ca">
   <text>Array-valued ~or annotation-valued~ members of a binding type must be annotated |@NonBinding|. If an array-valued ~or annotation-valued~ member of a binding type is not annotated |@NonBinding|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="cb">
       <text>~Array-valued or ~annotation-valued members of a binding type must be annotated |@NonBinding|. If an ~array-valued or ~annotation-valued member of a binding type is not annotated |@NonBinding|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-  </section>  
-  
-  <section id="5.1.5" title="Multiple bindings">
+  </section>
+
+  <section id="5.3.6" title="Multiple bindings">
     <assertion id="a">
       <text>A bean class may declare multiple bindings</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>A producer method may declare multiple bindings</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A producer field may declare multiple bindings</text>
-    </assertion> 
-    
+    </assertion>
+
     <assertion id="d">
       <text>A bean must declare all of the bindings that are specified at the injection point to be considered a candidate for injection</text>
     </assertion>
-  </section>  
-  
-  <section id="5.2" title="EL Name resolution algorithm">
-    
-    <assertion id="b">
-      <text>When resolving a bean by name, the container must identify the set of matching enabled beans which have the given EL name</text>
+  </section>
+
+  <section id="5.4" title="EL Name resolution">
+
+    <assertion id="ba">
+  <text>When resolving a bean by name, the container identifies the set of matching beans which have the given EL name, and are accessible to classes in the war containing the JSP or JSF page with the EL expression, according to the class loading requirements of the Java EE platform and Java Servlet specifications, and which are not a policy or an enabled policy of the war containing the JSP or JSF page with the EL expression.</text>
     </assertion>
-    
+
+    <assertion id="e">
+      <text>For a custom implementation of the Bean interface defined in Section 11.1, "The Bean interface", the container calls |getName()| to determine the bean EL name.</text>
+    </assertion>
+  </section>
+
+  <section id="5.4.1" title="Ambiguous EL names">
     <assertion id="c">
-      <text>After the container identifies the set of matching beans, it examines the deployment types of the matching beans, as defined in Section 2.5.6, "Deployment type precedence", and returns the set of beans with the highest precedence deployment type that occurs in the set.</text>
+      <text>An ambiguous EL name exists in an EL expression when there are multiple beans which match the given EL name.  When an ambiguous EL name exists, the container attempts to resolve the ambiguity - if any matching beans are policies, the container eliminates all matching beans that are not policies.  The container eliminates all matching beans that are specialized by some other matching bean. If there is exactly one bean remaining, the container will select this bean, and the ambiguous name is called resolvable.</text>
     </assertion>
-    
+
     <assertion id="d">
-      <text>If there are no matching beans, an empty set is returned.</text>
+      <text>All unresolvable ambiguous EL names are detected by the container when the application is initialized. Suppose two beans are both accessible to classes in a certain war, according to the class loading requirements of the Java EE platform and Java Servlet specifications. If each bean is either not a policy, or is an enabled policy of the war, and either the two beans have the same EL name and the name is not resolvable, or the EL name of one bean is of the form x.y, where y is a valid bean EL name, and x is the EL name of the other bean, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-  </section>  
-  
-  <section id="5.2.1" title="Ambiguous EL names">
-    <assertion id="a">
-      <text>If, in a particular deployment two enabled beans have the same EL name and the same deployment type, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-    </assertion>
-    
-    <assertion id="b">
-      <text>If, in a particular deployment, the EL name of an enabled bean is of the form |x.y|, where |y| is a valid bean EL name, and |x| is the EL name of some other enabled bean, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-    </assertion>
   </section>
-  
-  <section id="5.3" title="Client proxies">
+
+  <section id="5.5" title="Client proxies">
     <assertion id="a">
       <text>Client proxies are never required for a bean whose scope is a pseudo-scope such as |@Dependent|</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>Client proxies are used for normal scoped beans</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>The container must guarantee that when any valid injected reference to a bean of normal scope is invoked, the invocation is always processed by the current instance of the injected bean.</text>
     </assertion>
   </section>
-  
-  <section id="5.3.1" title="Unproxyable bean types">
+
+  <section id="5.5.1" title="Unproxyable bean types">
     <assertion id="aa">
-      <text>Classes without a non-private constructor with no parameters cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+      <text>Classes which don't have a non-private constructor with no parameters cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="baa">
       <text>Classes which are declared final ~or have final methods~ cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="bba">
       <text>Classes which ~are declared final or ~have final methods cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="ca">
       <text>Primitive types cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="da">
       <text>Array types cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-  </section>  
-  
-  <section id="5.3.2" title="Client proxy invocation">
+  </section>
+
+  <section id="5.5.2" title="Client proxy invocation">
     <assertion id="aa">
   <text>Every time a method of the bean is invoked upon a client proxy, the client proxy must obtain a contextual instance of the bean, as defined in Section 6.5.2, "Contextual instance of a bean", and invoke the method upon this instance.</text>
     </assertion>
-    
+
+    <assertion id="ab">
+      <text>If the scope is not active, as specified in Section 6.5.1, "The active context object for a scope", the client proxy rethrows |ContextNotActiveException| or |IllegalStateException|.</text>
+    </assertion>
+
     <assertion id="b">
       <text>The behavior of all methods declared by |java.lang.Object|, except for |toString()|, is undefined for a client proxy</text>
     </assertion>
 
-  </section>  
-  
-  <section id="5.4" title="Dependency injection">
+  </section>
+
+  <section id="5.6" title="Dependency injection">
     <assertion id="a">
       <text>The container is required to perform dependency injection whenever it creates a contextual instance of a session bean.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The container is required to perform dependency injection whenever it creates a contextual instance of a managed bean.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>The container is required to perform dependency injection whenever it instantiates non-contextual instances of session beans (for example, session beans obtained by the application from JNDI or injected using |@EJB|).</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>The container is required to perform dependency injection whenever it instantiates non-contextual instances of managed beans.</text>
     </assertion>
-      
+
     <assertion id="e">
       <text>The container is required to perform dependency injection whenever it instantiates instances of any other Java EE component class supporting injection.</text>
     </assertion>
-    
+
     <assertion id="f">
-      <text>In a Java EE 5 environment, the container is not required to support injection for non-contextual objects.</text>      
+      <text>In a Java EE 5 environment, the container is not required to support injection for non-contextual objects.</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>The container interacts with instances of beans and other Java EE component classes supporting injection by calling methods and getting and setting the field values.</text>
     </assertion>
   </section>
-  
-  <section id="5.4.1" title="Injectable references">
-    <assertion id="a">
-      <text>To obtain an injectable reference for an injection point, the container must identify a bean according to the rules defined in Section 5.1, "Typesafe resolution algorithm".</text>
+
+  <section id="5.6.1" title="Injectable references">
+    <assertion id="aa">
+  <text>To obtain an injectable reference for an injection point, the container must identify a bean according to the rules defined in Section 5.3, "Typesafe resolution" and resolving ambiguities according to Section 5.3.1, "Unsatisfied and ambiguous dependencies", then obtain a contextual reference for this bean and the type of the injection point according to Section 6.5.3, "Contextual reference for a bean".</text>
     </assertion>
-    
-    <assertion id="b">
-      <text>If typesafe resolution resulted in an empty set, throw an |UnsatisfiedResolutionException|.</text>
+
+    <assertion id="g">
+      <text>For certain combinations of scopes, the container is permitted to optimize the above procedure by directly injecting a contextual instance of the bean, as defined in Section 6.5.2, "Contextual instance of a bean". If an incompletely initialized instance of the bean is registered with the current |CreationalContext|, as defined in Section
+6.1, "The Contextual interface", the container is permitted to directly inject this instance.  However, in performing these optimizations, the container must respect the rules of injected reference validity.</text>
     </assertion>
-    
-    <assertion id="c">
-      <text>If typesafe resolution resulted in more than one bean, throw an |AmbiguousResolutionException|.</text>
-    </assertion>
-    
+  </section>
+
+  <section id="5.6.2" title="Injected reference validity">
     <assertion id="d">
-      <text>Otherwise, obtain a contextual reference for this bean for the type of the injection point according to Section 6.5.3, "Contextual reference for a bean".</text>
+      <text>A reference to a bean injected into a field, bean constructor or initializer method is valid until the object into which it was injected is destroyed.</text>
     </assertion>
-    
+
     <assertion id="e">
-      <text>The container is permitted to directly inject a contextual instance of the bean, as defined in Section 6.5.2, "Contextual instance of a bean".</text>
+      <text>A reference to a bean injected into a producer method is valid until the producer method bean instance that is being produced is destroyed.</text>
     </assertion>
-    
+
     <assertion id="f">
-      <text>If an incompletely initialized instance of the bean is registered with the current |CreationalContext|, as defined in Section
-6.1, "The Contextual interface", the container is permitted to directly inject this instance.</text>
+      <text>A reference to a bean injected into a disposer method or observer method is valid until the invocation of the method completes.</text>
     </assertion>
-    
-  </section>
-  
-  <section id="5.4.2" title="Injected reference validity">
-    <assertion id="c">
-      <text>Injected references to a bean are valid until the object into which they were injected is destroyed. The application should not invoke a method of an invalid reference. If the application invokes a method of an injected reference after the object into which it was injected has been destroyed, the behavior is undefined.</text>
+
+    <assertion id="g">
+      <text>The application should not invoke a method of an invalid reference. If the application invokes a method of an invalid injected reference, the behavior is undefined.</text>
     </assertion>
   </section>
-  
-  <section id="5.4.3" title="Injection using the bean constructor">
+
+  <section id="5.6.3" title="Injection using the bean constructor">
     <assertion id="a">
-      <text>When the container instantiates a managed bean with a constructor annotated |@Initializer|, the container calls this constructor, passing an injectable reference to each parameter. If there is no constructor annotated |@Initializer|, the container calls the constructor with no parameters.</text>      
-    </assertion>    
+      <text>When the container instantiates a managed bean with a constructor annotated |@Initializer|, the container calls this constructor, passing an injectable reference to each parameter. If there is no constructor annotated |@Initializer|, the container calls the constructor with no parameters.</text>
+    </assertion>
   </section>
-  
-  <section id="5.4.4" title="Injection of fields and initializer methods">
+
+  <section id="5.6.4" title="Injection of fields and initializer methods">
     <assertion id="a">
-  <text>When the container creates a new instance of a managed bean, session bean, or of any other Java EE component class supporting injection, the container must initialize the values of all injected fields after injection of Java EE component environment resources has been performed and before the |@PostConstruct| callback occurs and before the servlet |init()| method is called.  The container sets the value of each injected field to an injectable reference.</text> 
+  <text>When the container creates a new instance of a managed bean, session bean, or of any other Java EE component class supporting injection, the container must initialize the values of all injected fields after injection of Java EE component environment resources has been performed and before the |@PostConstruct| callback occurs and before the servlet |init()| method is called.  The container sets the value of each injected field to an injectable reference.</text>
     </assertion>
-    
+
     <assertion id="b">
-      <text>After the container initializes the values of the injected fields, it must call all initializer methods, passing an injectable reference to each parameter.</text> 
+      <text>After the container initializes the values of the injected fields, it must call all initializer methods, passing an injectable reference to each parameter.</text>
     </assertion>
-    
-    <assertion id="c">
-      <text>After the container calls initializer methods, it must build the interceptor and decorator stacks for the instance (if the component has interceptors or decorators).</text> 
-    </assertion>    
   </section>
-  
-  <section id="5.4.5" title="Destruction of dependent objects">
+
+  <section id="5.6.5" title="Destruction of dependent objects">
     <assertion>
       <text>When the container destroys an instance of a bean or of any Java EE component class supporting injection, the container destroys all dependent objects, as defined in Section 6.4.3, "Dependent object destruction", after the |@PreDestroy| callback completes and after the servlet |destroy()| method is called.</text>
-    </assertion>    
+    </assertion>
   </section>
-  
-  <section id="5.4.6" title="Invocation of producer or disposal methods">
+
+  <section id="5.6.6" title="Invocation of producer or disposal methods">
     <assertion id="a">
       <text>When the container calls a producer method, if the method is static, the container must invoke the method.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>When the container calls a disposal method, if the method is static, the container must invoke the method.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>When the container calls a producer method, if the method is non-static the container must determine the most specialized enabled bean that specializes the bean which declares the method, as defined in Section 4.3.2 "Most specializaed enabled bean for a bean", then obtain a contextual instance of the most specialized bean, as defined by Section 6.5.2 "Contextual instance of a bean", then invoke the method upon this instance.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>When the container calls a disposal method, if the method is non-static the container must determine the most specialized enabled bean that specializes the bean which declares the method, as defined in Section 4.3.2 "Most specializaed enabled bean for a bean", then obtain a contextual instance of the most specialized bean, as defined by Section 6.5.2 "Contextual instance of a bean", then invoke the method upon this instance.</text>
     </assertion>
-    
+
     <assertion id="e">
-      <text>The container passes an injectable reference to each injected method parameter.  The container is also responsible for destroying dependent objects created during this invocation, as defined in Section 6.4.3 "Dependent object destruction".</text>      
-    </assertion>    
+      <text>The container passes an injectable reference to each injected method parameter.  The container is also responsible for destroying dependent objects created during this invocation, as defined in Section 6.4.3 "Dependent object destruction".</text>
+    </assertion>
   </section>
-  
-  <section id="5.4.7" title="Access to producer field values">
+
+  <section id="5.6.7" title="Access to producer field values">
     <assertion id="a">
       <text>When the container accesses the value of a producer field, if the producer field is static, the container must access the field value.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>When the container accesses the value of a producer field, if the producer field is non-static, the container must determine the most specialized enabled bean that specializes the bean which declares the producer field, as defined in Section 4.3.2 "Most specialized enabled bean for a bean", then obtain a contextual instance of the most specialized bean, as defined by Section 6.5.2 "Contextual instance of a bean", then access the field value of this instance.</text>
     </assertion>
   </section>
-  
-  <section id="5.4.8" title="Invocation of observer methods">
+
+  <section id="5.6.8" title="Invocation of observer methods">
     <assertion id="a">
-      <text>When the container calls an observer method (defined in Section 10.5 "Observer methods"), if the observer method is static, the container must invoke the method.</text>
+      <text>When the container calls an observer method (defined in Section 10.4 "Observer methods"), if the observer method is static, the container must invoke the method.</text>
     </assertion>
-    
-    <assertion id="b">
-      <text>When the container calls an observer method (defined in Section 10.5 "Observer methods"), if the observer method is non-static, the container must determine the most specialized enabled bean that specializes the bean which declares the observer method, as defined in Section 4.3.2 "Most specialized enabled bean for a bean", then obtain a contextual instance of the bean according to Section 6.5.2 "Contextual instance of a bean".  If this observer method is a conditional observer method, obtain the contextual instance that already exists, without creating a new contextual instance.  Finally, the container must invoke the observer method on the resulting instance, if any.</text>
+
+    <assertion id="ba">
+      <text>When the container calls an observer method (defined in Section 10.5 "Observer methods"), if the observer method is non-static, the container must determine the most specialized enabled bean that specializes the bean which declares the observer method, as defined in Section 4.3.2 "Most specialized enabled bean for a bean", then obtain a contextual instance of the bean according to Section 6.5.2 "Contextual instance of a bean".  If this observer method is a conditional observer method, obtain the contextual instance that already exists, without creating a new contextual instance.  Finally, the container must invoke the observer method on the resulting instance, if any, as a business method invocation, as defined in Section 7.2 "Container invocations and interception".</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>The container must pass the event object to the event parameter and an injectable instance to each injected method parameter.</text>
     </assertion>
-    
+
     <assertion id="d">
-      <text>The container is also responsible for destroying dependent objects created during this invocation, as defined in Section 6.4.3, "Dependent object destruction".</text>
-    </assertion>    
+      <text>The container is also responsible for destroying dependent objects created during this invocation, as defined in Section 6.4.2, "Dependent object destruction".</text>
+    </assertion>
   </section>
-  
-  <section id="5.4.9" title="Injection point metadata">
+
+  <section id="5.6.9" title="Injection point metadata">
     <assertion id="aa">
   <text>The |javax.enterprise.inject.spi.InjectionPoint.getBean()| method returns the Bean object representing the bean that defines the injection point.  If the injection point does not belong to a bean, |getBean()| returns a null value.</text>
     </assertion>
-    
+
     <assertion id="ba">
       <text>The |javax.enterprise.inject.spi.InjectionPoint.getType()| method returns the declared type of the injection point.</text>
     </assertion>
-    
+
     <assertion id="bc">
       <text>The |javax.enterprise.inject.spi.InjectionPoint.getBindings()| method returns the declared bindings of the injection point.</text>
     </assertion>
-    
+
     <assertion id="ca">
   <text>The |javax.enterprise.inject.spi.InjectionPoint.getMember()| method returns the |Field| object in the case of field injection.</text>
     </assertion>
-    
+
     <assertion id="cb">
       <text>The |javax.enterprise.inject.spi.InjectionPoint.getMember()| method returns the |Method| object in the case of method parameter injection.</text>
     </assertion>
-    
+
     <assertion id="cc">
       <text>The |javax.enterprise.inject.spi.InjectionPoint.getMember()| method returns the |Constructor| object in the case of constructor parameter injection</text>
     </assertion>
-    
+
     <assertion id="daa">
       <text>The |getAnnotated()| method returns an instance of |javax.enterprise.inject.spi.AnnotatedField| or |javax.enterprise.inject.spi.AnnotatedParameter|, depending upon whether the injection point is an injected field or a constructor/method parameter.</text>
     </assertion>
-    
+
     <assertion id="dba">
       <text>The |isDelegate()| method returns true if the injection point is a decorator delegate injection point, and false otherwise.</text>
     </assertion>
-    
+
     <assertion id="dca">
       <text>The |isTransient()| method returns true if the injection point is a transient field, and false otherwise.</text>
     </assertion>
 
     <assertion id="e">
-      <text>The container must provide a bean with deployment type |@Standard|, scope |@Dependent|, bean type |InjectionPoint| and binding |@Current|, allowing dependent objects, as defined in Section 6.4.2, "Dependent objects", to obtain information about the injection point to which they belong. The built-in implementation must be a passivation capable dependency, as defined in Section 6.6.2, "Passivation capable dependencies".</text>      
-    </assertion>    
-    
+      <text>The container must provide a bean with deployment type |@Standard|, scope |@Dependent|, bean type |InjectionPoint| and binding |@Current|, allowing dependent objects, as defined in Section 6.4.2, "Dependent objects", to obtain information about the injection point to which they belong. The built-in implementation must be a passivation capable dependency, as defined in Section 6.6.2, "Passivation capable dependencies".</text>
+    </assertion>
+
     <assertion id="f">
-      <text>If a bean that declares any scope other than |@Dependent| has an injection point of type |InjectionPoint| and binding |@Current|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>      
+      <text>If a bean that declares any scope other than |@Dependent| has an injection point of type |InjectionPoint| and binding |@Current|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>If an object that is not a bean has an injection point of type |InjectionPoint| and binding |@Current|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-    </assertion>    
+    </assertion>
   </section>
-  
-  <section id="5.5" title="Programmatic lookup">
+
+  <section id="5.7" title="Programmatic lookup">
     <assertion id="aa">
       <text>An instance of the |javax.enterprise.inject.Instance| interface may be injected.</text>
     </assertion>
-    
+
     <assertion id="ba">
       <text>The method |javax.enterprise.inject.Instance.get()| returns a contextual reference.</text>
     </assertion>
-    
+
     <assertion id="ca">
       <text>Any combination of bindings may be specified at the injection point.</text>
     </assertion>
-    
+
     <assertion id="da">
       <text>The |@Any| binding may be used to allow the application to specify bindings dynamically.</text>
     </assertion>
   </section>
-    
-  <section id="5.5.1" title="The Instance interface">
-    <assertion id="a">
-      <text>The |Instance| interface provides a method for obtaining instances of beans of a specific type, and inherits the ability to iterate
-beans of a specific type from |java.lang.Iterable|.</text>
+
+  <section id="5.7.1" title="The Instance interface">
+    <assertion id="aa">
+      <text>The |Instance| interface provides a method for obtaining instances of beans with a specified combination of required type and bindings, and inherites the ability to iterate beans with that combination of required type and bindings from |java.lang.Iterable|.</text>
     </assertion>
-    
-    <assertion id="b">
-      <text>The |select()| method of the provided implementation of |Instance| returns a child Instance for a subtype of the bean type and additional bindings. If no subtype is given, the bean type is the same as the parent.</text>
+
+    <assertion id="ab">
+      <text>For an injected |Instance|, the required type is the type parameter specified at the injection point, and the required bindings are the bindings specified at the injection point.</text>
     </assertion>
-    
-    <assertion id="c">
-      <text>If a parameterized type with a type parameter or wildcard is passed to |select()|, an |IllegalArgumentException| is thrown.</text>
+
+    <assertion id="ba">
+    <text>The |select()| method returns a child |Instance| for a given required type and additional required bindings.  If no required type is given, the required type is the same as the parent.</text>
     </assertion>
-    
-    <assertion id="d">
-      <text>If two instances of the same binding type are passed to |select()|, a |DuplicateBindingTypeException| is thrown.</text>
+
+    <assertion id="da">
+      <text>If two instances of the same binding type are passed to |select()|, an |IllegalArgumentException| is thrown.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If an instance of an annotation that is not a binding type is passed to |select()|, an |IllegalArgumentException| is thrown.</text>
     </assertion>
-    
-    <assertion id="f">
-      <text>The |get()| method of the provided implementation of |Instance| must identify the bean by calling |BeanManager.getBeans()|, passing the type and bindings specified at the injection point. A child |Instance| passes the bean subtype and the additional bindings, along with the bindings of its parent.</text>
+
+    <assertion id="fa">
+      <text>The |get()| method must identify a bean that matches the required type and required bindings and is accessible to the class into which the parent |Instance| was injected, according to the rules of typesafe resolution, as defined in Section 5.3, "Typesafe resolution" and resolving ambiguities according to Section 5.3.1, "Unsatisfied and ambiguous dependencies".</text>
     </assertion>
-    
-    <assertion id="g">
-      <text>If |getBeans()| did not return a bean, throw an |UnsatisfiedResolutionException|.</text>
+
+    <assertion id="fb">
+      <text>If typesafe resolution results in an unsatisfied dependency, throw an |UnsatisfiedResolutionException|. If typesafe resolution results in an unresolvable ambiguous dependency, throw an |AmbiguousResolutionException|.</text>
     </assertion>
-    
-    <assertion id="h">
-      <text>If |getBeans()| returned more than one bean, throw an |AmbiguousResolutionException|.</text>
+
+    <assertion id="fc">
+      <text>Otherwise, obtain a contextual reference for the bean and the required type, as defined in Section 6.5.3, "Contextual reference for a bean".</text>
     </assertion>
-    
-    <assertion id="i">
-      <text>Otherwise, obtain a contextual reference for the bean by calling |BeanManager.getReference()|, passing the |Bean| object representing the bean and the bean type or subtype, and return it.</text>
+
+    <assertion id="ja">
+      <text>The |iterator()| method must identify the set of beans that match the required type and required bindings and are accessible to the class into which the parent |Instance| was injected, according to the rules of typesafe resolution, as defined in Section 5.3, "Typesafe resolution".</text>
     </assertion>
-    
-    <assertion id="j">
-      <text>The |iterator()| method of the provided implementation of |Instance| must identify the set of beans by calling  |BeanManager.getBeans()|, passing the type and bindings specified at the injection point. A child Instance passes the subtype, the bindings specified at the injection point and the additional bindings.</text>
+
+    <assertion id="ka">
+      <text>The |iterator()| method must return an |Iterator|, that iterates over the set of contextual references for the resulting beans and required type, as defined in Section 6.5.3, "Contextual reference for a bean".</text>
     </assertion>
-    
-    <assertion id="k">
-      <text>The |iterator()| method of the provided implementation of |Instance| must return an |Iterator|, that iterates over the set of contextual references for the resulting beans by calling |BeanManager.getReference()|, passing the |Bean| object representing the current bean and the bean type or subtype.</text>
-    </assertion>    
-  </section>  
-  
-  <section id="5.5.2" title="The built-in Instance">
+
+    <assertion id="l">
+      <text>The method |isUnsatisfied()| returns true if there is no bean that matches the required type and bindings, or false otherwise.</text>
+    </assertion>
+
+    <assertion id="m">
+      <text>The method |isAmbiguous()| returns true if there is more than one bean that matches the required type and bindings, or false otherwise.</text>
+    </assertion>
+  </section>
+
+  <section id="5.7.2" title="The built-in Instance">
     <assertion id="a">
       <text>The container must provide a built-in bean with |Instance&lt;X&gt;| for every legal bean type X in its set of bean types</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The container must provide a built-in bean with every binding type in its set of binding types.</text>
     </assertion>
-    
-    <assertion id="c">
-      <text>The container must provide a built-in bean with deployment type @Standard.</text>
-    </assertion>
-    
+
     <assertion id="d">
       <text>The container must provide a built-in bean with scope @Dependent.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>The container must provide a built-in bean with no bean EL name.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>The container must provide a built-in bean with an implementation provided automatically by the container. </text>
     </assertion>
-    
+
     <assertion id="g">
     <text>The built-in implementation must be a passivation capable dependency, as defined in Section 6.6.2, "Passivation capable dependencies".</text>
     </assertion>
   </section>
-  
-  <section id="5.5.3" title="Using AnnotationLiteral">
-    <assertion id="a">
-      <text>When the application calls select(), it may pass instances of binding annotation types.</text>
-    </assertion>
+
+  <section id="5.7.3" title="Using AnnotationLiteral and TypeLiteral">
+
   </section>
-  
-  <section id="5.6" title="Integration with Unified EL">  
+
+  <section id="5.8" title="Integration with Unified EL">
     <assertion id="aaa">
-  <text>The container must provide a Unified EL ELResolver to the servlet engine ~and JSF implementation~ that resolves bean EL names using the name resolution algorithm defined in Section 5.2 "EL name resolution algorithm".</text>
+  <text>The container must provide a Unified EL ELResolver to the servlet engine ~and JSF implementation~ that resolves bean EL names using the rules of name resolution algorithm defined in Section 5.4 "EL name resolution" and resolving ambiguities according to Section 5.4.1, "Ambiguous EL names".</text>
       <note>This is testable implicitly by trying to resolve using EL from a servlet</note>
     </assertion>
-    
+
     <assertion id="aba">
-      <text>The container must provide a Unified EL |ELResolver| to the ~servlet engine~ and JSF implementation that resolves bean EL names using the name resolution algorithm defined in Section 5.2 "EL name resolution algorithm".</text>
+      <text>The container must provide a Unified EL |ELResolver| to the ~servlet engine~ and JSF implementation that resolves bean EL names using the rules of name resolution algorithm defined in Section 5.4 "EL name resolution" and resolving ambiguities according to Section 5.4.1, "Ambiguous EL names".</text>
       <note>This is testable implicitly by trying to resolve using EL from a JSF view</note>
     </assertion>
-    
-    <assertion id="ba">
-      <text>If a name used in an EL expression resolves to more than one bean, the |ELResolver| must throw an |AmbiguousResolutionException|.</text>
-    </assertion>
-    
+
     <assertion id="bb">
       <text>If a name used in an EL expression does not resolve to any bean, the |ELResolver| must return a null value.</text>
     </assertion>
-    
+
     <assertion id="bc">
       <text>Otherwise, if a name used in an EL expression resolves to exactly one bean, the |ELResolver| must return a contextual instance of the bean, as defined in Section 6.5.2, "Contextual instance of a bean".</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>For each distinct name that appears in the EL expression, the resolver must be called at most once. Even if a name appears more than once in the same expression, the container may not call the resolver multiple times with that name. This restriction ensures that there is a unique instance of each bean with scope |@Dependent| in any EL evaluation.</text>
     </assertion>
   </section>
-  
-  <section id="6" title="Scopes and contexts">    
-    
+
+  <section id="6" title="Scopes and contexts">
+
   </section>
-  
+
   <section id="6.1" title="The Contextual interface">
-    <assertion id="a">
-      <text>The container and portable extensions may define implementations of the Contextual interface that do not extend |Bean|, but it is not recommended that applications directly implement |Contextual|.</text>
+    <assertion id="a0">
+      <text>If an exception occurs while creating an instance, the exception is rethrown by the |create()| method. If the exception is a checked exception, it must be wrapped and rethrown as an (unchecked) |CreationException|.</text>
     </assertion>
-  </section>
-  
-  <section id="6.1.1" title="Instance creation">
-    <assertion id="a">
-      <text>The |Contextual.create()| method is responsible for creating new contextual instances of the type.</text>
+
+    <assertion id="a1">
+      <text>If an exception occurs while destroying an instance, the exception must be caught by the |destroy()| method.</text>
     </assertion>
-    
-    <assertion id="b">
-      <text>If any exception occurs while creating an instance, the exception is rethrown by the |create()| method. If the exception is a checked exception, it is wrapped and rethrown as an (unchecked) |CreationException|.</text>
+
+    <assertion id="a2">
+      <text>If the application invokes a contextual instance after it has been destroyed, the behavior is undefined.</text>
     </assertion>
-    
-    <assertion id="c">
-      <text>The interface |javax.enterprise.context.spi.CreationalContext| provides an operation that allows the |create()| method to register an incompletely initialized contextual instance with the container. A contextual instance is considered incompletely initialized until the create() method returns the instance.</text>
+
+    <assertion id="a">
+      <text>The container and portable extensions may define implementations of the |Contextual| interface that do not extend |Bean|, but it is not recommended that applications directly implement |Contextual|.</text>
     </assertion>
-    
+  </section>
+
+  <section id="6.1.1" title="The CreationalContext interface">
+    <assertion id="ca">
+      <text>The interface |javax.enterprise.context.spi.CreationalContext| provides operations that are used by the |Contextual| implementation during instance creation and destruction.</text>
+    </assertion>
+
     <assertion id="d">
-      <text>The method |push()| registers the incompletely initialized instance.</text>
+  <text>|push()| registers an incompletely initialized contextual instance with the container.  A contextual instance is considered incompletely initialized until it is returned by the |create()| method.</text>
     </assertion>
-    
+
     <assertion id="e">
-      <text>If |create()| calls |CreationalContext.push()|, it must also return the instance passed to |push()|.</text>
+      <text>|release()| destroys all dependent objects, as defined in Section 6.4.1, "Dependent objects", of the instance which is being destroyed, by passing each dependent object to the |destroy()| method of its |Contextual| object.</text>
     </assertion>
-  </section>
-  
-  <section id="6.1.2" title="Instance destruction">
-    <assertion id="a">
-      <text>The |Contextual.destroy()| method is responsible for destroying instances of the type. In particular, it is responsible for destroying all dependent objects of an instance, as defined in Section 6.4.3, "Dependent object destruction". If any exception occurs while destroying an instance, the exception is caught by the |destroy()| method.</text>
+
+    <assertion id="f" testable="false">
+      <text>The implementation of |Contextual| is not required to call |push()|. However, for certain bean scopes, invocation of |push()| between instantiation and injection helps the container minimize the use of client proxy objects (which would otherwise be required to allow circular dependencies).</text>
     </assertion>
+
+    <assertion id="g">
+      <text>If |Contextual.create()| calls |push()|, it must also return the instance passed to |push()|.</text>
+    </assertion>
+
+    <assertion id="h">
+      <text>|Contextual.create()| should use the given |CreationalContext| when obtaining contextual references to inject, as defined in Section 6.5.3, "Contextual reference for a bean", in order to ensure that any dependent objects are associated with the contextual instance that is being created.</text>
+    </assertion>
+
+    <assertion id="i">
+      <text>|Contextual.destroy()| should call |release()| to allow the container to destroy dependent objects of the contextual instance.</text>
+    </assertion>
   </section>
- 
-  <section id="6.2" title="The Context interface">   
+
+  <section id="6.2" title="The Context interface">
     <assertion id="aa">
       <text>The |javax.enterprise.context.spi.Context| interface provides an operation for obtaining contextual instances with a particular scope of any contextual type.</text>
     </assertion>
 
+    <assertion id="ab">
+      <text>The method |getScopeType()| returns the scope type of the context object.</text>
+    </assertion>
+
     <assertion id="ha">
       <text>When a context object is active the |isActive()| method returns |true|. Otherwise, we say that the context object is inactive and the |isActive()| method returns false.</text>
     </assertion>
-    
+
     <assertion id="j">
       <text>The |Context.get()| method may either return an existing instance of the given contextual type, ~or if no |CreationalContext| is given, return a null value, or if a |CreationalContext| is given, create a new instance of the given contextual type by calling |Contextual.create() and return the new instance~.</text>
-    </assertion>        
-    
+    </assertion>
+
     <assertion id="k">
       <text>The |Context.get()| method may either ~return an existing instance of the given contextual type~, or if no |CreationalContext| is given, return a null value, ~or if a |CreationalContext| is given, create a new instance of the given contextual type by calling |Contextual.create() and return the new instance~.</text>
     </assertion>
-    
+
     <assertion id="l">
       <text>The |Context.get()| method may either ~return an existing instance of the given contextual type, or if no |CreationalContext| is given, return a null value~, or if a |CreationalContext| is given, create a new instance of the given contextual type by calling |Contextual.create() and return the new instance.</text>
     </assertion>
-    
+
     <assertion id="m">
       <text>If the context object is inactive, the |get()| method must throw a |ContextNotActiveException|.</text>
     </assertion>
-    
+
     <assertion id="na">
       <text>The |get()| method may not return a null value _unless no |CreationalContext| is given_, or |Contextual.create()| returns a null value.</text>
     </assertion>
-    
+
     <assertion id="nb">
       <text>The |get()| method may not return a null value unless no |CreationalContext| is given, or _|Contextual.create()| returns a null value_.</text>
     </assertion>
-    
+
     <assertion id="o">
       <text>The |get()| method may not create a new instance of the given contextual type unless a |CreationalContext| is given.</text>
     </assertion>
-    
+
     <assertion id="p">
       <text>The context object is responsible for destroying any contextual instance it creates by passing the instance to the |destroy()|
 method of the Contextual object representing the contextual type.</text>
     </assertion>
-    
+
     <assertion id="q">
       <text> A destroyed instance must not subsequently be returned by the |get()| method.</text>
     </assertion>
-  </section> 
-  
+
+    <assertion id="r">
+      <text>The context object must pass the same instance of |CreationalContext| to |Contextual.destroy()| that it passed to |Contextual.create()| when it created the instance.</text>
+    </assertion>
+  </section>
+
   <section id="6.3" title="Normal scopes and pseudo-scopes">
     <assertion id="a" testable="false">
       <text>There may be no more than one mapped instance of a context object per contextual type per thread</text>
       <note>Not testable through API</note>
     </assertion>
-    
+
     <assertion id="b" testable="false">
       <text>A context may be associated with one or more threads</text>
       <note>A statement of intent</note>
     </assertion>
-    
+
     <assertion id="c">
       <text>The |get()| operation of the |Context| object for an active normal scope returns the current instance of the given contextual type</text>
     </assertion>
-    
+
     <assertion id="d">
     <text>When a context is destroyed, all mapped instances belonging to that context are destroyed by passing them to the |Contextual.destroy()| method.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>Contexts with normal scopes must obey the following rule: 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 typesafe resolution algorithm. 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.</text>
     </assertion>
-    
+
     <assertion id="f" testable="false">
       <text>All pseudo-scopes must be explicitly declared |@ScopeType(normal=false)|, to indicate to the container that no client proxy is required</text>
       <note>A statement of intent</note>
     </assertion>
-    
+
     <assertion id="g" testable="false">
       <text>All scopes defined by this specification, except for the |@Dependent| pseudo-scope, are normal scopes</text>
       <note>A statement of intent</note>
     </assertion>
   </section>
 
-  <section id="6.4" title="Dependent pseudo-scope">  
+  <section id="6.4" title="Dependent pseudo-scope">
     <assertion id="a">
       <text>When a bean is declared to have |@Dependent| scope, no injected instance of the bean is ever shared between multiple injection points</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>When a bean is declared to have |@Dependent| scope, any injected instance of the bean is bound to the lifecycle of the bean, servlet or EJB into which it is injected</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>When a bean is declared to have |@Dependent| scope, any instance of the bean that is used to evaluate a Unified EL expression exists to service that evaluation only</text>
     </assertion>
-    
+
     <assertion id="da">
-      <text>When a bean is declared to have |@Dependent| scope, any instance of the bean that receives a producer method~, producer field, disposal method or observer method~ invocation exists to service that invocation only</text>
+      <text>When a bean is declared to have |@Dependent| scope, any instance of the bean that receives a producer method~, producer field, disposer method or observer method~ invocation exists to service that invocation only</text>
     </assertion>
-    
+
     <assertion id="db">
-      <text>When a bean is declared to have |@Dependent| scope, any instance of the bean that receives a ~producer method,~ producer field~, disposal method or observer method~ invocation exists to service that invocation only</text>
+      <text>When a bean is declared to have |@Dependent| scope, any instance of the bean that receives a ~producer method,~ producer field~, disposer method or observer method~ invocation exists to service that invocation only</text>
     </assertion>
-    
+
     <assertion id="dc">
-      <text>When a bean is declared to have |@Dependent| scope, any instance of the bean that receives a ~producer method, producer field,~ disposal method ~or observer method~ invocation exists to service that invocation only</text>
+      <text>When a bean is declared to have |@Dependent| scope, any instance of the bean that receives a ~producer method, producer field,~ disposer method ~or observer method~ invocation exists to service that invocation only</text>
     </assertion>
-    
+
     <assertion id="dd">
-      <text>When a bean is declared to have |@Dependent| scope, any instance of the bean that receives a ~producer method, producer field, disposal method or~ observer method invocation exists to service that invocation only</text>
+      <text>When a bean is declared to have |@Dependent| scope, any instance of the bean that receives a ~producer method, producer field, disposer method or~ observer method invocation exists to service that invocation only</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>Every invocation of the |get()| operation of the |Context| object for the |@Dependent| scope with a |CreationalContext| returns a new instance of the given bean</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>Every invocation of the |get()| operation of the |Context| object for the |@Dependent| scope with no |CreationalContext| returns a null value</text>
     </assertion>
+
+    <assertion id="g">
+      <text>The |@Dependent| scope is always active.</text>
+    </assertion>
   </section>
-    
-  <section id="6.4.1" title="Dependent scope lifecycle">
-  
-    <assertion id="ga">
-      <text>The |@Dependent| scope is inactive ~except when an instance of a bean with scope |@Dependent| is created by the container to receive a producer method, producer field, disposal method or observer method ~invocation</text>
-      <note>Assertions g through k are all related and should be treated as "or" conditions</note>
+
+  <section id="6.4.1" title="Dependent objects">
+    <assertion id="a">
+      <text>Instances of interceptors or decorators with scope |@Dependent| are dependent objects of the bean instance they decorate.</text>
     </assertion>
-  
-    <assertion id="gb">
-      <text>The |@Dependent| scope is inactive except when an instance of a bean with scope |@Dependent| is created by the container to receive a producer method~, producer field, disposal method or observer method ~invocation</text>
-      <note>Assertions g through k are all related and should be treated as "or" conditions</note>
+
+    <assertion id="g">
+      <text>An instance of a bean with scope |@Dependent| injected into a field, bean constructor or initializer method is a dependent object of the bean or Java EE component class instance into which it was injected.</text>
     </assertion>
     
-    <assertion id="gc">
-      <text>The |@Dependent| scope is inactive except when an instance of a bean with scope |@Dependent| is created by the container to receive a ~producer method,~ producer field~, disposal method or observer method ~invocation</text>
-      <note>Assertions g through k are all related and should be treated as "or" conditions</note>
-    </assertion>
-    
-    <assertion id="gd">
-      <text>The |@Dependent| scope is inactive except when an instance of a bean with scope |@Dependent| is created by the container to receive a ~producer method, producer field,~ disposal method ~or observer method ~invocation</text>
-      <note>Assertions g through k are all related and should be treated as "or" conditions</note>
-    </assertion>
-    
-    <assertion id="ge">
-      <text>The |@Dependent| scope is inactive except when an instance of a bean with scope |@Dependent| is created by the container to receive a ~producer method, producer field, disposal method or~ observer method ~invocation</text>
-      <note>Assertions g through k are all related and should be treated as "or" conditions</note>
-    </assertion>
-    
     <assertion id="h">
-      <text>The |@Dependent| scope is inactive except while a Unified EL expression is evaluated</text>
+      <text>An instance of a bean with scope |@Dependent| injected into a producer method is a dependent object of the producer method bean instance that is being produced.</text>
     </assertion>
     
     <assertion id="i">
-      <text>The |@Dependent| scope is inactive except while an observer method is invoked</text>
+      <text>An instance of a bean with scope |@Dependent| obtained by direct invocation of an |Instance| is a dependent object of the instance of |Instance|.</text>
     </assertion>
-    
-    <assertion id="ja">
-      <text>The |@Dependent| scope is inactive except when the container is creating ~or destroying~ a contextual instance of a bean~, injecting its dependencies, invoking its observer methods, or invoke its |@PostConstruct| or |@PreDestroy| callback.~</text>
-    </assertion>
-    
-    <assertion id="jb">
-      <text>The |@Dependent| scope is inactive except when the container is ~creating or~ destroying a contextual instance of a bean, ~injecting its dependencies, invoking its observer methods, or invoke its |@PostConstruct| or |@PreDestroy| callback.~</text>
-    </assertion>
-    
-    <assertion id="jc">
-      <text>The |@Dependent| scope is inactive except when the container is ~creating or destroying a contextual instance of a bean,~ injecting its dependencies, ~invoking its observer methods, or invoke its |@PostConstruct| or |@PreDestroy| callback.~</text>
-    </assertion>
-    
-    <assertion id="jd">
-      <text>The |@Dependent| scope is inactive except when the container is ~creating or destroying a contextual instance of a bean, injecting its dependencies,~ invoking its observer methods, ~or invoke its |@PostConstruct| or |@PreDestroy| callback.~</text>
-    </assertion>
-    
-    <assertion id="je">
-      <text>The |@Dependent| scope is inactive except when the container is ~creating or destroying a contextual instance of a bean, injecting its dependencies, invoking its observer methods, or~ invoke its |@PostConstruct|~ or |@PreDestroy|~ callback.</text>
-    </assertion>
-    
-    <assertion id="jf">
-      <text>The |@Dependent| scope is inactive except when the container is ~creating or destroying a contextual instance of a bean, injecting its dependencies, invoking its observer methods, or~ invoke ~its |@PostConstruct| or~ |@PreDestroy| callback.</text>
-    </assertion>
-    
-    <assertion id="ka">
-      <text>The |@Dependent| scope is inactive except when the container is injecting dependencies ~or invoking the |@PostConstruct| or |@PreDestroy| callback~ of a Java EE component class supporting injection.</text>
-    </assertion>
-    
-    <assertion id="kb">
-      <text>The |@Dependent| scope is inactive except when the container is ~injecting dependencies or~ invoking the |@PostConstruct| ~or |@PreDestroy|~ callback of a Java EE component class supporting injection.</text>
-    </assertion>
-    
-    <assertion id="kc">
-      <text>The |@Dependent| scope is inactive except when the container is ~injecting dependencies or~ invoking the ~|@PostConstruct| or~ |@PreDestroy| callback of a Java EE component class supporting injection.</text>
-    </assertion>
-    
-    <assertion id="la">
-      <text>The |@Dependent| scope is inactive except when |Instance.get()|, |Instance.iterator()| or |BeanManager.getReference()| is invoked upon an instance of |Instance| or |BeanManager| injected by the container into a bean or other Java EE component class supporting injection.</text>
-    </assertion>
-    
-    <assertion id="n">
-      <text>The |@Dependent| scope is not active when |Instance.get()|, |Instance.iterator()| or |BeanManager.getReference()| is invoked upon an instance of |Instance| or |BeanManager| that was not injected by the container.</text>
-    </assertion>  
   </section>
-  
-  <section id="6.4.2" title="Dependent objects">
-    <assertion id="a">
-      <text>Instances of interceptors or decorators with scope |@Dependent| are dependent objects of the bean instance they intercept or decorate.</text>
-    </assertion>
-    
-    <assertion id="b">
-      <text>An instance of a bean with scope |@Dependent| injected into a field, bean constructor, initializer method or observer method is a dependent object of the bean or Java EE component class instance into which it was injected.</text>
-    </assertion>
-    
-    <assertion id="c">
-      <text>An instance of a bean with scope |@Dependent| injected into a producer method or disposal method is a dependent object of the producer method bean instance that is being produced or disposed.</text>
-    </assertion>
-    
-    <assertion id="d">
-      <text>An instance of a bean with scope |@Dependent| obtained by direct invocation of |BeanManager| or |Instance| during invocation of a bean constructor, initializer method, observer method, |@PostConstruct| or |@PreDestroy| callback is a dependent object of the bean or Java EE component class instance upon which the method is being invoked.</text>
-    </assertion>
-    
-    <assertion id="e">
-      <text>An instance of a bean with scope |@Dependent| obtained by direct invocation of |BeanManager| or |Instance| during invocation of a producer method or disposal method is a dependent object of the producer method bean instance that is being produced or disposed.</text>
-    </assertion>
-    
-    <assertion id="f">
-      <text>Otherwise, an instance of a bean with scope |@Dependent| obtained by direct invocation of an instance of |Instance| or |BeanManager| that was injected by the container into a bean or Java EE component class instance is a dependent object of the bean or Java EE component class instance. </text>
-    </assertion>
-  </section>
 
-  <section id="6.4.3" title="Dependent object destruction">
-    <assertion id="a">
-      <text>The container must destroy all dependent objects of a contextual bean instance when the instance is destroyed</text>
+  <section id="6.4.2" title="Dependent object destruction">
+    <assertion id="aaa">
+      <text>The container must ensure that all dependent objects of a non-contextual instance of a bean or other Java EE component class are destroyed when the instance is destroyed by the container.</text>
     </assertion>
     
-    <assertion id="baa">
-      <text>The container must destroy all dependent objects of a non-contextual instance of a bean or instance of other Java EE component class when the instance is destroyed.</text>
+    <assertion id="bbb">
+      <text>The container must ensure that all |@Dependent| scoped contextual instances injected into method parameters of an observer method of any container lifecycle event, as defined in Section 11.5, "Container lifecycle events", is destroyed after all observers of the |BeforeShutdown| event complete.</text>
     </assertion>
     
-    <assertion id="c">
-      <text>The container must destroy all |@Dependent| scoped contextual instances created during an EL expression evaluation when the evaluation completes</text>
+    <assertion id="ccc">
+      <text>The container must ensure that all |@Dependent| scoped contextual instances injected into method parameters of a disposer method or observer method of any other event are destroyed when the invocation completes.</text>
     </assertion>
     
-    <assertion id="da">
-      <text>The container must destroy any |@Dependent| scoped contextual instance created to receive a producer method~, producer field, disposal method or observer method~ invocation when the invocation completes</text>
+    <assertion id="ddd">
+      <text>The container must ensure that any |@Dependent| scoped contextual instance created to receive a producer method, producer field, disposer method or observer method invocation is destroyed when the invocation completes.</text>
     </assertion>
     
-    <assertion id="db">
-      <text>The container must destroy any |@Dependent| scoped contextual instance created to receive a ~producer method,~ producer field~, disposal method or observer method~ invocation when the invocation completes</text>
+    <assertion id="eee">
+      <text>The container must ensure that all |@Dependent| scoped contextual instances created during an EL expression evaluation are destroyed when the evaluation completes.</text>
     </assertion>
-    
-    <assertion id="dc">
-      <text>The container must destroy any |@Dependent| scoped contextual instance created to receive a ~producer method, producer field,~ disposal method ~or observer method~ invocation when the invocation completes</text>
-    </assertion>
-    
-    <assertion id="dd">
-      <text>The container must destroy any |@Dependent| scoped contextual instance created to receive a ~producer method, producer field, disposal method or~ observer method invocation when the invocation completes</text>
-    </assertion>
-    
+
     <assertion id="e" testable="false">
-      <text>The container is permitted to destroy any |@Dependent| scoped contextual instance at any time if the instance is no Scopes and contexts longer referenced by the application (excluding weak, soft and phantom references)</text>
+      <text>The container is permitted to destroy any |@Dependent| scoped contextual instance at any time if the instance is no longer referenced by the application (excluding weak, soft and phantom references)</text>
       <note>In other words this is unspecified</note>
     </assertion>
   </section>
 
   <section id="6.5" title="Contextual instances and contextual references">
-  
+
   </section>
-  
+
   <section id="6.5.1" title="The active context object for a scope">
     <assertion id="a">
       <text>From time to time, the container must obtain an active context object for a certain scope type. The container must search for an active instance of |Context| associated with the scope type. If no active context object exists for the scope type, the container throws a |ContextNotActiveException|.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>If more than one active context object exists for the given scope type, the container must throw an |IllegalStateException|.</text>
     </assertion>
   </section>
-  
+
   <section id="6.5.2" title="Contextual instance of a bean">
     <assertion id="a">
-      <text>From time to time, the container must obtain a contextual instance of a bean.  The container must obtain the active context object for the bean scope, then obtain an instance of the bean by calling |Context.get()|, passing the |Bean| instance representing the bean and an instance of |CreationalContext|.</text>      
+      <text>From time to time, the container must obtain a contextual instance of a bean.  The container must obtain the active context object for the bean scope, then obtain an instance of the bean by calling |Context.get()|, passing the |Bean| instance representing the bean and an instance of |CreationalContext|.</text>
     </assertion>
-    
+
     <assertion id="b">
-      <text>From time to time, the container attempts to obtain a contextual instance of a bean that already exists, without creating a
-new contextual instance. The container must obtain the active context object for the bean scope, then obtain an instance of the bean by calling |Context.get()|, passing the |Bean| instance representing the bean without
-passing any instance of |CreationalContext|.</text>
+      <text>From time to time, the container attempts to obtain a contextual instance of a bean that already exists, without creating a new contextual instance. The container must determine if the scope of the bean is active and if it is, obtain the active context object for the bean scope, then attempt to obtain an instance of the bean by calling |Context.get()|, passing the |Bean| instance representing the bean without passing any instance of |CreationalContext|.</text>
     </assertion>
+    
+    <assertion id="c">
+      <text>IF the scope is not active, or if |Context.get()| returns a null value, there is no contextual instance that already exists.</text>
+    </assertion>
+    
+    <assertion id="e">
+      <text>For a custom implementation of the |Bean| interface defined in Section 11.1, "The Bean interface", the container calls |getScopeType()| to determine the bean scope.</text>
+    </assertion>
   </section>
-  
+
   <section id="6.5.3" title="Contextual reference for a bean">
-    <assertion id="a">
-      <text>If the bean has a normal scope and the given bean type cannot be proxied by the container, as defined in Section 5.3.1, "Unproxyable bean types", the container throws an |UnproxyableResolutionException|.</text>
+    <assertion id="a0">
+      <text>Contextual references must be obtained with a given |CreationalContext|, allowing any instance of scope |@Dependent| that is created to be later destroyed.</text>
     </assertion>
     
+    <assertion id="a">
+      <text>If the bean has a normal scope and the given bean type cannot be proxied by the container, as defined in Section 5.5.1, "Unproxyable bean types", the container throws an |UnproxyableResolutionException|.</text>
+    </assertion>
+
     <assertion id="b">
-      <text>If the bean has a normal scope, then the contextual reference for the bean is a client proxy, as defined in Section 5.3, "Client proxies", created by the container, that implements the given bean type and all bean types of the bean which are Java interfaces.</text>
+      <text>If the bean has a normal scope, then the contextual reference for the bean is a client proxy, as defined in Section 5.5, "Client proxies", created by the container, that implements the given bean type and all bean types of the bean which are Java interfaces.</text>
     </assertion>
-    
+
     <assertion id="c">
-      <text>If the bean has a pseudo-scope, the container must obtain a contextual instance of the bean.</text>
+  <text>If the bean has a pseudo-scope, the container must obtain a contextual instance of the bean. If the bean has scope |@Dependent|, the container must associate it with the |CreationalContext|.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>The container must ensure that every injection point of type |InjectionPoint| and binding |@Current| of any dependent object instantiated during this process receives an instance of |InjectionPoint| representing the injection point into which the dependent object will be injected, or a null value if it is not being injected into any injection point.</text>
-    </assertion>    
+    </assertion>
   </section>
-  
+
   <section id="6.5.4" title="Contextual reference validity">
     <assertion id="a">
       <text>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 |ContextNotActiveException| is thrown by the container.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>Any reference to a bean with a pseudo-scope (such as |@Dependent|) 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.</text>
     </assertion>
   </section>
-  
+
   <section id="6.6" title="Passivation and passivating scopes">
-    
+
   </section>
-  
+
   <section id="6.6.1" title="Passivation capable beans">
     <assertion id="a">
       <text>As defined by the EJB specification, all stateful session beans are passivation capable. Stateless and singleton session beans are not passivation capable.</text>
     </assertion>
-    
+
     <assertion id="b">
-      <text>A managed bean is passivation capable if and only if the bean class is serializable.</text>
+      <text>A managed bean is passivation capable if and only if the bean class is serializable and all interceptors and decorators of the bean are serializable.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A producer method is passivation capable if and only if it never returns a value which is not passivation capable at runtime. A producer method with a return type that implements or extends serializable is passivation capable. A producer method with a return type that is declared final and does not implement |Serializable| is not passivation capable.</text>
     </assertion>
-    
+
     <assertion id="d">
-      <text>A producer field is passivation capable if and only if it never refers to a value which is not passivation capable at runtime. A producer field with a type that implements or extends serializable is passivation capable. A producer field with a type that is declared |final| and does not implement serializable is not passivation capable.</text>
+      <text>A producer field is passivation capable if and only if it never refers to a value which is not passivation capable at runtime. A producer field with a type that implements or extends |Serializable| is passivation capable. A producer field with a type that is declared |final| and does not implement |Serializable| is not passivation capable.</text>
     </assertion>
+
+    <assertion id="ea">
+      <text>A custom implementation of Bean is passivation capable if it implements the interface |PassivationCapable|.</text>
+    </assertion>
     
-    <assertion id="e">
-      <text>A custom implementation of Bean is passivation capable if |isPassivationCapable()| returns true.</text>
+    <assertion id="f">
+      <text>An implementation of |Contextual| that is not a bean is passivation capable if it implements both |PassivationCapable| and |Serializable|.</text>
     </assertion>
+    
+    <assertion id="g">
+      <text>The |getId()| method must return a value that uniquely identifies the instance of |Bean| or |Contextual|.  It is recommended that the string contain the package name of the class that implements |Bean| or |Contextual|.</text>
+    </assertion>
   </section>
 
   <section id="6.6.2" title="Passivation capable dependencies">
     <assertion id="a">
       <text>The container must guarantee that all session beans are passivation capable dependencies.</text>
-    </assertion>    
-    
+    </assertion>
+
     <assertion id="b">
       <text>The container must guarantee that all beans with normal scope are passivation capable dependencies.</text>
-    </assertion>    
-    
+    </assertion>
+
     <assertion id="c">
       <text>The container must guarantee that all passivation capable beans with scope |@Dependent| are passivation capable dependencies.</text>
-    </assertion>    
-    
-    <assertion id="d">
-      <text>The container must guarantee that all resources and message destinations are passivation capable dependencies.</text>
-    </assertion>    
-    
+    </assertion>
+
+    <assertion id="da">
+      <text>The container must guarantee that all resources are passivation capable dependencies.</text>
+    </assertion>
+
     <assertion id="e">
       <text>The container must guarantee that the built-in beans of type |Instance|, |Event|, |InjectionPoint| and |BeanManager| are passivation capable dependencies.</text>
-    </assertion>    
-    
-    <assertion id="f">
-      <text>A custom implementation of |Bean| is a passivation capable dependency if |isPassivationCapable()| returns |true| or |getScopeType()| returns a normal scope type.</text>
-    </assertion>    
+    </assertion>
+
+    <assertion id="fa">
+      <text>A custom implementation of |Bean| is a passivation capable dependency if it implements |PassivationCapable| or if |getScopeType()| returns a normal scope type.</text>
+    </assertion>
   </section>
-  
+
   <section id="6.6.3" title="Passivating scopes">
+    <assertion id="a">
+      <text>A passivating scope requires that beans with the scope are passivation capable, and implementations of |Contextual| passed to any context object for the scope are passivation capable.</text>
+    </assertion>
     
-    
+    <assertion id="b">
+      <text>Passivating scopes must be explicitly declared |@ScopeType(passivating=true)|.</text>
+    </assertion>
   </section>
 
   <section id="6.6.4" title="Validation of passivation capable beans and dependencies">
-    <assertion id="aa">
-      <text>If a managed bean which declares a passivating scope is not passivation capable~, or has a non-transient injected field, bean constructor parameter or initializer method parameter that does not resolve to a passivation capable dependency, ~then the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    <assertion id="aaa">
+      <text>If a managed bean which declares a passivating scope is not passivation capable, then the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
     
-    <assertion id="ab">
-      <text>If a managed bean which ~declares a passivating scope is not passivation capable, or~ has a non-transient injected field~, bean constructor parameter or initializer method parameter~ that does not resolve to a passivation capable dependency, then the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    <assertion id="aab">
+      <text>If a managed bean which declares a passivating scope has a non-transient injected field, bean constructor parameter or initializer method parameter that does not resolve to a passivation capable dependency, then the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
     
-    <assertion id="ac">
-      <text>If a managed bean which ~declares a passivating scope is not passivation capable, or~ has a non-transient ~injected field~, bean constructor parameter or ~initializer method parameter~ that does not resolve to a passivation capable dependency, then the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    <assertion id="aac">
+      <text>If a managed bean which declares a passivating scope has an interceptor or decorator with a non-transient injected field, bean constructor parameter or initializer method parameter that does not resolve to a passivation capable dependency, then the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
-    <assertion id="ad">
-      <text>If a managed bean which ~declares a passivating scope is not passivation capable, or~ has a non-transient ~injected field, bean constructor parameter or~ initializer method parameter that does not resolve to a passivation capable dependency, then the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-    </assertion>
-    
+
     <assertion id="ba">
       <text>If a stateful session bean has a non-transient injected field~, bean constructor parameter or initializer method parameter~ that does not resolve to a passivation capable dependency, then the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="bb">
       <text>If a stateful session bean has a non-transient ~injected field,~ bean constructor parameter ~or initializer method parameter~ that does not resolve to a passivation capable dependency, then the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="bc">
       <text>If a stateful session bean has a non-transient~ injected field, bean constructor parameter or~ initializer method parameter that does not resolve to a passivation capable dependency, then the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
     
+    <assertion id="bd">
+      <text>If a stateful session bean has an interceptor or decorator with a non-transient injected field, bean constructor parameter or initializer method parameter that does not resolve to a passivation capable dependency, then the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    </assertion>
+
     <assertion id="c">
       <text>If a producer method declares a passivating scope and the container is able to determine that it is not passivation capable by inspecting its return type, or has a parameter that does not resolve to a passivation capable dependency, then the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>If a producer field declares a passivating scope and the container is able to determine that it is not passivation capable by inspecting its type, then the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4,
 "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If a producer method or field which declares a passivating scope returns an unserializable object at runtime, the container must
 throw an |IllegalProductException|.</text>
@@ -2622,15 +2592,15 @@
     <assertion id="f">
       <text>If a producer method or field of scope |@Dependent| returns an unserializable object for injection into an injection point that requires a passivation capable dependency, the container must throw an |IllegalProductException|</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>For a custom implementation of |Bean|, the container calls |getInjectionPoints()| to determine the injection points, and
 |InjectionPoint.isTransient()| to determine whether the injected point is a transient field.</text>
     </assertion>
-    
+
     <assertion id="h">
       <text>If a bean which declares a passivating scope type, or any stateful session bean, has a decorator which is not a passivation capable dependency, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-    </assertion>  
+    </assertion>
   </section>
 
   <section id="6.7" title="Context management for built-in scopes">
@@ -2638,159 +2608,168 @@
       <text>The built-in context object is active during servlet, web service and EJB invocations, or in the case of the conversation context object, for JSF requests.</text>
     </assertion>
   </section>
-  
+
   <section id="6.7.1" title="Request context lifecycle">
     <assertion id="aa">
-      <text>The request scope is active during the |service()| method of any servlet in the web application~ and during the |doFilter()| method of any servlet filter.~</text>
+      <text>The request scope is active during the |service()| method of any servlet in the web application~, during the |doFilter()| method of any servlet filter and when the container calls any |ServletRequestListener| or |AsyncListener|.~</text>
     </assertion>
-    
+
     <assertion id="ab">
-      <text>The request scope is active ~during the |service()| method of any servlet in the web application and~ during the |doFilter()| method of any servlet filter.</text>
+      <text>The request scope is active ~during the |service()| method of any servlet in the web application~, during the |doFilter()| method of any servlet filter and when the container calls any |ServletRequestListener| or |AsyncListener|.</text>
     </assertion>
-    
-    <assertion id="ba">
-      <text>The request context is destroyed at the end of the servlet request, after the |service()| method ~and all |doFilter()| methods~ return.</text>
-    </assertion>
-    
-    <assertion id="bb">
-      <text>The request context is destroyed at the end of the servlet request, after ~the |service()| method and~ all |doFilter()| methods return.</text>
-    </assertion>
-    
+
     <assertion id="c">
       <text>The request scope is active during any Java EE web service invocation.</text>
     </assertion>
     
-    <assertion id="d">
-      <text>The request context is destroyed after the web service invocation completes.</text>
-    </assertion>
-    
     <assertion id="e">
       <text>The request scope is active during any asynchronous observer method notification.</text>
     </assertion>
     
-    <assertion id="f">
-      <text>The request context is destroyed after the notification completes</text>
-    </assertion>
-    
     <assertion id="ga">
       <text>The request scope is active during any remote method invocation of any EJB,~ during any asynchronous method invocation of any EJB, during any call to an EJB timeout method and during message delivery to any EJB message-driven bean.~</text>
-    </assertion>
-    
+    </assertion>    
+
     <assertion id="gb">
       <text>The request scope is active ~during any remote method invocation of any EJB~, during any asynchronous method invocation of any EJB, ~during any call to an EJB timeout method and during message delivery to any EJB message-driven bean.~</text>
     </assertion>
-    
+
     <assertion id="gc">
       <text>The request scope is active ~during any remote method invocation of any EJB, during any asynchronous method invocation of any EJB,~ during any call to an EJB timeout method ~and during message delivery to any EJB message-driven bean~.</text>
     </assertion>
-    
+
     <assertion id="gd">
       <text>The request scope is active ~during any remote method  invocation of any EJB, during any asynchronous method invocation of any EJB, during any call to an EJB timeout method and~ during message delivery to any EJB message-driven bean.</text>
     </assertion>
     
-    <assertion id="ha">
-      <text>The request context is destroyed after the remote method invocation,~ asynchronous method invocation, timeout or message delivery completes~.</text>
+    <assertion id="ge">
+      <text>The request scope is active during any message delivery to a |MessageListener| for a JMS topic or queue obtained from the Java EE component environment.</text>
+    </assertion>    
+            
+    <assertion id="baa">
+      <text>The request context is destroyed at the end of the servlet request, after the |service()| method ~and all |doFilter()| methods~, and all |requestDestroyed()| and |onComplete()| notifications return.</text>
     </assertion>
+
+    <assertion id="bba">
+      <text>The request context is destroyed at the end of the servlet request, after ~the |service()| method and~ all |doFilter()| methods, and all |requestDestroyed()| and |onComplete()| notifications return.</text>
+    </assertion>
+
+    <assertion id="d">
+      <text>The request context is destroyed after the web service invocation completes.</text>
+    </assertion>
+
+    <assertion id="fa">
+      <text>The request context is destroyed after the asynchronous observer notification completes</text>
+    </assertion>
     
+    <assertion id="ha">
+      <text>The request context is destroyed after the EJB remote method invocation,~ asynchronous method invocation, timeout or message delivery completes~.</text>
+    </assertion>
+
     <assertion id="hb">
-      <text>The request context is destroyed after the ~remote method invocation,~ asynchronous method invocation~, timeout or message delivery completes~.</text>
+      <text>The request context is destroyed after the ~EJB remote method invocation,~ asynchronous method invocation~, timeout or message delivery completes~.</text>
     </assertion>
-    
+
     <assertion id="hc">
-      <text>The request context is destroyed after the ~remote method invocation, asynchronous method invocation,~ timeout~ or message delivery completes~.</text>
+      <text>The request context is destroyed after the ~EJB remote method invocation, asynchronous method invocation,~ timeout~ or message delivery completes~.</text>
     </assertion>
-    
+
     <assertion id="hd">
-      <text>The request context is destroyed after the ~remote method invocation, asynchronous method invocation, timeout or~ message delivery completes.</text>
+      <text>The request context is destroyed after the ~EJB remote method invocation, asynchronous method invocation, timeout or~ message delivery completes.</text>
     </assertion>
-    
-    
+
+    <assertion id="i">
+      <text>The request context is destroyed after the message delivery to the |MessageListener| completes.</text>
+    </assertion>
   </section>
-  
+
   <section id="6.7.2" title="Session context lifecycle">
     <assertion id="aa">
-      <text>The session scope is active during the |service()| method of any servlet in the web application ~and during the |doFilter()| method of any servlet filter~.</text>
+      <text>The session scope is active during the |service()| method of any servlet in the web application ~, during the |doFilter()| method of any servlet filter~ and when the container calls any |HttpSessionListener|, |AsyncListener| or |ServletRequestListener|.</text>
     </assertion>
-    
+
     <assertion id="ab">
-      <text>The session scope is active ~during the |service()| method of any servlet in the web application and~ during the |doFilter()| method of any servlet filter.</text>
+      <text>The session scope is active ~during the |service()| method of any servlet in the web application~, during the |doFilter()| method of any servlet filter and when the container calls any |HttpSessionListener|, |AsyncListener| or |ServletRequestListener|.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The session context is shared between all servlet requests that occur in the same HTTP servlet session.</text>
     </assertion>
-    
-    <assertion id="c">
-      <text>The session context is destroyed when the |HTTPSession| is invalidated ~or times out~.</text>
+
+    <assertion id="ca">
+      <text>The session context is destroyed when the |HTTPSession| times out, after all |HttpSessionListener|s have been called, and at the very end of any request in which |invalidate()| was called, after all filters and |ServletRequestListeners| have been called.</text>
     </assertion>
-    
-    <assertion id="d">
-      <text>The session context is destroyed when the |HTTPSession| ~is invalidated or~ times out.</text>
-    </assertion>
-    
   </section>
-  
+
   <section id="6.7.3" title="Application context lifecycle">
     <assertion id="aa">
-      <text>The application scope is active during the |service()| method of any servlet in the web application ~and during the |doFilter()| method of any servlet filter.~</text>
+      <text>The application scope is active during the |service()| method of any servlet in the web application ~, during the |doFilter()| method of any servlet filter and when the container calls any |ServletContextListener|, |HttpSessionListener|, |AsyncListener| or |ServletRequestListener|.~</text>
     </assertion>
-    
+
     <assertion id="ab">
-      <text>The application scope is active during ~the |service()| method of any servlet in the web application and during~ the |doFilter()| method of any servlet filter.</text>
+      <text>The application scope is active during ~the |service()| method of any servlet in the web application, during~ the |doFilter()| method of any servlet filter and when the container calls any |ServletContextListener|, |HttpSessionListener|, |AsyncListener| or |ServletRequestListener|.~</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The application scope is active during any Java EE web service invocation.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>The application scope is active during any asynchronous observer method notification.</text>
     </assertion>
-    
+
     <assertion id="da">
       <text>The application scope is also active during any remote method invocation of any EJB~, during any asynchronous method invocation of any EJB, during any call to an EJB timeout method and during message delivery to any EJB message-driven bean.</text>
     </assertion>
-    
+
     <assertion id="db">
       <text>The application scope is also active ~during any remote method invocation of any EJB~, during any asynchronous method invocation of any EJB~, during any call to an EJB timeout method and during message delivery to any EJB message-driven bean.~</text>
     </assertion>
-    
+
     <assertion id="dc">
       <text>The application scope is also active ~during any remote method invocation of any EJB, during any asynchronous method invocation of any EJB,~ during any call to an EJB timeout method~ and during message delivery to any EJB message-driven bean.~</text>
     </assertion>
-    
+
     <assertion id="dd">
       <text>The application scope is also active ~during any remote method invocation of any EJB, during any asynchronous method invocation of any EJB, during any call to an EJB timeout method and~ during message delivery to any EJB message-driven bean.</text>
     </assertion>
     
+    <assertion id="de">
+      <text>The application scope is active during any message delivery to a |MessageListener| for a JMS topic or queue obtained from the Java EE component environment.</text>
+    </assertion>
+    
+    <assertion id="df">
+      <text>The application scope is active when the disposer method or |@PreDestroy| callback of any bean with any normal scope other than |@ApplicationScoped| is called.</text>
+    </assertion>
+
     <assertion id="ea">
       <text>The application context is shared between all servlet requests~, asynchronous observer method notifications, web service invocations, EJB remote method invocations, EJB asynchronous method invocations, EJB timeouts and message deliveries to message driven beans ~that execute within the same application.</text>
     </assertion>
-    
+
     <assertion id="eb">
       <text>The application context is shared between all ~servlet requests,~ asynchronous observer method notifications~, web service invocations, EJB remote method invocations, EJB asynchronous method invocations, EJB timeouts and message deliveries to message driven beans ~that execute within the same application.</text>
     </assertion>
-    
+
     <assertion id="ec">
       <text>The application context is shared between all ~servlet requests, asynchronous observer method notifications,~ web service invocations~, EJB remote method invocations, EJB asynchronous method invocations, EJB timeouts and message deliveries to message driven beans ~that execute within the same application~.</text>
     </assertion>
-    
+
     <assertion id="ed">
       <text>The application context is shared between all ~servlet requests, asynchronous observer method notifications, web service invocations,~ EJB remote method invocations~, EJB asynchronous method invocations, EJB timeouts and message deliveries to message driven beans ~that execute within the same application~.</text>
     </assertion>
-    
+
     <assertion id="ee">
       <text>The application context is shared between all ~servlet requests, asynchronous observer method notifications, web service invocations, EJB remote method invocations,~ EJB asynchronous method invocations~, EJB timeouts and message deliveries to message driven beans ~that execute within the same application.</text>
     </assertion>
-    
+
     <assertion id="ef">
       <text>The application context is shared between all ~servlet requests, asynchronous observer method notifications, web service invocations, EJB remote method invocations, EJB asynchronous method invocations,~ EJB timeouts ~and message deliveries to message driven beans ~that execute within the same application.</text>
     </assertion>
-    
+
     <assertion id="eg">
       <text>The application context is shared between all ~servlet requests, asynchronous observer method notifications, web service invocations, EJB remote method invocations, EJB asynchronous method invocations, EJB timeouts and~ message deliveries to message driven beans ~that execute within the same application.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>The application context is destroyed when the application
 is undeployed.</text>
@@ -2799,189 +2778,203 @@
 
   <section id="6.7.4" title="Conversation context lifecycle">
     <assertion id="a">
-      <text>For a JSF faces request, the conversation context is active from the beginning of the apply request values phase, until the response is complete</text>
+      <text>The conversation scope is active during all standard lifecycle phases of any JSF faces or non-faces request.</text>
     </assertion>
-    
-    <assertion id="b">
-      <text>For a JSF non-faces request, the context is active during the render response phase</text>
-    </assertion>
-    
+
     <assertion id="c">
-      <text>Any JSF request has exactly one associated conversation</text>
+      <text>Any JSF request has exactly one associated conversation.</text>
     </assertion>
-    
-    <assertion id="d">
-      <text>The conversation associated with a JSF request is determined at the end of the restore view phase and does not change during the request</text>
+
+    <assertion id="da">
+    <text>The conversation associated with a JSF request is determined at the beginning of the restore view phase and does not change during the request.</text>
     </assertion>
-    
+
     <assertion id="e">
-      <text>By default, a conversation is transient</text>
+      <text>By default, a conversation is transient.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>A transient conversation may be marked long-running by calling |Conversation.begin()|</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>A long-running conversation may be marked transient by calling |Conversation.end()|</text>
     </assertion>
-    
+
     <assertion id="ha">
       <text>All long-running conversations have a string-valued unique identifier, _which may be set by the application_ when the conversation is marked long-running~, or generated by the container~</text>
     </assertion>
-    
+
     <assertion id="hb">
       <text>All long-running conversations have a string-valued unique identifier, ~which may be set by the application when the conversation is marked long-running,~ or generated by the container</text>
     </assertion>
+        
+    <assertion id="j">
+      <text>If the conversation associated with the current JSF request is in the transient state at the end of a JSF request, it is destroyed, and the conversation context is also destroyed.</text>
+    </assertion>
+
+    <assertion id="k">
+      <text>If the conversation associated with the current JSF request is in the long-running state at the end of a JSF request, it is not destroyed.</text>
+    </assertion>
+
+    <assertion id="l">
+      <text>The long-running conversation context associated with a request that renders a JSF view is automatically propagated to any faces request (JSF form submission) that originates from that rendered page.</text>
+    </assertion>
+
+    <assertion id="m">
+      <text>The long-running conversation context associated with a request that results in a JSF redirect (via a navigation rule) is automatically propagated to the resulting non-faces request, and to any other subsequent request to the same URL. This is accomplished via use of a GET request parameter named cid containing the unique identifier of the conversation.</text>
+    </assertion>
+
+    <assertion id="n">
+      <text>The long-running conversation associated with a request may be propagated to any non-faces request via use of a GET request parameter named |cid| containing the unique identifier of the conversation. In this case, the application must manage this request parameter.</text>
+    </assertion>
+
+    <assertion id="o">
+      <text>When no conversation is propagated to a JSF request, the request is associated with a new transient conversation.</text>
+    </assertion>
+
+    <assertion id="p">
+      <text>All long-running conversations are scoped to a particular HTTP servlet session and may not cross session boundaries.</text>
+    </assertion>
+
+    <assertion id="qa">
+  <text>When the HTTP servlet session is invalidated, all long-running conversation contexts created during the current session are destroyed, after the servlet |service()| method completes.</text>
+    </assertion>
+
+    <assertion id="r" testable="false">
+      <text>The container is permitted to arbitrarily destroy any long-running conversation that is associated with no current JSF request, in order to conserve resources</text>
+      <note>In other words, this is unspecified</note>
+    </assertion>
+
+    <assertion id="ta" testable="false">
+      <text>The conversation timeout, which may be specified by calling |Conversation.setTimeout()| is a hint to the container that a conversation should not be destroyed if it has been active within the last given interval in milliseconds.</text>
+      <note>Not required</note>
+    </assertion>
     
+    <assertion id="tb">
+  <text>If the propagated conversation cannot be restored, the container must associate the request with a new transient conversation and throw an exception of type |javax.context.NonexistentConversationException| from the restore view phase of the JSF lifecycle.  The application may handle this exception using the JSF |ExceptionHandler|.</text>
+    </assertion>    
+
+    <assertion id="ua">
+  <text>The container ensures that a long-running conversation may be associated with at most one request at a time, by blocking or rejecting concurrent requests.  If the container rejects a request, it must associate the request with a new transient conversation and throw an exception of type |javax.context.BusyConversationException| from the restore view phase of the JSF lifecycle.  The application may handle this exception using the JSF |ExceptionHandler|.</text>
+    </assertion>
+  </section>
+  
+  <section id="6.7.5" title="The Conversation interface">
     <assertion id="iaa">
-      <text>The container provides a built-in bean with bean type |Conversation|~, scope |@RequestScoped|, deployment type |@Standard| and binding |@Current|, named |javax.enterprise.context.conversation|~</text>
+      <text>The container provides a built-in bean with bean type |Conversation|~, scope |@RequestScoped|, and binding |@Current|, named |javax.enterprise.context.conversation|~</text>
     </assertion>
-    
+
     <assertion id="ib">
-      <text>The container provides a built-in bean with ~bean type |Conversation|~, scope |@RequestScoped|~, deployment type |@Standard| and binding |@Current|, named |javax.enterprise.context.conversation|~</text>
+      <text>The container provides a built-in bean with ~bean type |Conversation|~, scope |@RequestScoped|~, and binding |@Current|, named |javax.enterprise.context.conversation|~</text>
     </assertion>
-    
-    <assertion id="ic">
-      <text>The container provides a built-in bean with~ bean type |Conversation|, scope |@RequestScoped|,~ deployment type |@Standard|~ and binding |@Current|, named |javax.enterprise.context.conversation|~</text>
-    </assertion>
-    
+
     <assertion id="id">
-      <text>The container provides a built-in bean with bean type ~|Conversation|, scope |@RequestScoped|, deployment type |@Standard| and~ binding |@Current|~, named |javax.enterprise.context.conversation|~</text>
+      <text>The container provides a built-in bean with bean type ~|Conversation|, scope |@RequestScoped|, and~ binding |@Current|~, named |javax.enterprise.context.conversation|~</text>
     </assertion>
-    
+
     <assertion id="ie">
-      <text>The container provides a built-in bean with bean type ~|Conversation|, scope |@RequestScoped|, deployment type |@Standard| and binding |@Current|,~ named |javax.enterprise.context.conversation|</text>
-    </assertion>
+      <text>The container provides a built-in bean with bean type ~|Conversation|, scope |@RequestScoped|, and binding |@Current|,~ named |javax.enterprise.context.conversation|</text>
+    </assertion>    
     
     <assertion id="j">
-      <text>If the conversation associated with the current JSF request is in the transient state at the end of a JSF request, it is destroyed, and the conversation context is also destroyed</text>
+      <text>|begin()| marks the current transient conversation long-running.  A conversation identifier may, optionally, be specified.  If no conversation identifier is specified, an identifier is generated by the container.</text>
     </assertion>
     
     <assertion id="k">
-      <text>If the conversation associated with the current JSF request is in the long-running state at the end of a JSF request, it is not destroyed</text>
+      <text>|end()| marks the current long-running conversation transient.</text>
     </assertion>
     
     <assertion id="l">
-      <text>The long-running conversation context associated with a request that renders a JSF view is automatically propagated to any faces request (JSF form submission) that originates from that rendered page</text>
+      <text>|getId()| returns the identifier of the current long-running conversation, or a null value of the current conversation is transient.</text>
     </assertion>
     
     <assertion id="m">
-      <text>The long-running conversation context associated with a request that results in a JSF redirect (via a navigation rule) is automatically propagated to the resulting non-faces request, and to any other subsequent request to the same URL. This is accomplished via use of a GET request parameter named cid containing the unique identifier of the conversation</text>
+      <text>|getTimeout()| returns the timeout, in milliseconds, of the current conversation.</text>
     </assertion>
     
     <assertion id="n">
-      <text>The long-running conversation associated with a request may be propagated to any non-faces request via use of a GET request parameter named cid containing the unique identifier of the conversation. In this case, the application must manage this request parameter</text>
+      <text>|setTimeout()| sets the timeout of the current conversation.</text>
     </assertion>
     
     <assertion id="o">
-      <text>When no conversation is propagated to a JSF request, the request is associated with a new transient conversation</text>
+      <text>|isTransient()| returns |true| if the conversation is marked transient, or |false| if it is marked long-running.</text>
     </assertion>
     
     <assertion id="p">
-      <text>All long-running conversations are scoped to a particular HTTP servlet session and may not cross session boundaries</text>
+      <text>If any method of |Conversation| is called when the conversation scope is not active, a |ContextNotActiveException| is thrown.</text>
     </assertion>
     
     <assertion id="q">
-      <text>When the HTTP servlet session is invalidated, all long-running conversation contexts created during the current session are destroyed</text>
+      <text>If |end()| is called, and the current conversation is marked transient, an |IllegalStateException| is thrown.</text>
     </assertion>
     
-    <assertion id="r" testable="false">
-      <text>The container is permitted to arbitrarily destroy any long-running conversation that is associated with no current JSF request, in order to conserve resources</text>
-      <note>In other words, this is unspecified</note>
+    <assertion id="r">
+      <text>If |begin()| is called, and the current conversation is already marked long-running, an |IllegalStateException| is thrown.</text>
     </assertion>
     
     <assertion id="s">
-      <text>If the propagated conversation cannot be restored, the request is associated with a new transient conversation</text>
+      <text>If |begin()| is called with an explicit conversation identifier, and a long-running conversation with that identifier already exists, an |IllegalArgumentException| is thrown.</text>
     </assertion>
+  </section>
+
+  <section id="7" title="Lifecycle of contextual instances">
     
-    <assertion id="t" testable="false">
-      <text>The method |Conversation.setTimeout()| is a hint to the container that a conversation should not be destroyed if it has been active within the last given interval in milliseconds</text>
-      <note>Not required</note>
-    </assertion>
+  </section>
+  
+  <section id="7.1" title="Restriction upon bean instantiation">
     
-    <assertion id="u" testable="false">
-      <text>The container ensures that a long-running conversation may be associated with at most one request at a time, by blocking or rejecting concurrent requests</text>
-      <note>Cannot test as their as what happens is not well defined</note>
-    </assertion>  
   </section>
-   
-  <section id="7" title="Bean lifecycle">
-    <assertion id="a">
-      <text>To create a contextual instance of a session bean, the container creates an EJB local object reference</text>
+  
+  <section id="7.2" title="Container invocations and interception">
+    <assertion id="e">
+      <text>When the container invokes a method of a bean, if, and only if, the invocation is a business method invocation it passes through the method interceptor and decorator stacks, ~and in the case of a session bean, it is subject to EJB services such a declarative transaction management, concurrency, security and asynchronicity, as defined by the EJB specification.~</text>
     </assertion>
     
-    <assertion id="b">
-      <text>To create a contextual instance of a producer method bean, the container calls the producer method</text>
+    <assertion id="f">
+      <text>When the container invokes a method of a bean, if, and only if, the invocation is a business method invocation it passes through the method interceptor and decorator stacks, and in the case of a session bean, _it is subject to EJB services such a declarative transaction management, concurrency, security and asynchronicity, as defined by the EJB specification._</text>
     </assertion>
     
-    <assertion id="c">
-      <text>To create a contextual instance of a producer field bean, the container retrieves the current value of the field</text>
+    <assertion id="g">
+      <text>If the invocation is not a business method invocation, it is treated as a normal Java method call and is not intercepted by the container.</text>
     </assertion>
     
-    <assertion id="d">
-      <text>To create a contextual instance of a managed bean, the container calls the bean constructor</text>
+    <assertion id="h">
+      <text>Invocations of initializer methods by the container are not business method invocations.</text>
     </assertion>
     
-    <assertion id="e">
-      <text>To destroy a contextual instance of a stateful session bean, the container removes the EJB instance</text>
+    <assertion id="i">
+      <text>Invocations of producer, disposer and observer methods by the container are business method invocations are are intercepted by method interceptors and decorators.</text>
     </assertion>
     
-    <assertion id="f">
-      <text>To destroy a contextual instance of a producer method bean, the container calls the disposal method, if any</text>
-    </assertion>
-  </section>
-  
-  <section id="7.1" title="Container invocations and interception">
-    <assertion id="a">
-      <text>Invocations of initializer methods by the container are not business method invocations and are never intercepted.</text>
-    </assertion>
-    
-    <assertion id="b">
-      <text>Invocations of producer, disposal and observer methods by the container are business method invocations and are intercepted by method interceptors and decorators.</text>
-    </assertion>
-    
-    <assertion id="c">
+    <assertion id="j">
       <text>Invocation of lifecycle callbacks by the container are not business method invocations, but are intercepted by interceptors for lifecycle callbacks.</text>
     </assertion>
     
-    <assertion id="d">
+    <assertion id="k">
       <text>Invocations of interceptors and decorator methods during method or lifecycle callback interception are not business method invocations, and therefore no recursive interception occurs.</text>
     </assertion>
   </section>
   
-  <section id="7.2" title="Lifecycle of managed beans">
-    <assertion id="a">
-      <text>When the create() method of the Bean object that represents a managed bean is called, the container first calls the bean constructor to obtain an instance of the bean, as defined in Section 5.4.3, "Injection
-using the bean constructor". The container is permitted to return an instance of a container-generated subclass of the bean class, allowing interceptor and decorator bindings.</text>
-    </assertion>
+  <section id="7.3" title="Lifecycle of contextual instances">
     
-    <assertion id="b">
-      <text>Next, the container performs Java EE component environment injection, as required by the managed bean specification.</text>
+  </section>
+
+  <section id="7.3.1" title="Lifecycle of managed beans">
+    <assertion id="aa">
+      <text>When the |create()| method of the |Bean| object that represents a managed bean is called, the container obtains an instance of the bean, as defined by the Managed Beans specification, calling the bean constructor as defined by Section 5.6.3, "Injection using the bean constructor", and performing dependency injection as defined in Section 5.6.4, "Injection of fields and initializer methods".</text>
     </assertion>
     
-    <assertion id="c">
-      <text>Next, the container performs dependency injection, as defined in Section 5.4.4, "Injection of fields and initializer methods".</text>
+    <assertion id="ba">
+      <text>When the |destroy()| method is called, the container destroys the instance, as defined by the Managed Beans specification, and any dependent objects, as defined in Section 5.6.5, "Destruction of dependent objects".</text>
     </assertion>
-    
-    <assertion id="d">
-      <text>Finally, the container calls the |@PostConstruct| method, if any.</text>
-    </assertion>
-    
-    <assertion id="e">
-      <text>When the |destroy()| method is called, the container calls the |@PreDestroy| method, if any.</text>
-    </assertion>
-    
-    <assertion id="f">
-      <text>Finally, the container destroys dependent objects, as defined in Section 5.4.5, "Destruction of dependent objects.</text>
-    </assertion>
   </section>
-  
-  <section id="7.3" title="Lifecycle of stateful session beans">  
+
+  <section id="7.3.2" title="Lifecycle of stateful session beans">
     <assertion id="aa">
       <text>When the |create()| method of a |Bean| object that represents a stateful session bean that is called, the container creates and returns a container-specific internal local reference to a new session bean instance. The reference must be passivation capable. This reference is not directly exposed to the application.</text>
     </assertion>
-    
+
     <assertion id="bb">
       <text>Before injecting or returning a contextual instance to the application, the container transforms its internal reference into an object that implements the bean types expected by the application and delegates method invocations to the underlying stateful session bean instance. This object must be passivation capable.</text>
     </assertion>
@@ -2990,655 +2983,562 @@
       <text>When the |destroy()| method is called, and if the underlying EJB was not already removed by direct invocation of a remove method by the application, the container removes the stateful session bean. The |@PreDestroy| callback must be invoked by the container.</text>
     </assertion>
   </section>
-  
-  <section id="7.4" title="Lifecycle of stateless session and singleton beans">
+
+  <section id="7.3.3" title="Lifecycle of stateless session and singleton beans">
     <assertion id="a">
       <text>When the |create()| method of a Bean object that represents a stateless session or singleton session bean is called, the container
 creates and returns a container-specific internal local reference to the session bean. This reference is not directly exposed to the application.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>Before injecting or returning a contextual instance to the application, the container transforms its internal reference into an object that implements the bean types expected by the application and delegates method invocations to the underlying session bean. This object must be passivation capable.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>When the |destroy()| method is called, the container simply discards this internal reference.</text>
     </assertion>
   </section>
-  
-  <section id="7.5" title="Lifecycle of producer methods">
-    <assertion id="a">
-      <text>Any Java object may be returned by a producer method. It is not required that the returned object be an instance of another bean</text>
-    </assertion>
-    
-    <assertion id="b" testable="false">
-      <text>If an object returned by a producer method is not an instance of another bean, the container will not provide injection of other beans</text>
-      <note>In other words the behaviour is unspecified</note>
-    </assertion>
-    
-    <assertion id="c" testable="false">
-      <text>If an object returned by a producer method is not an instance of another bean, the container will not provide lifecycle callbacks</text>
-      <note>In other words the behaviour is unspecified</note>
-    </assertion>
-    
-    <assertion id="d" testable="false">
-      <text>If an object returned by a producer method is not an instance of another bean, the container will not provide method and lifecycle interception</text>
-      <note>In other words the behaviour is unspecified</note>
-    </assertion>
-    
+
+  <section id="7.3.4" title="Lifecycle of producer methods">
     <assertion id="ea">
-      <text>When the create() method of a Bean object that represents a producer method is called, the container must invoke the producer method as defined by Section 5.4.6, "Invocation of producer or disposal methods". The return value of the producer method, after method interception completes, is the new contextual instance to be returned by |Bean.create()|.</text>
+      <text>When the create() method of a |Bean| object that represents a producer method is called, the container must invoke the producer method as defined by Section 5.6.6, "Invocation of producer or disposer methods". The return value of the producer method, after method interception completes, is the new contextual instance to be returned by |Bean.create()|.</text>
     </assertion>
-    
+
     <assertion id="k">
-      <text>If the producer method returns a null value and the producer method bean has the scope |@Dependent|, the |create()| method returns a null value</text>
+      <text>If the producer method returns a null value and the producer method bean has the scope |@Dependent|, the |create()| method returns a null value.</text>
     </assertion>
-    
+
     <assertion id="l">
-      <text>If the producer method returns a null value, and the scope of the producer method is not |@Dependent|, the |create()| method throws an |IllegalProductException|</text>
+    <text>If the producer method returns a null value, and the scope of the producer method is not |@Dependent|, the |create()| method throws an |IllegalProductException|.</text>
     </assertion>
-    
+
     <assertion id="ma">
-      <text>When the destroy() method is called, and if there is a disposal method for this producer method, the container must invoke
-the disposal method as defined by Section 5.4.6, "Invocation of producer or disposal methods", passing the instance given to |destroy()| to the disposed parameter.</text>
+      <text>When the |destroy()| method is called, and if there is a disposal method for this producer method, the container must invoke the disposer method as defined by Section 5.6.6, "Invocation of producer or disposal methods", passing the instance given to |destroy()| to the disposed parameter.</text>
     </assertion>
-       
+
     <assertion id="r">
-      <text>Finally, the container destroys dependent objects</text>
-    </assertion>    
+  <text>Finally, the container destroys dependent objects, as defined in Section 5.6.5, "Destruction of dependent objects".</text>
+    </assertion>
   </section>
 
-  <section id="7.6" title="Lifecycle of producer fields">
-    <assertion id="a">
-      <text>Any Java object may be the value of a producer field</text>
-    </assertion>
-    
-    <assertion id="b">
-      <text>It is not required that the returned object of a producer field be an instance of another bean</text>
-    </assertion>
-    
-    <assertion id="c" testable="false">
-      <text>If the object returned by a producer field is not an instance of another bean, the container will not provide injection of other beans</text>
-      <note>In other words the behaviour is unspecified</note>
-    </assertion>
-    
-    <assertion id="d" testable="false">
-      <text>If the object returned by a producer field is not an instance of another bean, the container will not provide lifecycle callbacks</text>
-      <note>In other words the behaviour is unspecified</note>
-    </assertion>
-    
-    <assertion id="e" testable="false">
-      <text>If the object returned by a producer field is not an instance of another bean, the container will not provide method interception</text>
-      <note>In other words the behaviour is unspecified</note>
-    </assertion>
-    
-    <assertion id="f" testable="false">
-      <text>If the object returned by a producer field is not an instance of another bean, the container will not provide lifecycle interception</text>
-      <note>In other words the behaviour is unspecified</note>
-    </assertion>
-    
+  <section id="7.3.5" title="Lifecycle of producer fields">
     <assertion id="ga">
-      <text>When the |create()| method of a |Bean| object that represents a producer field is called, the container must access the producer field as defined by Section 5.4.7, "Access to producer field values" to obtain the current value of the field. The value of the producer field is the new contextual instance to be returned by |Bean.create()|.</text>
+      <text>When the |create()| method of a |Bean| object that represents a producer field is called, the container must access the producer field as defined by Section 5.6.7, "Access to producer field values" to obtain the current value of the field. The value of the producer field is the new contextual instance to be returned by |Bean.create()|.</text>
     </assertion>
-        
+
     <assertion id="m">
-      <text>If the producer field contains a null value and the producer field bean has the scope |@Dependent|, the create() method returns a null value</text>
+      <text>If the producer field contains a null value and the producer field bean has the scope |@Dependent|, the |create()| method returns a null value.</text>
     </assertion>
-    
+
     <assertion id="n">
-      <text>If the producer field contains a null value, and the scope of the producer method is not |@Dependent|, the |create()| method throws an |IllegalProductException|</text>
-    </assertion>    
+    <text>If the producer field contains a null value, and the scope of the producer method is not |@Dependent|, the |create()| method throws an |IllegalProductException|.</text>
+    </assertion>
   </section>
-  
-  <section id="7.7" title="Lifecycle of resources">
+
+  <section id="7.3.6" title="Lifecycle of resources">
     <assertion id="l">
       <text>When the |create()| method of a |Bean| object that represents a resource is called, the container creates and returns a container-
 specific internal reference to the Java EE component environment resource, entity manager, entity manager factory, remote EJB instance or web service reference. This reference is not directly exposed to the application.</text>
     </assertion>
-    
+
     <assertion id="m">
       <text>Before injecting or returning a contextual instance to the application, the container transforms its internal reference into an object that implements the bean types expected by the application and delegates method invocations to the underlying resource, entity manager, entity manager factory, remote EJB instance or web service reference. This object must be passivation capable.</text>
     </assertion>
-    
-    <assertion id="n">
-      <text>When the |destroy()| method is called, the container discards this internal reference.</text>
+
+    <assertion id="na">
+      <text>When the |destroy()| method is called, the container discards this internal reference.  For certain kinds of resource, for example persistence contexts, the container eventually performs additional cleanup to destroy state associated with the client or transaction, as required by the Java EE platform specification.</text>
     </assertion>
-  </section>
-  
-  <section id="7.8" title="Lifecycle of message destinations">
-    <assertion id="a" testable="false">
-  <text>An instance of a message destination is a proxy object, provided by the container, that implements all the bean types defined in Section 3.7, "JMS resources", delegating the actual implementation of these methods directly to the underlying JMS objects.  This proxy must be passivation capable.</text>
-    </assertion>
     
-    <assertion id="b">
-      <text>A message destination resource proxy object is a dependent object of the object it is injected into.</text>
-    </assertion>
-    
-    <assertion id="da">
-      <text>When the |create()| method of a |Bean| object that represents a message destination is called, the container creates and returns a proxy object.</text>
-    </assertion>
-    
-    <assertion id="e">
-      <text>The methods of this proxy object delegate to JMS objects obtained as needed using the metadata provided by the message destination declaration.</text>
-    </assertion>
-    
-    <assertion id="f">
-      <text>The Destination is obtained using the JNDI name or mapped name specified by |@Resource|.</text>
-    </assertion>
-    
-    <assertion id="g">
-      <text>The appropriate |ConnectionFactory| for the topic or queue is obtained automatically</text>
-    </assertion>
-    
-    <assertion id="h">
-      <text>The |Connection| is obtained by calling |QueueConnectionFactory.createQueueConnection()| or |TopicConnectionFactory.createTopicConnection()|</text>
-    </assertion>
-    
-    <assertion id="i" testable="false">
-      <text>The container is permitted to share a connection between multiple proxy objects</text>
-    </assertion>
-    
-    <assertion id="j">
-      <text>The |Session| object is obtained by calling |QueueConnection.createQueueSession()| or |TopicConnection.createTopicSession()|</text>
-    </assertion>
-    
-    <assertion id="k">
-      <text>The |MessageProducer| object is obtained by calling |QueueSession.createSender()| or |TopicSession.createPublisher()|</text>
-    </assertion>
-    
-    <assertion id="l">
-      <text>The |MessageConsumer| object is obtained by calling |QueueSession.createReceiver()| or |TopicSession.createSubscriber()|</text>
-    </assertion>
-    
-    <assertion id="m">
-      <text>When the |destroy()| method is called, the container must ensure that all JMS objects created by the proxy object are destroyed by calling |close()| if necessary</text>
-    </assertion>
-    
-    <assertion id="n">
-      <text>The |Connection| is destroyed by calling |Connection.close()| if necessary</text>
-    </assertion>
-    
     <assertion id="o">
-      <text>If the connection is being shared between multiple proxy objects, the container is not required to close the connection when the proxy is destroyed</text>
+      <text>The container must perform ordinary Java EE component environment injection upon any non-static field that functions as a resource declaration, as defined by the Java EE platform and Common Annotations for the Java platform specifications.</text>
     </assertion>
     
-    <assertion id="p">
-      <text>The |Session| object is destroyed by calling |Session.close()|</text>
+    <assertion id="p" testable="false">
+      <text>The container is not required to perform Java EE component environment injection upon a static field. Portable applications should not rely upon the value of a static field that functions as a resource declaration.</text>
     </assertion>
-    
-    <assertion id="q">
-      <text>The |MessageProducer| object is destroyed by calling |MessageProducer.close()|</text>
-    </assertion>
-    
-    <assertion id="r">
-      <text>The |MessageConsumer| object is destroyed by calling |MessageConsumer.close()|</text>
-    </assertion>
-    
-    <assertion id="s">
-      <text>The |close()| method of a message destination proxy object always throws an |UnsupportedOperationException|.</text>
-    </assertion>
-    
   </section>
-  
+
   <section id="8" title="Decorators">
     <assertion id="a">
       <text>Decorators may be bound to any managed bean that is not itself an interceptor or decorator or to any EJB session or message-driven bean.</text>
-    </assertion>
+    </assertion>        
   </section>
-  
+
   <section id="8.1" title="Decorator beans">
     <assertion id="a">
       <text>A decorator is a managed bean.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The set of decorated types of a decorator includes all interfaces implemented directly or indirectly by the bean class, except for |java.io.Serializable|.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>The decorator bean class and its superclasses are not decorated types of the decorator.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>The decorator class may be abstract.</text>
     </assertion>
+    
+    <assertion id="e">
+      <text>Decorators of a session bean must comply with the bean provider programming restrictions defined by the EJB specification.</text>
+    </assertion>
+    
+    <assertion id="f">
+      <text>Decorators of a stateful session bean must comply with the rules for instance passivation and conversational state defined by the EJB specification.</text>
+    </assertion>
   </section>
-  
+
   <section id="8.1.1" title="Declaring a decorator">
     <assertion id="a">
       <text>A decorator is declared by annotating the bean class with the |@javax.decorator.Decorator| stereotype.</text>
     </assertion>
   </section>
-  
+
   <section id="8.1.2" title="Decorator delegate injection points">
     <assertion id="a">
-      <text>All decorators have a delegate injection point.  A delegate injection point is an injection point of the bean class. The type and bindings of the injection point are called the delegate type and delegate bindings. The delegate injection point must be be declared by annotating the field with the @javax.decorator.Decorates annotation.</text>
+      <text>All decorators have a delegate injection point.  A delegate injection point is an injection point of the bean class. The type and bindings of the injection point are called the delegate type and delegate bindings. The delegate injection point must be be declared by annotating the injection point with the annotation |@javax.decorator.Decorates|.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The decorator applies to any bean that is eligible for injection to the delegate injection point, according to the rules defined
 in Section 5.1, "Typesafe resolution algorithm".</text>
     </assertion>
-    
+
     <assertion id="ca">
       <text>A decorator must have exactly one delegate injection point. If a decorator has more than one delegate injection point~, or does not have a delegate injection point,~ the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="cb">
       <text>A decorator must have exactly one delegate injection point. If a decorator ~has more than one delegate injection point, or~ does not have a delegate injection point, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
     
+    <assertion id="cc">
+      <text>The delegate injection point must be an injected field, ~initializer method parameter or bean constructor method parameter~. If an injection point that is not an injected field, ~initializer method parameter or bean constructor method parameter ~is annotated |@Decorates|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    </assertion>
+    
+    <assertion id="cd">
+      <text>The delegate injection point must be an ~injected field~, initializer method parameter or ~bean constructor method parameter~. If an injection point that is not an ~injected field~, initializer method parameter or ~bean constructor method parameter ~is annotated |@Decorates|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    </assertion>
+    
+    <assertion id="ce">
+      <text>The delegate injection point must be an ~injected field, initializer method parameter~ or bean constructor method parameter. If an injection point that is not an ~injected field, initializer method parameter~ or bean constructor method parameter is annotated |@Decorates|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    </assertion>
+    
+    <assertion id="cf">
+      <text>If a bean class that is not a decorator has an injection point annotated |@Decorates|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    </assertion>
+
     <assertion id="d">
       <text>If a decorator applies to a managed bean, and the bean class is declared final, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If a decorator applies to a managed bean with a non-static, non-private, final method, and the decorator also implements that method, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="f">
-      <text>When the container must inject a delegate object to the delegate injection point, the delegate object implements the delegate
-type and delegates method invocations along the decorator stack.</text>
+      <text>The container must inject a delegate object to the delegate injection point.  The delegate object implements the delegate type and delegates method invocations along the decorator stack.</text>
     </assertion>
   </section>
-  
+
   <section id="8.1.3" title="Decorated types of a decorator">
     <assertion id="a">
       <text>The delegate type of a decorator must implement or extend every decorated type. If the delegate type does not implement or extend a decorated type of the decorator, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
     
+    <assertion id="ab">
+      <text>If a decorated type is a parameterized type and the delegate type does not have exactly the same type parameters as the decorated type, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    </assertion>
+
     <assertion id="b">
       <text>A decorator is not required to implement the delegate type.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>A decorator may be an abstract Java class, and is not required to implement every method of every decorated type.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>The decorator intercepts every method declared by a decorated type of the decorator, and that is implemented by the bean class of the decorator.</text>
     </assertion>
   </section>
-  
+
   <section id="8.2" title="Decorator enablement and ordering">
     <assertion id="a">
-      <text>By default, decorators are not enabled. A decorator must be explicitly enabled by listing its bean class under the
-|&lt;Decorators&gt;| element in |beans.xml|.</text>
+    <text>By default, decorators are not enabled. A decorator must be explicitly enabled by listing its bean class under the |&lt;Decorators&gt;| element in |beans.xml| file of the bean deployment archive.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The order of the decorator declarations determines the decorator ordering. Decorators which occur earlier in the list are called first.</text>
     </assertion>
     
-    <assertion id="c">
-      <text>If a class listed under the |&lt;Decorators&gt;| element is not the bean class of at least one decorator, the container automatically
-detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".
-      </text>
+    <assertion id="bb">
+      <text>Each child |&lt;class&gt;| element must specify the name of a decorator bean class.  If there is no class with the specified name, or if the class with the specified name is not a decorator bean class, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
     
-    <assertion id="d">
-      <text>If the bean class of a decorator with a disabled deployment type is listed under the |&lt;Decorators&gt;| element, the container
-automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    <assertion id="bc">
+      <text>If the same class is listed twice under the |&lt;decorators&gt;| element, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
-    <assertion id="e">
-      <text>If the |&lt;Decorators&gt;| element is specified in more than one |beans.xml| document, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-    </assertion>
-    
+
     <assertion id="f">
       <text>Decorators are called after interceptors.</text>
     </assertion>
   </section>
-  
+
   <section id="8.3" title="Decorator resolution">
-    <assertion id="a">
-      <text>The following algorithm must be used by the container when resolving decorators for a certain bean - First, the container identifies the set of matching enabled decorators such that the bean is eligible for injection to the delegate injection point according to the rules defined in Section 5.1, "Typesafe resolution algorithm". Next, the container orders the matching decorators according to the decorator ordering specified in Section 8.2, "Decorator enablement and ordering".</text>
+    <assertion id="aa">
+      <text>The following procedure must be used by the container when resolving decorators for a certain bean - First, the container identifies the set of matching decorators for which the bean is eligible for injection to the delegate injection point according to the rules defined in Section 5.3, "Typesafe resolution", and for which the decorator is enabled in the bean deployment archive of the bean. Next, the container orders the matching decorators according to the decorator ordering specified in Section 8.2, "Decorator enablement and ordering".</text>
     </assertion>
+    
+    <assertion id="b">
+      <text>For a custom implementation of the Decorator interface defined in Section 11.1.1, "The Decorator interface", the container calls |getDelegateType()|, |getDelegateBindings()| and |getDecoratedTypes()| to determine the delegate type and bindings and decorated types of the decorator.</text>
+    </assertion>
   </section>
-  
+
   <section id="8.4" title="Decorator stack creation">
     <assertion id="a">
       <text>When a bean with decorators is created, the container must
 identify the decorators for the bean according to Section 8.3, "Decorator resolution", and for each decorator, obtain a contextual reference, as defined in Section 6.5.3, "Contextual reference for a bean", and build an ordered list of the decorator instances.</text>
     </assertion>
   </section>
-  
+
   <section id="8.5" title="Decorator invocation">
     <assertion id="a">
       <text>Whenever a business method is invoked on an instance of a bean with decorators, the container intercepts the business method invocation and, after processing the interceptor stack, invokes decorators of the bean. The container searches for the first decorator in the decorator stack for the instance that implements the method that is being
 invoked as a business method.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>If no such decorator exists, the container invokes the business method of the intercepted instance.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Otherwise, the container calls the method of the decorator.</text>
     </assertion>
-        
+
     <assertion id="d">
       <text>When any decorator is invoked by the container, it may in turn invoke a method of the delegate. The container intercepts the delegate invocation and searches for the first decorator in the decorator stack for the instance such that the decorator implements the method that is being invoked upon the delegate, and the decorator has not previously been invoked during this business method invocation.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If no such decorator exists, the container invokes the business method of the intercepted instance.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>Otherwise, the container calls the method of the decorator.</text>
     </assertion>
   </section>
-  
+
   <section id="9" title="Interceptor bindings">
-    
+
   </section>
-  
+
   <section id="9.1" title="Interceptor binding types">
     <assertion id="a">
       <text>An interceptor binding type is a Java annotation defined as |@Target({TYPE, METHOD})| or |@Target(TYPE)| and |@Retention(RUNTIME)|.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>An interceptor binding type may be declared by specifying the |@javax.interceptor.InterceptorBindingType| metaannotation.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Multiple interceptors may be bound to the same interceptor binding type or types.</text>
     </assertion>
   </section>
-  
+
   <section id="9.1.1" title="Interceptor binding types with additional interceptor bindings">
     <assertion id="a">
       <text>An interceptor binding type may declare other interceptor bindings.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>Interceptor bindings are transitive�an interceptor binding declared by an interceptor binding type is inherited by all beans and other interceptor binding types that declare that interceptor binding type.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Interceptor binding types declared |@Target(TYPE)| may not be applied to interceptor binding types declared |@Target({TYPE, METHOD})|.</text>
-    </assertion>   
+    </assertion>
   </section>
-  
+
   <section id="9.1.2" title="Interceptor bindings for stereotypes">
     <assertion id="a">
       <text>Interceptor bindings may be applied to a stereotype by annotating the stereotype annotation</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>An interceptor binding declared by a stereotype are inherited by any bean that declares that stereotype.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>If a stereotype declares interceptor bindings, it must be defined as |@Target(TYPE)|.</text>
     </assertion>
   </section>
-  
+
   <section id="9.2" title="Declaring the interceptor bindings of an interceptor">
     <assertion id="a">
-      <text>The interceptor bindings of an interceptor are specified by annotating the interceptor bean class with the binding types and the |@javax.interceptor.Interceptor| annotation.</text>
+      <text>The interceptor bindings of an interceptor are specified by annotating the interceptor class with the binding types and the |@javax.interceptor.Interceptor| annotation.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>If an interceptor does not declare an |@Interceptor| annotation, it must be bound to beans using |@Interceptors| or |ejb-jar.xml|.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>All interceptors declared using |@Interceptor| must specify at least one interceptor binding. If an interceptor declared using |@Interceptor| does not declare any interceptor binding, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>An interceptor for lifecycle callbacks may only declare interceptor binding types that are defined as |@Target(TYPE)|. If an
 interceptor for lifecycle callbacks declares an interceptor binding type that is defined |@Target({TYPE, METHOD})|, the containerautomatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-    </assertion>  
+    </assertion>
   </section>
-  
+
   <section id="9.3" title="Binding an interceptor to a bean">
     <assertion id="a">
       <text>An interceptor binding may be declared by annotating the bean class, or a method of the bean class, with the interceptor binding type.</text>
     </assertion>
-    
-    <assertion id="b">
-      <text>Interceptors may be enabled or disabled at deployment time.</text>
-    </assertion>
-    
-    <assertion id="c">
-      <text>Disabled interceptors are never called at runtime.</text>
-    </assertion>
   </section>
-  
+
   <section id="9.4" title="Interceptor enablement and ordering">
     <assertion id="a">
-      <text>By default, interceptors bound via interceptor bindings are not enabled. An interceptor must be explicitly enabled by listing
-its bean class under the |&lt;Interceptors&gt;| element in |beans.xml|.</text>
+      <text>By default, a bean deployment archive has no enabled interceptors bound via interceptor bindings. An interceptor must be explicitly enabled by listing
+its class under the |&lt;Interceptors&gt;| element of the |beans.xml| file for the bean deployment archive.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The order of the interceptor declarations determines the interceptor ordering. Interceptors which occur earlier in the list are
 called first.</text>
     </assertion>
-    
-    <assertion id="c">
-      <text>If a class listed under the |&lt;Interceptors&gt;| element is not the bean class of at least one interceptor, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+
+    <assertion id="ca">
+      <text>Each child |&lt;class&gt;| element must specify the name of an interceptor class.  If there is no class with the specified name, or if the class with the specified name is not an interceptor class, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
     
-    <assertion id="d">
-      <text>If the bean class of an interceptor with a disabled deployment type is listed under the |&lt;Interceptors&gt;| element, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    <assertion id="cb">
+      <text>If the same class is listed twice under the |&lt;interceptors&gt;| element, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
-    <assertion id="e">
-      <text>If the |&lt;Interceptors&gt;| element is specified in more than one |beans.xml| document, the container automatically detects the
-problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-    </assertion>
-    
+
     <assertion id="f">
-      <text>Interceptors declared using |@Interceptors| or in |ejb-jar.xml| are called before interceptors declared using interceptor
-bindings.</text>
+      <text>Interceptors declared using |@Interceptors| or in |ejb-jar.xml| are called before interceptors declared using interceptor bindings.</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>Interceptors are called before decorators.</text>
     </assertion>
   </section>
-  
+
   <section id="9.5" title="Interceptor resolution">
     <assertion id="a">
-      <text>For a lifecycle callback, the bean interceptor bindings include the interceptor bindings declared by the bean at the class
-level, including interceptor bindings declared as meta-annotations of other interceptor bindings, recursively, and of stereotypes.
+      <text>For a lifecycle callback, the bean interceptor bindings include the interceptor bindings declared by the bean at the class level, including interceptor bindings declared as meta-annotations of other interceptor bindings, recursively, and of stereotypes.
       </text>
     </assertion>
-    
+
     <assertion id="b">
-      <text>For a method, the bean interceptor bindings include the interceptor bindings declared by the bean at the class level, including
-interceptor bindings declared as meta-annotations of other interceptor bindings, recursively, and of stereotypes, together with all interceptor bindings declared at the method level, including interceptor bindings declared as meta-annotations of other interceptor bindings, recursively.</text>
+      <text>For a method, the bean interceptor bindings include the interceptor bindings declared by the bean at the class level, including interceptor bindings declared as meta-annotations of other interceptor bindings, recursively, and of stereotypes, together with all interceptor bindings declared at the method level, including interceptor bindings declared as meta-annotations of other interceptor bindings, recursively.</text>
     </assertion>
-    
-    <assertion id="c">
-      <text>First, the container identifies the set of matching enabled interceptors where for each declared interceptor binding, there exists an interceptor binding in the set of bean interceptor bindings with (a) the same type and (b) the same annotation member value for each member which is not annotated |@javax.enterprise.inject.NonBinding| (see Section
-9.5.2, "Interceptor binding types with members").</text>
+
+    <assertion id="ca">
+  <text>First, the container identifies the set of matching enabled interceptors where, for each interceptor binding declared by the interceptor, there exists an interceptor binding in the set of bean interceptor bindings with (a) the same type and (b) the same annotation member value for each member which is not annotated |@javax.enterprise.inject.NonBinding| (see Section 9.5.2, "Interceptor binding types with members"), and the interceptor intercepts the given kind of lifecycle callback or business method, and the interceptor is enabled in the bean deployment archive of the bean.</text>
     </assertion>
 
-    <assertion id="d">
-      <text>Next, the container narrows the set of matching interceptors according to whether the interceptor intercepts the given kind of lifecycle callback or business method.</text>
+    <assertion id="ea">
+      <text>Next, the container orders the matching interceptors according to the interceptor ordering specified in Section 9.4, "Interceptor enablement and ordering".</text>
     </assertion>
     
-    <assertion id="e">
-      <text>Next, the container orders the matching interceptors according to the interceptor ordering specified in Section 9.4, "Interceptor enablement and ordering" and returns the resulting list of interceptors. If no matching interceptors exist in the set, an empty list is returned.</text>
-    </assertion> 
+    <assertion id="f">
+      <text>For a custom implementation of the Interceptor interface defined in Section 11.1.2, "The Interceptor interface", the container calls |getInterceptorBindings()| to determine the interceptor bindings of the interceptor and |intercepts()| to determine if the interceptor intercepts a given kind of lifecycle callback or business method.</text>
+    </assertion>
   </section>
-  
+
   <section id="9.5.1" title="Interceptors with multiple bindings">
     <assertion id="a">
       <text>An interceptor class may specify multiple interceptor bindings, in which case the interceptor will be applied only to beans
 that declare all the bindings at the class level, and to methods of beans for which every binding appears at either the method or class level.</text>
     </assertion>
   </section>
-  
+
   <section id="9.5.2" title="Interceptor binding types with members">
     <assertion id="a">
       <text>Interceptor binding types may have annotation members.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>An annotation member may be excluded from consideration using the @NonBinding annotation.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Array-valued or annotation-valued members of an interceptor binding type must be annotated |@NonBinding|. If an array-valued or annotation-valued member of an interceptor binding type is not annotated |@NonBinding|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
+    
+    <assertion id="d">
+      <text>If the set of interceptor bindings of a bean or interceptor, including bindings inherited from stereotypes and other interceptor bindings, has two instances of a certain interceptor binding type and the instances have different values of some annotation member, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    </assertion>
   </section>
 
   <section id="10" title="Events">
-  
+
   </section>
-  
+
   <section id="10.1" title="Event types and binding types">
-  
+
     <assertion id="aa">
       <text>An event object is an instance of a concrete Java class with no type variables.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>The event types of the event include all superclasses and interfaces of the runtime class of the event object.</text>
     </assertion>
     
+    <assertion id="cb">
+      <text>An event type may not contain a type variable.</text>
+    </assertion>
+
     <assertion id="d">
       <text>An event binding type is a Java annotation defined as |@Target({FIELD, PARAMETER})| ~or |@Target({METHOD, FIELD, PARAMETER, TYPE})| and |@Retention(RUNTIME)|~</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>An event binding type is a Java annotation defined as ~|@Target({FIELD, PARAMETER})| or~ |@Target({METHOD, FIELD, PARAMETER, TYPE})| ~and |@Retention(RUNTIME)|~</text>
     </assertion>
-     
+
     <assertion id="f">
       <text>An event binding type is a Java annotation defined as ~|@Target({FIELD, PARAMETER})| or |@Target({METHOD, FIELD, PARAMETER, TYPE})| and ~|@Retention(RUNTIME)|</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>All event binding types must specify the |@javax.enterprise.inject.BindingType| meta-annotation</text>
     </assertion>
-    
+
     <assertion id="i">
       <text>Every event has the binding |@javax.enterprise.inject.Any|, even if it does not explicitly declare this binding.</text>
     </assertion>
-  </section>
     
-  <section id="10.2" title="Observer resolution algorithm">
+    <assertion id="j">
+      <text>Any Java type may be an observed event type.</text>
+    </assertion>
+  </section>
+
+  <section id="10.2" title="Observer resolution">
     <assertion id="h">
-      <text>An event consumer will be notified of an event if the observed event type it specifies is one of the event types of the event, and if all the observed event bindings it specifies are event bindings of the event.</text>
+      <text>An observer method will be notified of an event if the observed event type it specifies is one of the event types of the event, and if all the observed event bindings it specifies are event bindings of the event.</text>
     </assertion>
-    
+
     <assertion id="j">
       <text>If the runtime type of the event object contains a type variable, the container must throw an |IllegalArgumentException|.</text>
-    </assertion>   
+    </assertion>
   </section>
   
-  <section id="10.2.1" title="Event binding types with members">
+  <section id="10.2.1" title="Assignability of type variables, raw and parameterized types">
     <assertion id="a">
-      <text>The binding type for an |Event| binding may have annotation members</text>
+      <text>An event type is considered assignable to a type variable if the event type is assignable to the upper bound, if any.</text>
     </assertion>
     
+    <assertion id="b">
+      <text>A parameterized event type is considered assignable to a raw observed event type if the raw types are identical.</text>
+    </assertion>
+    
+    <assertion id="c">
+      <text>A parameterized event type is considered assignable to a parameterized observed event type if they have identical raw type and for each parameter the observed event type parameter is an actual type with identical raw type to the event type parameter, and, if the type is parameterized, the event type parameter is assignable to the observed event type parameter according to these rules, or the observed event type parameter is a wildcard and the event type parameter is assignable to the upper bound, if any, of the wildcard and assignable from the lower bound, if any, of the wildcard, or the observed event type parameter is a type variable and the event type parameter is assignable to the upper bound, if any, of the type variable.</text>
+    </assertion>
+  </section>
+
+  <section id="10.2.2" title="Event binding types with members">
+    <assertion id="a">
+      <text>The binding type for an |Event| binding may have annotation members.</text>
+    </assertion>
+
     <assertion id="b" testable="false">
-      <text>The container uses |equals()| to compare event binding type member values</text>
+    <text>The container uses |equals()| to compare event binding type member values.</text>
       <note>Since only primitive types are allowed, the call to equals() cannot be checked</note>
-    </assertion>        
+    </assertion>
   </section>
-  
-  <section id="10.2.2" title="Multiple event bindings">
+
+  <section id="10.2.3" title="Multiple event bindings">
     <assertion id="a">
       <text>An event parameter may have multiple bindings</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>An observer method will only be notified if all the observed event bindings are specified when the event is fired</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Other, less specific, observers will also be notified of events with multiple event bindings</text>
     </assertion>
-  </section>  
-  
-  <section id="10.3" title="The Observer interface">
-    <assertion id="a">
-      <text>Observers of events implement the |javax.enterprise.event.Observer| interface.</text>
-    </assertion>    
   </section>
-  
-  <section id="10.4" title="Firing events">
+
+  <section id="10.3" title="Firing events">
     <assertion id="a">
       <text>Beans fire events via an instance of the |javax.enterprise.event.Event| interface, which may be injected.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The method |fire()| accepts an event object.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Any combination of bindings may be specified at the injection point.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>Or, the application may specify bindings dynamically.</text>
     </assertion>
-    
-    <assertion id="e">
-      <text>The |observe()| method registers an observer.</text>
-    </assertion>    
   </section>
-  
-  <section id="10.4.1" title="The Event interface">
-    <assertion id="c">
-      <text>The |Event| interface provides a method for firing events of a specific type</text>
+
+  <section id="10.3.1" title="The Event interface">
+    <assertion id="ca">
+      <text>The |Event| interface provides a method for firing events with a specified combination of type and bindings.</text>
     </assertion>
     
-    <assertion id="d">
-      <text>The |Event| interface provides a method for registering observers for events of the same type.</text>
+    <assertion id="cb" testable="false">
+      <text>For an injected |Event|, the specified type is the type parameter specified at the injection point, and the specified bindings are the bindings specified at the injection point.</text>
     </assertion>
-    
-    <assertion id="ea">
-      <text>The |select()| method of the provided implementation of |Event |returns a child |Event| for a subtype of the event type and additional event bindings. If no subtype is given, the event type is the same as the parent.</text>
+
+    <assertion id="eaa">
+      <text>The |select()| method returns a child |Event| for a given specified type and additional specified bindings.  If no specified type is given, the specified type is the same as the parent.</text>
     </assertion>
     
-    <assertion id="eb">
-      <text>If two instances of the same binding type are passed to |select()|, a |DuplicateBindingTypeException| is thrown.</text>
+    <assertion id="eab">
+      <text>If the specified type contains a type variable, an |IllegalArgumentException| is thrown.</text>
     </assertion>
-    
+
+    <assertion id="eba">
+      <text>If two instances of the same binding type are passed to |select()|, an |IllegalArgumentException| is thrown.</text>
+    </assertion>
+
     <assertion id="ec">
       <text>If an instance of an annotation that is not a binding type is passed to |select()|, an |IllegalArgumentException| is thrown.</text>
     </assertion>
-    
-    <assertion id="ed">
-      <text>The |fire()| method of the provided implementation of |Event| must call |BeanManager.fireEvent()|, passing the event type and bindings specified at the injection point. A child |Event| passes the event subtype and additional bindings, along with the bindings of its parent.</text>
+
+    <assertion id="eda">
+      <text>The method |fire()| fires an event with the specified bindings and notifies observers, as defined by Section 10.5, "Observer notification".</text>
     </assertion>
-    
-    <assertion id="ee">
-      <text>The |observe()| method of the provided implementation of |Event| must call |BeanManager.addObserver()|, passing the given observer object along with the event type and bindings specified at the injection point. A child |Event| passes the event subtype and additional bindings, along with the bindings of its parent.</text>
+
+    <assertion id="f">
+      <text>If the runtime type of the event object contains a type variable, an |IllegalArgumentException| is thrown.</text>
     </assertion>
   </section>
 
-  <section id="10.4.2" title="The built-in Event">
+  <section id="10.3.2" title="The built-in Event">
     <assertion id="a">
       <text>The container must provide a built-in bean with |Event&lt;X&gt;| for every legal observed event type X in its set of bean types.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The container must provide a built-in bean with every event binding type in its set of binding types.</text>
     </assertion>
-    
-    <assertion id="c">
-      <text>The container must provide a built-in bean with deployment type |@Standard|.</text>
-    </assertion>
-    
+
     <assertion id="d">
       <text>The container must provide a built-in bean with scope |@Dependent|.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>The container must provide a built-in bean with no bean EL name.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>The container must provide a built-in bean with an implementation provided automatically by the container.</text>
     </assertion>
@@ -3647,375 +3547,284 @@
       <text>The built-in implementation must be a passivation capable dependency, as defined in Section 6.6.2, "Passivation capable
 dependencies".</text>
     </assertion>
-  </section>  
-  
-  <section id="10.5" title="Observer methods">
-    <assertion id="a">
-      <text>An observer method is an observer defined via annotations, instead of by explicitly implementing the Observer interface.  Unlike regular observers, observer methods are automatically discovered and registered by the container</text>
+  </section>
+
+  <section id="10.4" title="Observer methods">
+    <assertion id="aa">
+      <text>An observer method is a non-abstract method of a managed bean class or session bean class.</text>
     </assertion>
     
-    <assertion id="b">
-      <text>An observer method must be a method of a managed bean class or session bean class</text>
-    </assertion>
-    
     <assertion id="c">
-      <text>An observer method may be either static or non-static</text>
+      <text>An observer method may be either static or non-static.</text>
     </assertion>
-    
+
     <assertion id="d">
-      <text>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</text>
+      <text>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.</text>
     </assertion>
-    
+
     <assertion id="e">
-      <text>There may be arbitrarily many observer methods with the same event parameter type and bindings</text>
+      <text>There may be arbitrarily many observer methods with the same event parameter type and bindings.</text>
     </assertion>
-    
+
     <assertion id="f">
-      <text>A bean may declare multiple observer methods</text>
+      <text>A bean may declare multiple observer methods.</text>
     </assertion>
   </section>
-  
-  <section id="10.5.1" title="Event parameter of an observer method">
+
+  <section id="10.4.1" title="Event parameter of an observer method">
     <assertion id="a">
       <text>Each observer method must have exactly one event parameter, of the same type as the event type it observes.  When searching for observer methods for an event, the container considers the type and bindings of the event parameter</text>
     </assertion>
-        
+
     <assertion id="b">
       <text>If the event parameter does not explicitly declare any binding, the observer method observes events with no binding</text>
-    </assertion>     
+    </assertion>
 
     <assertion id="ca">
-      <text>The event parameter type may contain a type variable or ~wildcard~. (added from 20090610 spec)</text>
+      <text>The event parameter type may contain a type variable or ~wildcard~.</text>
     </assertion>
 
     <assertion id="cb">
-      <text>The event parameter type may contain a ~type variable~ or wildcard. (added from 20090610 spec)</text>
+      <text>The event parameter type may contain a ~type variable~ or wildcard.</text>
     </assertion>
 
   </section>
-  
-  <section id="10.5.2" title="Declaring an observer method">
+
+  <section id="10.4.2" title="Declaring an observer method">
     <assertion id="a">
       <text>An observer method may be declared by annotating a parameter |@javax.enterprise.event.Observes|. That parameter is the event parameter. The declared type of the parameter is the observed event type.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>If a method has more than one parameter annotated |@Observes|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Observed event bindings may be declared by annotating the event parameter.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>If an observer method is annotated |@Produces| the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If an observer method is annotated |@Initializer| the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>If an observer method is has a parameter annotated |@Disposes|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>If a non-static method of a session bean class has a parameter annotated |@Observes|, and the method is not a business method of the EJB, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-    </assertion>    
+    </assertion>
+    
+    <assertion id="h">
+      <text>Interceptors and decorators may not declare observer methods. If an interceptor or decorator has a method with a parameter annotated |@Observes|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    </assertion>
   </section>
-  
-  <section id="10.5.3" title="Observer method parameters">
+
+  <section id="10.4.3" title="Observer method parameters">
     <assertion id="a">
       <text>In addition to the event parameter, observer methods may declare additional parameters, which may declare bindings. These additional parameters are injection points.</text>
     </assertion>
   </section>
-  
-  <section id="10.5.4" title="Conditional observer methods">
+
+  <section id="10.4.4" title="Conditional observer methods">
     <assertion id="a">
-      <text>A conditional observer method may be declared by annotating the event parameter with the |@javax.enterprise.event.IfExists| annotation.</text>
+      <text>A conditional observer method may be declared by specifying |notify=IF_EXISTS|.</text>
     </assertion>
+    
+    <assertion id="b">
+      <text>Beans with scope |@Dependent| may not have conditional observer methods. If a bean with scope |@Dependent| has an observer method declared |notify=IF_EXISTS|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+    </assertion>
+    
+    <assertion id="c">
+      <text>The enumeration |javax.enterprise.event.Notify| identifies the supported values of |notify|.</text>
+    </assertion>
   </section>
-  
-  <section id="10.5.5" title="Transactional observer methods">
+
+  <section id="10.4.5" title="Transactional observer methods">
     <assertion id="a">
       <text>Transactional observer methods are observer methods which receive event notifications during the before or after completion phase of the transaction in which the event was fired. If no transaction is in progress when the event is fired, they are notified at the same time as other observers</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>A before completion observer method is called during the before completion phase of the transaction</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>An after completion observer method is called during the after completion phase of the transaction</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>An after success observer method is called during the after completion phase of the transaction, only when the transaction completes successfully</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>An after failure observer method is called during the after completion phase of the transaction, only when the transaction fails</text>
     </assertion>
     
-    <assertion id="ga">
-    <text>A transactional observer method may be declared by annotating the event parameter of the observer method with one of the four following annotations defined in the package |javax.enterprise.event|.</text>
+    <assertion id="f" testable="false">
+      <text>The enumeration |javax.enterprise.event.TransactionPhase| identifies the kind of transactional observer method.</text>
+      <note>Should we just sigtest this?</note>
     </assertion>
-    
-    <assertion id="ha">
-      <text>The |@BeforeTransactionCompletion| annotation specifies that the observer method is a before completion observer method.</text>
+
+    <assertion id="gaa">
+    <text>A transactional observer method may be declared by specifying any value other than |IN_PROGRESS| for |during|.</text>
     </assertion>
-    
-    <assertion id="ia">
-      <text>The |@AfterTransactionCompletion| annotation specifies that the observer method is an after completion observer method.</text>
-    </assertion>
-    
-    <assertion id="ja">
-      <text>The |@AfterTransactionSuccess| annotation specifies that the observer method is an after success observer method.</text>
-    </assertion>
-    
-    <assertion id="ka">
-      <text>The |@AfterTransactionFailure| annotation specifies that the observer method is an after failure observer method.</text>
-    </assertion>
-    
-    <assertion id="la">
-      <text>A transactional observer method may not specify more than one of the four types. If a transactional observer method specifies more than one of the four types, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-    </assertion>    
   </section>
-  
-  <section id="10.5.6" title="Asynchronous observer methods">
-    <assertion id="a">
-      <text>An asynchronous observer method may be declared by annotating the event parameter of the observer method |@javax.enterprise.event.Asynchronously|.</text>
+
+  <section id="10.5" title="Observer notification">
+    <assertion id="aa">
+      <text>When an event is fired by the application, the container must determine the observers for that event according to the observer resolution defined by Section 10.2, "Observer resolution", then then for each observer method, either invoke the observer method immediately or register the observer method for later invocation during the transaction completion phase, using a JTA |Synchronization|.</text>
     </assertion>
-    
+
     <assertion id="b">
-      <text>An asynchronous observer method may also be a transactional observer method. However, it may not be a before completion observer method or a conditional observer method. If an asynchronous observer method is specified as a before completion or conditional observer method, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-    </assertion>
-  </section>
-  
-  <section id="10.6" title="Observer notification">
-    <assertion id="a">
-      <text>When an event is fired by the application, the container must determine the observers for that event according to the observer resolution algorithm, then for each observer, call the |notify()| method of the |Observer| interface, passing the event object.</text>
-    </assertion>
-    
-    <assertion id="b">
       <text>The order in which observers are called in not defined, and so portable applications should not rely upon the order in which observers are called.</text>
     </assertion>
     
-    <assertion id="c">
-      <text>Observers may throw exceptions. If an observer throws an exception, the exception aborts processing of the event. No other observers of that event will be called. The |fireEvent()| method rethrows the exception.</text>
+    <assertion id="bb">
+      <text>If the observer method is a transactional observer method and there is currently a JTA transaction in progress, the container calls the observer method during the appropriate transaction completion phase.  ~Otherwise, the container calls the observer immediately.~</text>
     </assertion>
     
-    <assertion id="d">
-      <text>Any observer called before completion of a transaction may call setRollbackOnly() to force a transaction rollback.</text>
+    <assertion id="bc">
+      <text>If the observer method is a transactional observer method and there is currently a JTA transaction in progress, ~the container calls the observer method during the appropriate transaction completion phase.~  Otherwise, the container calls the observer immediately.</text>
     </assertion>
     
-    <assertion id="e">
-      <text>An observer may not directly initiate, commit or rollback JTA transactions.</text>
+    <assertion id="bd">
+      <text>Any observer method called before completion of a transaction may call |setRollbackOnly()| to force a transaction rollback.  An observer method may not directly initiate, commit or rollback JTA transactions.</text>
     </assertion>
-  </section>
-  
-  <section id="10.6.1" title="Observer method notification">
-    <assertion id="aa">
-      <text>For every observer method of an enabled bean, the container is responsible for providing and registering an implementation of the |Observer| interface, that delegates event notifications to the observer method, by calling the observer method as defined in Section 5.4.8, "Invocation of observer methods".</text>
+
+    <assertion id="ca">
+      <text>Observers may throw exceptions. If an observer method is a transactional observer method, any exception is caught and logged by the container.  ~Otherwise, the exception aborts processing of the event.  No other observer methods of that event will be called.  The |fireEvent()| method rethrows the exception.  If the exception is a checked exception, it is wrapped and rethrown as an (unchecked) |ObserverException|.~</text>
     </assertion>
     
-    <assertion id="b">
-      <text>The |notify()| method of the |Observer| implementation for an observer method either invokes the observer method ~immediately~, or asynchronously, or registers the observer method for later invocation during the transaction completion phase, using a JTA Synchronization.</text>
+    <assertion id="cb">
+      <text>Observers may throw exceptions. If an observer method is a transactional observer method, ~any exception is caught and logged by the container.~  Otherwise, the exception aborts processing of the event.  No other observer methods of that event will be called.  The |fireEvent()| method rethrows the exception.  If the exception is a checked exception, it is wrapped and rethrown as an (unchecked) |ObserverException|.</text>
     </assertion>
-    
-    <assertion id="c">
-      <text>The |notify()| method of the |Observer| implementation for an observer method either invokes the observer method immediately, ~or asynchronously~, or registers the observer method for later invocation during the transaction completion phase, using a JTA Synchronization</text>
-    </assertion>
-    
-    <assertion id="d">
-      <text>The |notify()| method of the |Observer| implementation for an observer method either invokes the observer method immediately, or asynchronously, ~or registers the observer method for later invocation during the transaction completion phase, using a JTA Synchronization~</text>
-    </assertion>
-    
-    <assertion id="e">
-      <text>If the observer method is an asynchronous transactional observer method and there is currently a JTA transaction in progress, the observer object calls the observer method asynchronously during the after transaction completion phase</text>
-    </assertion>
-    
+
     <assertion id="f">
-      <text>If the observer method is a transactional observer method and there is currently a JTA transaction in progress, the observer object calls the observer method during the appropriate transaction completion phase</text>
+      <text>For a custom implementation of the |ObserverMethod| interface defined in Section 11.1.3, "The ObserverMethod interface", the container must call |getNotify()| and |getTransactionPhase()| to determine is the observer method is a conditional or transactional observer method, and |notify()| to invoke the method.</text>
     </assertion>
-    
-    <assertion id="g">
-      <text>If the observer method is an asynchronous observer method, the container calls the observer method asynchronously</text>
-    </assertion>
-    
-    <assertion id="h">
-      <text>If none of the conditions of assertions e, f, or g are true, the container calls the observer immediately</text>
-    </assertion>
-    
-    <assertion id="i" testable="false">
-      <text>The container is not required to guarantee delivery of asynchronous events in the case of a server shutdown or failure</text>
-      <note>This is just a note about the lack of an assertion, and therefore is not testable.</note>
-    </assertion>
-      
-    <assertion id="p" testable="false">
-      <text>If the observer is a transactional or asynchronous observer method, any exception is caught and logged by the container</text>
-      <note>Cannot be tested as they are not under our control</note>
-    </assertion>
-    
-    <assertion id="q">
-      <text>If the observer isn't a transactional or asynchronous observer method, the exception is rethrown by the |notify()| method of the observer object</text>
-    </assertion>
-    
-    <assertion id="r">
-      <text>If the exception is a checked exception, it is wrapped and rethrown as an (unchecked) |ObserverException|</text>
-    </assertion>
   </section>
-  
-  <section id="10.6.2" title="Observer method invocation context">
-    <assertion id="a">
-      <text>If the observer method is an asynchronous observer method, it is called with no active transaction, no client security context and with a new request context that is destroyed when the observer method returns. The application context is also active</text>
+
+  <section id="10.5.1" title="Observer method invocation context">
+    <assertion id="ba">
+      <text>If the observer method is a before completion transactional observer method, it is called within the context of the transaction that is about to complete and with the same client security context and lifecycle contexts.</text>
     </assertion>
-    
-    <assertion id="b">
-      <text>If the observer method is a |@BeforeTransactionCompletion| transactional observer method, it is called within the context of the transaction that is about to complete and with the same client security context and lifecycle contexts</text>
-    </assertion>
-    
+
     <assertion id="c">
-      <text>If the observer method is any other kind of transactional observer method, it is called in an unspecified transaction context, but with the same client security context and lifecycle contexts as the transaction that just completed</text>
+  <text>If the observer method is any other kind of transactional observer method, it is called in an unspecified transaction context, but with the same client security context and lifecycle contexts as the transaction that just completed.</text>
     </assertion>
-    
+
     <assertion id="d">
-      <text>If an observer method is not an asynchronous observer method, and not a |@BeforeTransactionCompletion| transactional method, and not any other kind of transactional observer method, then the observer method is called in the same transaction context, client security context and lifecycle contexts as the invocation of |Event.fire()|</text>
+    <text>If an observer method is not an asynchronous observer method, and not a before completion transactional method, and not any other kind of transactional observer method, then the observer method is called in the same transaction context, client security context and lifecycle contexts as the invocation of |Event.fire()| or |BeanManager.fireEvent()|.</text>
     </assertion>
-    
+
     <assertion id="e">
-      <text>The transaction and security contexts for a business method of a session bean also depend upon the transaction attribute and |@RunAs| descriptor, if any</text>
-    </assertion>    
-  </section>
-    
-  <section id="10.7" title="JMS event mappings">
-    <assertion id="a">
-      <text>An event type may be mapped to a JMS topic.</text>
+      <text>The transaction and security contexts for a business method of a session bean also depend upon the transaction attribute and |@RunAs| descriptor, if any.</text>
     </assertion>
-    
-    <assertion id="b">
-      <text>An event mapping is a special kind of observer method that is declared by an interface.</text>
-    </assertion>
-    
-    <assertion id="c">
-      <text>The event parameter specifies the mapped event type and bindings.</text>
-    </assertion>
-    
-    <assertion id="d">
-      <text>Every message destination representing a topic that any injected parameter resolves to is a mapped topic.</text>
-    </assertion>
-    
-    <assertion id="e">
-      <text>An event mapping may be specified as a member of any interface.</text>
-    </assertion>
-    
-    <assertion id="f">
-      <text>All observers of mapped event types must be asynchronous observer methods. If an observer for a mapped event type is not an asynchronous observer method, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
-    </assertion>
-    
-    <assertion id="g">
-      <text>For every event mapping, the container must send a message containing the serialized event and its event bindings to every mapped topic whenever an event with the mapped event type and bindings is fired, and monitor every mapped topic for messages containing events of that mapped event type and bindings and notify all local observers whenever a message containing an event is received. Thus, events with the mapped event type and bindings are distributed to other processes which have the same event mapping.</text>
-    </assertion>
   </section>
-  
-  <section id="11" title="Portable extensions and the bean manager">
+
+  <section id="11" title="Portable extensions">
     <assertion id="a" testable="false">
     <text>A portable extension may integrate with the container by providing its own beans, interceptors and decorators to the container.</text>
     </assertion>
-    
+
     <assertion id="b" testable="false">
       <text>A portable extension may integrate with the container by injecting dependencies into its own objects using the dependency injection service.</text>
     </assertion>
-    
+
     <assertion id="c" testable="false">
       <text>A portable extension may integrate with the container by providing a context implementation for a custom scope.</text>
     </assertion>
-    
+
     <assertion id="d" testable="false">
       <text>Bean definitions provided by a portable extension may be associated with a certain activity.</text>
     </assertion>
-    
+
     <assertion id="e" testable="false">
       <text>Integration with portable extensions is enabled via the important SPI interfaces Bean and BeanManager.</text>
     </assertion>
   </section>
-  
+
   <section id="11.1" title="The Bean interface">
     <assertion id="a">
       <text>Implementations of |Bean| must also implement the inherited operations defined by the |Contextual| interface defined in Section 6.1, "The Contextual interface".</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The methods |getTypes()|, |getBindings()|, |getScopeType()|, |getDeploymentType()|, |getName()|, |getStereotypes()| and |getInterceptorBindings()| must return the bean types, bindings, scope type, deployment type, EL name, stereotypes and interceptor bindings of the bean, as defined in Chapter 2, Bean definition.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>The method |getInjectionPoints()| returns a set of |InjectionPoint| objects, defined in Section 5.4.9, "Injection point
 metadata", representing injection points of the bean, that will be validated by the container at initialization time.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>The method |isPassivationCapable()| must return |true| if the bean is passivation capable, as defined in Section 6.6.1, "Passivation capable beans", and |false| otherwise.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>The method |isNullable()| must return |true| if the method |create()| sometimes returns a |null| value, and |false| otherwise, as defined in Section 5.1.3, "Primitive types and null values".</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>An instance of |Bean| exists for every enabled bean in a deployment.</text>
     </assertion>
-    
+
     <assertion id="g" testable="false">
       <text>An application or portable extension may add support for new kinds of beans beyond those defined by the this specification (managed beans, session beans, producer methods and fields, resources and message destinations) by implementing |Bean| and registering beans with the container, using the mechanism defined in Section 11.2.6, "Bean registration".</text>
-    </assertion>    
+    </assertion>
   </section>
-  
+
   <section id="11.1.1" title="The Decorator interface">
     <assertion id="a">
       <text>The |Bean| object for a decorator must implement the interface |javax.enterprise.inject.spi.Decorator|.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The method |getDecoratedTypes()| returns the decorated types of the decorator.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>The methods |getDelegateType()| and |getDelegateBindings()| return the delegate type and bindings of the decorator.</text>
     </assertion>
   </section>
-  
+
   <section id="11.1.2" title="The Interceptor interface">
     <assertion id="a">
       <text>The |Bean| object for an interceptor must implement |javax.enterprise.inject.spi.Interceptor|.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The method |getInterceptorBindingTypes()| returns the interceptor bindings of the interceptor.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>The method |intercepts()| returns |true| if the interceptor intercepts callbacks or business methods of the given type, and |false| otherwise.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>The method |intercept()| invokes the specified kind of lifecycle callback or business method upon the given instance.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>An |InterceptionType| identifies the kind of lifecycle callback or business method.</text>
     </assertion>
   </section>
-  
+
   <section id="11.2" title="The BeanManager object">
     <assertion id="a">
       <text>The container provides a built-in bean with bean type |BeanManager|, scope |@Dependent|, deployment type |@Standard| and binding |@Current|.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The built-in implementation must be a passivation capable dependency, as defined in Section 6.6.2, "Passivation capable dependencies".</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Any bean may obtain an instance of |BeanManager| by injecting it.</text>
     </assertion>
@@ -4023,37 +3832,37 @@
     <assertion id="d">
       <text>A framework may obtain the |BeanManager| object from JNDI. The container must register an instance of |BeanManager| with name |java:app/BeanManager| in JNDI at initialization time.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>Any operation of |BeanManager| may be called at any time during the execution of the application.</text>
     </assertion>
   </section>
-  
+
   <section id="11.2.1" title="Obtaining a contextual reference for a bean">
     <assertion id="a">
       <text>The method |BeanManager.getReference()| returns a contextual reference for a given bean and bean type, as defined in Section 6.5.3, "Contextual reference for a bean".</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The first parameter is the |Bean| object representing the bean. The second parameter represents the bean type that must be implemented by any client proxy that is returned.</text>
-    </assertion>  
+    </assertion>
   </section>
-  
+
   <section id="11.2.2" title="Obtaining an injectable reference">
     <assertion id="a">
       <text>The method |BeanManager.getInjectableReference()| returns an injectable reference for a given injection point, as defined in Section 5.4.1, "Injectable references".</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>If the |InjectionPoint| represents a decorator delegate injection point, |getInjectableReference()| returns a delegate, as
 defined in Section 8.1.2, "Decorator delegate injection points".</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Implementations of |Bean| usually maintain a reference to an instance of |BeanManager|. When the |Bean| implementation performs dependency injection, it must obtain the contextual instances to inject by calling |BeanManager.getInjectableReference()|, passing an instance of  |InjectionPoint| that represents the injection point and the instance of |CreationalContext| that was passed to |Bean.create()|.</text>
-    </assertion>    
+    </assertion>
   </section>
-  
+
   <section id="11.2.3" title="Obtaining a Bean by type">
     <assertion id="a">
       <text>The |getBeans()| method of the |BeanManager| interface returns the result of the typesafe resolution algorithm defined in Section 5.1, "Typesafe resolution algorithm".</text>
@@ -4062,50 +3871,50 @@
     <assertion id="b">
       <text>The first parameter is a required bean type. The remaining parameters are required bindings.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>If no bindings are passed to |getBeans()|, the default binding |@Current| is assumed.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>If a parameterized type with a type parameter or wildcard is passed to |getBeans()|, an |IllegalArgumentException| is thrown.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If two instances of the same binding type are passed to |getBeans()|, a |DuplicateBindingTypeException| is thrown.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>If an instance of an annotation that is not a binding type is passed to |getBeans()|, an |IllegalArgumentException| is thrown.</text>
     </assertion>
   </section>
-  
+
   <section id="11.2.4" title="Obtaining a Bean by name">
     <assertion id="a">
       <text>The |getBeans()| method of the |BeanManager| interface returns the result of the name resolution algorithm defined in Section 5.2, "EL name resolution algorithm".</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The parameter is a bean EL name.</text>
     </assertion>
   </section>
-  
+
   <section id="11.2.5" title="Obtaining the most specialized bean">
     <assertion id="a">
       <text>The method |BeanManager.getMostSpecializedBean()| returns the |Bean| object representing the most specialized enabled bean registered with the container that specializes the given bean, as defined in Section 4.3.2, "Most specialized enabled bean for a bean".</text>
     </assertion>
   </section>
-  
+
   <section id="11.2.6" title="Bean registration">
     <assertion id="a">
       <text>The |BeanManager.addBean()| method registers a new bean with the container, thereby making it available for injection into other beans.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The |Bean| parameter may represent an interceptor or decorator.</text>
     </assertion>
   </section>
-  
+
   <section id="11.2.7" title="Observer registration">
     <assertion id="a">
       <text>An observer instance may be registered with the container by calling |BeanManager.addObserver()|.</text>
@@ -4114,7 +3923,7 @@
     <assertion id="b">
       <text>The first parameter is the observer object. The second parameter is the observed event type. The remaining parameters are optional observed event bindings. The observer is notified when an event object that is assignable to the observed event type is raised with the observed event bindings.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>An observer instance may be deregistered by calling |BeanManager.removeObserver()|.</text>
     </assertion>
@@ -4122,185 +3931,185 @@
     <assertion id="d">
       <text>If two instances of the same binding type are passed to |addObserver()| or |removeObserver()|, a |DuplicateBindingTypeException| is thrown.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If an instance of an annotation that is not a binding type is passed to |addObserver()| or |removeObserver()|, an |IllegalArgumentException| is thrown.</text>
     </assertion>
   </section>
-  
+
   <section id="11.2.8" title="Firing an event">
     <assertion id="a">
       <text>The method |BeanManager.fireEvent()| fires an event and notifies observers, according to Section 10.6, "Observer notification".</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The first argument is the event object. The remaining parameters are event bindings.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>If the runtime type of the event object passed to |fireEvent()| contains a type variable, an |IllegalArgumentException| is thrown.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>If two instances of the same binding type are passed to |fireEvent()|, a |DuplicateBindingTypeException| is thrown.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If an instance of an annotation that is not a binding type is passed to |fireEvent()|, an |IllegalArgumentException| is thrown.</text>
     </assertion>
   </section>
-  
+
   <section id="11.2.9" title="Observer resolution">
     <assertion id="a">
       <text>The method |BeanManager.resolveObservers()| resolves observers for an event according to the observer resolution algorithm defined in Section 10.2, "Observer resolution algorithm".</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The first parameter of |resolveObservers()| is the event object. The remaining parameters are event bindings.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>If the runtime type of the event object passed to  |resolveObservers()| contains a type variable, an |IllegalArgumentException| is thrown.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>If two instances of the same binding type are passed to |resolveObservers()|, a |DuplicateBindingTypeException| is thrown.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If an instance of an annotation that is not a binding type is passed to |resolveObservers()|, an |IllegalArgumentException| is thrown.</text>
-    </assertion> 
+    </assertion>
   </section>
-  
+
   <section id="11.2.10" title="Decorator resolution">
     <assertion id="a">
       <text>The method |BeanManager.resolveDecorators()| returns the ordered list of enabled decorators for a set of bean types and a set of bindings, as defined in Section 8.3, "Decorator resolution".</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The first argument is the set of bean types of the decorated bean. The annotations are bindings declared by the decorated bean.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>If two instances of the same binding type are passed to |resolveDecorators()|, a |DuplicateBindingTypeException| is thrown.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>If an instance of an annotation that is not a binding type is passed to |resolveDecorators()|, an |IllegalArgumentException| is thrown.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If the set of bean types is empty, an |IllegalArgumentException| is thrown.</text>
     </assertion>
   </section>
-  
+
   <section id="11.2.11" title="Interceptor resolution">
     <assertion id="a">
       <text>The method |BeanManager.resolveInterceptors()| returns the ordered list of enabled interceptors for a set of interceptor bindings, as defined in Section 9.5, "Interceptor resolution".</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>If two instances of the same interceptor binding type are passed to |resolveInterceptors()|, a |DuplicateBindingTypeException| is thrown.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>If no interceptor binding type instance is passed to |resolveInterceptors()|, an |IllegalArgumentException| is thrown.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>If an instance of an annotation that is not an interceptor binding type is passed to |resolveInterceptors()|, an |IllegalArgumentException| is thrown.</text>
     </assertion>
   </section>
-  
+
   <section id="11.2.12" title="Dependency validation">
     <assertion id="a">
       <text>The |BeanManager.validate()| operation validates a dependency.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The method |validate()| validates the dependency and throws an |InjectionException| if there is a deployment problem (for example, an unsatisfied or ambiguous dependency) associated with the injection point.</text>
-    </assertion>  
+    </assertion>
   </section>
-  
+
   <section id="11.2.13" title="Enabled deployment types">
     <assertion id="a">
       <text>The method |BeanManager.getEnabledDeploymentTypes()| exposes the list of enabled deployment types, in order of lower to higher precedence, as defined by Section 2.5.5, "Enabled deployment types".</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>Portable extensions may use this method to inspect  meta-annotations that appear on the deployment types and thereby discover information about the deployment.</text>
     </assertion>
   </section>
-  
+
   <section id="11.2.14" title="Registering a Context">
     <assertion id="a">
       <text>A custom implementation of |Context| may be associated with a scope type by calling |BeanManager.addContext()|.</text>
     </assertion>
   </section>
-  
+
   <section id="11.2.15" title="Obtaining the active Context for a scope">
     <assertion id="a">
       <text>The method |BeanManager.getContext()| retrieves an active context object associated with the a given scope, as defined in Section 6.5.1, "The active context object for a scope".</text>
     </assertion>
   </section>
-  
-  <section id="11.3" title="Alternative metadata sources">    
+
+  <section id="11.3" title="Alternative metadata sources">
     <assertion id="a">
       <text>The interfaces |AnnotatedType|, |AnnotatedField|, |AnnotatedMethod|, |AnnotatedConstructor| and |AnnotatedParameter| in the package |javax.enterprise.inject.spi| allow a portable extension to specify metadata that overrides the annotations that exist on a bean class. The portable extension is responsible for implementing the interfaces, thereby exposing the metadata to the container.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The interface |Annotated| exposes the overriding annotations and type declarations.</text>
     </assertion>
   </section>
 
-  <section id="11.3.18" title="Obtaining the active Context for a scope">    
+  <section id="11.3.18" title="Obtaining the active Context for a scope">
     <assertion id="a">
       <text>The method |BeanManager.getContext()| retrieves an active context object associated with the a given scope, as defined in Section 6.5.1, "The active context object for a scope".</text>
     </assertion>
   </section>
-  
+
   <section id="11.4" title="Helper objects for Bean implementations">
     <assertion id="a">
       <text>The BeanManager provides access to helper objects which parse and validate the standard metadata defined by this specification and perform injection upon an object according to the standard injection lifecycle defined in Section 5.4.3, "Injection using the bean constructor".</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The method |createInjectionTarget()| returns a container provided instance of |InjectionTarget| for the given type or throws an |IllegalArgumentException| if there is a definition error associated with any injection point of the type.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>The method |createManagedBean()| returns an instance of |ManagedBean| representing the given managed bean type, or throws an |IllegalArgumentException| if there is any kind of definition error associated with the type.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>When an |AnnotatedType| is passed to |createInjectionTarget()| or |createManagedBean()| the container ignores the annotations and types declared by the elements of the actual Java class and uses the metadata provided via the |Annotated| interface instead.</text>
     </assertion>
   </section>
-  
+
   <section id="11.4.1" title="The InjectionTarget interface">
     <assertion id="a">
       <text>The interface |javax.enterprise.inject.spi.InjectionTarget| provides operations for instantiating and performing dependency injection on instances of a type.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>For any container provided implementation of |InjectionTarget| that represents a class, |produce()| calls the constructor annotated |@Initializer| if it exists, or the constructor with no parameters otherwise, as defined in Section 5.4.3, "Injection using the bean constructor".</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>For any container provided implementation of |InjectionTarget| that represents a class, |inject()| performs dependency injection upon the given object. First, the container performs Java EE component environment
 injection according to the semantics required by the Java EE platform specification. Next, it sets the value all injected fields, and then calls all the initializer methods, as defined in Section 5.4.4, "Injection of fields and initializer methods". Finally, it calls the |@PostConstruct| callback, if it exists, according to the semantics required by the Java EE platform specification.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>For any container provided implementation of |InjectionTarget| that represents a class, |dispose()| calls the |@PreDestroy| callback, if it exists, according to the semantics required by the Java EE platform
 specification.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>For any container provided implementation of |InjectionTarget| that represents a class, |destroy()| destroys dependent objects of the given instance, as defined in Section 5.4.5, "Destruction of dependent objects".</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>For any container provided implementation of |InjectionTarget| that represents a class, |getInjectionPoints()| returns the set of |InjectionPoint| objects representing all injected fields, bean constructor parameters and initializer method parameters.</text>
     </assertion>
@@ -4308,129 +4117,129 @@
     <assertion id="g">
       <text>For any container provided implementation of |InjectionTarget| that represents a producer method or field, produce() calls the producer method on, or accesses the producer field of, either the given instance or a contextual instance of the most specialized bean that specializes the bean that declares the producer method, as defined in Section 5.4.6, "Invocation of producer or disposal methods".</text>
     </assertion>
-    
+
     <assertion id="h">
       <text>For any container provided implementation of |InjectionTarget| that represents a producer method or field, |inject()| does nothing.</text>
     </assertion>
-    
+
     <assertion id="i">
       <text>For any container provided implementation of |InjectionTarget| that represents a producer method or field, |dispose()| calls the disposal method, if it exists, on either the given instance or a contextual instance of the most specialized bean that specializes the bean that declares the producer method, as defined in Section 5.4.6, "Invocation of
 producer or disposal methods".</text>
     </assertion>
-    
+
     <assertion id="j">
       <text>For any container provided implementation of |InjectionTarget| that represents a producer method or field, |destroy()| destroys dependent objects of the given object, as defined in Section 5.4.5, "Destruction of dependent objects".</text>
     </assertion>
-    
+
     <assertion id="k">
       <text>For any container provided implementation of |InjectionTarget| that represents a producer method or field, |getInjectionPoints()| returns the set of |InjectionPoint| objects representing all producer and disposal method parameters.</text>
     </assertion>
   </section>
-  
+
   <section id="11.4.2" title="ManagedBean and ProducerBean">
     <assertion id="a">
       <text>The interface |javax.enterprise.inject.spi.ManagedBean| exposes container provided implementations of |Bean| and |InjectionTarget| for a managed bean class.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The method |getAnnotatedType()| returns the |AnnotatedType| representing the managed bean class.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>The method |getInjectionTarget()| returns a container provided implementation of |InjectionTarget| for the managed bean class.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>The method |getProducerBeans()| returns a set of |ProducerBean| objects representing the producer methods and fields of the managed bean.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>The method |getObserverMethods()| returns a set of |ObserverMethod| objects representing the observer methods of the bean.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>The |ProducerBean| interface exposes container provided implementations of |Bean| and |InjectionTarget| for a producer method or field.</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>The methods |getAnnotatedProducer()| and |getAnnotatedDisposer()| return the |AnnotatedMembers| representing the producer method or field and disposal method respectively.</text>
     </assertion>
-    
+
     <assertion id="h">
       <text>The method |getDeclaringBean()| returns a container provided implementation of |Bean| for the bean class that declares the producer method or field.</text>
     </assertion>
-    
+
     <assertion id="i">
       <text>The method |getInjectionTarget()| returns a container provided implementation of |InjectionTarget| for the producer method or field.</text>
     </assertion>
   </section>
-  
+
   <section id="11.4.3" title="The ObserverMethod interface">
     <assertion id="a">
       <text>The interface |javax.enterprise.inject.spi.ObserverMethod| exposes a container provided implementation of |Observer| for an observer method, as defined in Section 10.6.1, "Observer method notification" along with the observed event type and bindings and an operation for calling the method.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The methods |getAnnotatedMethod()| returns the |AnnotatedMethod| representing the observer method.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>The method |getDeclaringBean()| returns a container provided implementation of |Bean| for the bean class that declares the observer method.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>The method |notify()| calls the observer method, upon the given bean instance as defined in Section 5.4.8, "Invocation of observer methods".</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>The methods |getObservedEventType()| and |getObservedEventBindings()| return the observed event type and bindings of the observer method.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>The method |getInjectionPoints()| returns the set of |InjectionPoint| objects representing all injected method parameters.</text>
     </assertion>
   </section>
-  
+
   <section id="11.5" title="Container lifecycle events">
     <assertion id="a">
       <text>During the application initialization process, the container fires a series of events, allowing portable extensions to integrate with the container initialization process defined in Section 12.2, "Application initialization lifecycle".</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>Observers of these events must be service providers of the service |javax.enterprise.inject.spi.Extension| declared in |META-INF/services|.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>The container instantiates a single instance of each service provider at the beginning of the application initialization process and maintains a reference to it until the application shuts down.</text>
     </assertion>
   </section>
-  
+
   <section id="11.5.1" title="BeforeBeanDiscovery event">
     <assertion id="a">
       <text>The container must fire an event before it begins the bean discovery process. The event object must be of type |javax.enterprise.inject.spi.BeforeBeanDiscovery|.</text>
     </assertion>
-    
+
     <assertion id="ba">
       <text>The operations of the |BeforeBeanDiscovery| instance allow a portable extension to declare that any annotation as a _binding type_, scope type, stereotype or interceptor binding type.</text>
     </assertion>
-    
+
     <assertion id="bb">
       <text>The operations of the |BeforeBeanDiscovery| instance allow a portable extension to declare that any annotation as a binding type, _scope type_, stereotype or interceptor binding type.</text>
     </assertion>
-    
+
     <assertion id="bc">
       <text>The operations of the |BeforeBeanDiscovery| instance allow a portable extension to declare that any annotation as a binding type, scope type, _stereotype_ or interceptor binding type.</text>
     </assertion>
-    
+
     <assertion id="bd">
       <text>The operations of the |BeforeBeanDiscovery| instance allow a portable extension to declare that any annotation as a binding type, scope type, stereotype or _interceptor binding type_.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>If any observer method of the |BeforeBeanDiscovery| event throws an exception, the exception is treated as a definition error by the container.</text>
     </assertion>
   </section>
-  
+
   <section id="11.5.2" title="AfterBeanDiscovery event">
     <assertion id="a">
       <text>The container must fire a second event when it has fully completed the bean discovery process, validated that there are no definition errors relating to the discovered beans, and registered |Bean| and |Observer| objects for the discovered beans, but before detecting deployment problems.  The event object must be of type |javax.enterprise.inject.spi.AfterBeanDiscovery|.</text>
@@ -4439,119 +4248,119 @@
     <assertion id="c">
       <text>The method |addDefinitionError()| registers a definition error with the container, causing the container to abort deployment after all observers have been notified.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>If any observer method of the |AfterBeanDiscovery| event throws an exception, the exception is treated as a definition error by the container.</text>
     </assertion>
   </section>
-  
+
   <section id="11.5.3" title="AfterDeploymentValidation event">
     <assertion id="a">
       <text>The container must fire a third event after it has validated that there are no deployment problems and before creating contexts or processing requests. The event object must be of type |javax.enterprise.inject.spi.AfterDeploymentValidation|.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The method |addDeploymentProblem()| registers a deployment problem with the container, causing the container to abort deployment after all observers have been notified.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>If any observer method of the |AfterDeploymentValidation| event throws an exception, the exception is treated as a deployment problem by the container.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>The container must not allow any request to be processed by the deployment until all observers of this event return.</text>
     </assertion>
   </section>
-  
+
   <section id="11.5.4" title="BeforeShutdown event">
     <assertion id="a">
       <text>The container must fire a final event after it has finished processing requests and destroyed all contexts. The event object must be of type |javax.enterprise.inject.spi.BeforeShutdown|.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>If any observer method of the |BeforeShutdown| event throws an exception, the exception is treated as a deployment problem by the container.</text>
     </assertion>
   </section>
-  
+
   <section id="11.5.5" title="ProcessAnnotatedType event">
     <assertion id="a">
       <text>The container must fire an event for each Java class it discovers, before it reads the declared annotations.  The event object must be of type |javax.enterprise.inject.spi.ProcessAnnotatedType&lt;X&gt;|, where |X| is the class.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The |getAnnotatedType()|/|setAnnotatedType()| property accessor pair provides access to the |AnnotatedType| object that will be used by the container to read the declared annotations.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Any observer of this event is permitted to wrap and/or replace the |annotatedType| property of |ProcessAnnotatedType|.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>The container must use the final value of this property, after all observers have been called, to read the annotations of this class.</text>
     </assertion>
   </section>
-  
+
   <section id="11.5.6" title="ProcessInjectionTarget event">
     <assertion id="a">
       <text>The container must fire an event for each managed bean, session bean, Java EE component class supporting injection, producer method or producer field it discovers.  The event object must be of type |javax.enterprise.inject.spi.ProcessInjectionTarget&lt;X&gt;|, where |X| is the managed bean class, session bean class or Java EE component class supporting injection.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>The |getInjectionTarget()|/|setInjectionTarget()| property accessor pair provides access to the |InjectionTarget| object that will be used by the container to perform injection.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>The method |getAnnotatedType()| returns the |AnnotatedType| representing the managed bean, session bean or other Java EE component class supporting injection.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>The method |addDefinitionError()| registers a definition error with the container, causing the container to abort deployment after bean discovery is complete.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>Any observer of this event is permitted to wrap and/or replace the |injectionTarget| property of |ProcessInjectionTarget|. The container must use the final value of this property, after all observers have been called, whenever it performs injection upon the managed bean, session bean or other Java EE component class supporting injection.</text>
     </assertion>
   </section>
-  
+
   <section id="11.5.7" title="ProcessBean event">
     <assertion id="a">
       <text>The container must fire an event for each bean it discovers, before registering the |Bean| object.  The event object must be of type |javax.enterprise.inject.spi.ProcessBean|.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>For a managed bean with bean class |X|, the container must raise an event of type |ProcessBean&lt;X&gt;|.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>For a session bean with bean class local view |X|, the container must raise an event of type |ProcessBean&lt;X&gt;|.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>For a session bean with no bean class local view |X|, the container must raise an event of type |ProcessBean&lt;Object&gt;|.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>For a producer method or field with method return type or field type |X|, the container must raise an event of type |ProcessBean&lt;
 X&gt;|.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>The |getBean()|/|setBean()| property accessor pair provides access to the |Bean| object that is about to be registered.</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>The method |getAnnotated()| returns the |AnnotatedType|, |AnnotatedField| or |AnnotatedMethod|.</text>
     </assertion>
-    
+
     <assertion id="h">
       <text>The method |addDefinitionError()| registers a definition error with the container, causing the container to abort deployment after bean discovery is complete.</text>
     </assertion>
-    
+
     <assertion id="i">
       <text>Any observer of this event is permitted to wrap and/or replace the bean property of |ProcessBean|. When all observers have been called, the container registers the final value of this property. The container must not register any |Bean| object if any observer called |addDefinitionError()|.</text>
     </assertion>
   </section>
-  
+
   <section id="11.5.8" title="ProcessObserver event">
     <assertion id="a">
       <text>The container must fire an event for each observer method it discovers, before registering the |Observer| object.  The event object must be of type |javax.enterprise.inject.spi.ProcessObserver&lt;T&gt;| where |T| is the observed event type.</text>
@@ -4560,186 +4369,186 @@
     <assertion id="b">
       <text>The |getObserver()|/|setObserver()| property accessor pair provides access to the |Observer| object that is about to be registered.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>The method |getAnnotatedMethod()| returns the |AnnotatedMethod|.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>The method |addDefinitionError()| registers a definition error with the container, causing the container to abort deployment after bean discovery is complete.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>Any observer of this event is permitted to wrap and/or replace the observer property of |ProcessObserver|. When all observers have been called, the container registers the final value of this property. The container must not register any |ObserverMethod| object if any observer called |addDefinitionError()|.</text>
-    </assertion>    
+    </assertion>
   </section>
-  
+
   <section id="11.6" title="Activities">
     <assertion id="a">
       <text>Activities are represented by instances of |BeanManager|. The method |createActivity()| creates a new child activity of an activity.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>A child activity inherits all beans, interceptors, decorators, observers, and contexts defined by its direct and indirect parent activities.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Every bean belonging to a parent activity also belongs to the child activity, is eligible for injection into other beans belonging to the child activity and may be obtained by dynamic lookup via the child activity.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>Every interceptor and decorator belonging to a parent activity also belongs to the child activity and may be applied to any bean belonging to the child activity.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Every observer belonging to a parent activity also belongs to the child activity and receives events fired via the child activity.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>Every context object belonging to the parent activity also belongs to the child activity.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>Beans and observers may be registered with an activity by calling |addBean()| or |addObserver()| on the |BeanManager| object that represents the activity.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>Beans and observers registered with an activity are visible only to that activity and its children�they are never visible to direct or indirect parent activities, or to other children of the parent activity.</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>A bean registered with the child activity is not available for injection into any bean registered with a parent activity.</text>
     </assertion>
-    
+
     <assertion id="h">
       <text>A bean registered with a child activity is not available for injection into a non-contextual instance.</text>
     </assertion>
-    
+
     <assertion id="i">
       <text>A bean registered with a child activity may not be obtained by dynamic lookup via the parent activity.</text>
     </assertion>
-    
+
     <assertion id="j">
       <text>An observer registered with the child activity does not receive events fired via a parent activity.</text>
     </assertion>
-    
+
     <assertion id="k">
       <text>If a bean registered with a child activity has the bean type and all bindings of some injection point of some bean registered with a direct or indirect parent activity, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="l">
       <text>Interceptors and decorators may not be registered with a child activity. The |addInterceptor()| and |addDecorator()| methods throw |UnsupportedOperationException| when called on a |BeanManager| object that represents a child activity.</text>
     </assertion>
   </section>
-  
+
   <section id="11.6.1" title="Current activity">
     <assertion id="a">
       <text>An activity may be associated with the current context for a normal scope by calling |setCurrent()|, passing the normal scope type.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>If the given scope is inactive when |setCurrent()| is called, a |ContextNotActiveException| is thrown.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>If the given scope type is not a normal scope, an |IllegalArgumentException| is thrown.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>All EL evaluations (as defined Section 5.6, "Integration with Unified EL"), all calls to any injected |BeanManager| object or |BeanManager| object obtained via JNDI lookup (as defined by Section 11.2, "The BeanManager object"), all calls to any injected |Event| object (as defined in Section 10.4.1, "The Event interface") and all calls to any injected Instance object (as defined by Section 5.5.1, "The Instance interface") are processed by the current activity.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>If the root activity has no active normal scope such that the current context for that scope has an associated activity, the root activity is the current activity.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>If the root activity has exactly one active normal scope such that the current context for that scope has an associated activity, that activity is the current activity.</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>Otherwise, there is no well-defined current activity, and the behavior is undefined. Portable frameworks and applications should not depend upon the behavior of the container when two different current contexts have an associated activity.</text>
     </assertion>
-    
+
     <assertion id="h">
       <text>A bean registered with an activity is only available to Unified EL expressions that are evaluated when that activity or one of its children is the current activity.</text>
     </assertion>
   </section>
-   
+
   <section id="12" title="Packaging and Deployment">
-    
+
   </section>
-  
+
   <section id="12.1" title="Bean deployment archives">
     <assertion id="a">
       <text>Bean classes must be deployed in any EAR, JAR, WAR, EJB-JAR or RAR archive or directory in the application classpath that has a file named |beans.xml| in the metadata directory (META-INF, or WEB-INF in the case of a WAR). Any such archive or directory is called a bean deployment archive.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>When searching for beans, the container considers any Java class in any bean deployment archive, and any |ejb-jar.xml| file in any bean deployment archive.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>If a bean is deployed to a location that is not in the application classpath, or does not contain a file named |beans.xml| in the metadata directory, it will not be discovered by the container.</text>
     </assertion>
   </section>
-  
+
   <section id="12.2" title="Application initialization lifecycle">
     <assertion id="a">
       <text>When an application is started, the container performs the following steps.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>First, the container must search for service providers for the service |javax.enterprise.inject.spi.Extension| defined in Section 11.5, "Container lifecycle events", instantiate a single instance of each service provider, and search the service provider class for observer methods of initialization events.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Next, the container must fire an event of type |BeforeBeanDiscovery|, as defined in Section 11.5.1, "BeforeBeanDiscovery event".</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>Next, the container must perform bean discovery, and abort initialization of the application if any definition errors exist, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>Next, the container must fire an event of type |AfterBeanDiscovery|, as defined in Section 11.5.2, "AfterBeanDiscovery event", and abort initialization of the application if any observer registers a definition error.</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>Next, the container must detect deployment problems by validating bean dependencies and specialization and abort initialization of the application if any deployment problems exist, as defined in Section 12.4, "Problems detected automatically by the container".</text>
     </assertion>
-    
+
     <assertion id="g">
       <text>Next, the container must fire an event of type |AfterDeploymentValidation|, as defined in Section 11.5.3, "AfterDeploymentValidation event", and abort initialization of the application if any observer registers a deployment problem.</text>
     </assertion>
-    
+
     <assertion id="h">
       <text>Finally, the container begins directing requests to the application.</text>
-    </assertion>    
+    </assertion>
   </section>
-  
+
   <section id="12.3" title="Bean discovery">
     <assertion id="a">
       <text>The container automatically discovers managed beans (according to the rules of Section 3.2.1, "Which Java classes are managed beans?") and session beans in bean deployment archives and searches the bean classes for producer methods, producer fields, disposal methods and observer methods.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>For each Java class in any bean deployment archive, the container must create an |AnnotatedType| representing the class and fire an event of type |ProcessAnnotatedType|, as defined in Section
 11.5.5, "ProcessAnnotatedType event".</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>For each Java class in any bean deployment archive, the container must inspect the class metadata to determine if it is a bean or other Java EE component class supporting injection.</text>
     </assertion>
-    
+
     <assertion id="d">
       <text>For each Java class in any bean deployment archive, the container must detect definition errors by validating the class and its metadata.</text>
     </assertion>
-    
+
     <assertion id="e">
       <text>For each Java class in any bean deployment archive, the container must, if the class is a managed bean, session bean, producer method or field, or other Java EE component class supporting injection, create an |InjectionTarget| for the class, as defined in Section 11.4.1, "The InjectionTarget interface", and fire an event of type |ProcessInjectionTarget|, as defined in Section 11.5.6, "ProcessInjectionTarget event"</text>
     </assertion>
-    
+
     <assertion id="f">
       <text>For each Java class in any bean deployment archive, the container must, if the class is a bean, create a |Bean| object that implements the rules defined in Chapter 7, "Bean lifecycle", and fire an event of type |ProcessBean|, as defined in Section 11.5.7, "ProcessBean event".</text>
     </assertion>
@@ -4747,49 +4556,49 @@
     <assertion id="g">
       <text>If the class is a bean, the container must search the class for producer methods and fields, and for each producer method or field create an InjectionTarget, as defined in Section 11.4.1, "The InjectionTarget interface", for the producer method or field and fire an event of type |ProcessInjectionTarget|, as defined in Section 11.5.6, "ProcessInjectionTarget event".</text>
     </assertion>
-    
+
     <assertion id="h">
       <text>If the class is a bean, the container must search the class for producer methods and fields, and for each producer method or field create a Bean object that implements the rules defined in Chapter 7, Bean lifecycle and fire an event of type |ProcessBean|, as defined in Section 11.5.7, "ProcessBean event".</text>
     </assertion>
-    
+
     <assertion id="i">
       <text>If the class is a bean, the container must search the class for observer methods, and for each observer method create an Observer, as defined in Section 10.6.1, �Observer method notification�, for the observer method and fire an event of type ProcessObserver, as defined in Section 11.5.8, �ProcessObserver event�.</text>
     </assertion>
-    
+
     <assertion id="j">
       <text>For each session bean declared in |ejb-jar.xml| in any bean deployment archive the container must create a |Bean| object that implements the rules defined in Chapter 7, "Bean lifecycle" and fire an event of type ProcessBean.</text>
     </assertion>
-    
+
     <assertion id="k">
       <text>The container determines which beans, interceptors and decorators are enabled, according to the rules defined in Section 2.5.5, "Enabled deployment types", Section 9.4, "Interceptor enablement and ordering" and Section 8.2, "Decorator enablement and ordering", taking into account any &lt;Deploy&gt;, &lt;Interceptors&gt; and &lt;Decorators&gt; declarations in the |beans.xml| files, and registers the |Bean| and |Observer| objects.</text>
     </assertion>
-    
+
     <assertion id="l">
       <text>For each enabled bean that is not an interceptor or decorator, the container creates and registers an instance of |Bean| that implements the rules of Chapter 7, "Bean lifecycle".</text>
     </assertion>
-    
+
     <assertion id="m">
       <text>For each enabled interceptor, the container creates and registers an instance of |Interceptor|, as defined in Section 11.1.2, "The Interceptor interface".</text>
     </assertion>
-    
+
     <assertion id="n">
       <text>For each enabled decorator, the container creates and registers an instance of |Decorator|, as defined in Section 11.1.1, "The Decorator interface".</text>
     </assertion>
-    
+
     <assertion id="o">
       <text>For each observer method of an enabled bean, the container creates and registers an instance of |Observer| that implements the rules of Section 10.6.1, "Observer method notification".</text>
     </assertion>
   </section>
-  
+
   <section id="12.4" title="Problems detected automatically by the container">
     <assertion id="a">
       <text>Definition errors may be detected by tooling at development time, and are also detected by the container at initialization time. If a definition error exists in a deployment, initialization will be aborted by the container.</text>
     </assertion>
-    
+
     <assertion id="b">
       <text>Deployment problems are detected by the container at initialization time. If a deployment problem exists in a deployment, initialization will be aborted by the container.</text>
     </assertion>
-    
+
     <assertion id="c">
       <text>Execution errors are represented by instances of |javax.enterprise.inject.InjectionException| and its subclasses.</text>
     </assertion>




More information about the weld-commits mailing list