[weld-commits] Weld SVN: r4930 - cdi-tck/trunk/impl/src/main/resources.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Mon Nov 9 22:02:49 EST 2009
Author: shane.bryzak at jboss.com
Date: 2009-11-09 22:02:49 -0500 (Mon, 09 Nov 2009)
New Revision: 4930
Modified:
cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
Log:
audit corrections for chapter 12
Modified: cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-11-10 02:39:43 UTC (rev 4929)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-11-10 03:02:49 UTC (rev 4930)
@@ -6303,25 +6303,33 @@
<section id="12.1" title="Bean deployment archives">
<assertion id="aa" testable="false">
- <text>Bean classes of enabled beans must be deployed in bean deployment archives.</text>
+ <text>Bean classes of enabled beans must be deployed in bean archives.</text>
</assertion>
<assertion id="a" testable="false">
- <text>A library jar, EJB jar, application client jar or rar archive is a bean deployment archive if it has a file named |beans.xml| in the |META-INF| directory. The |WEB-INF/classes| directory of a war is a bean deployment archive if there is a file named |beans.xml| in the |WEBINF| directory of the war. A directory in the JVM classpath is a bean deployment archive if it has a file named |beans.xml| in the |META-INF| directory.</text>
+ <text>A library jar, EJB jar, application client jar or rar archive is a bean archive if it has a file named |beans.xml| in the |META-INF| directory.</text>
+ </assertion>
+
+ <assertion id="ab" testable="false">
+ <text>The |WEB-INF/classes| directory of a war is a bean archive if there is a file named |beans.xml| in the |WEB-INF| directory of the war.</text>
+ </assertion>
+
+ <assertion id="ac" testable="false">
+ <text>A directory in the JVM classpath is a bean deployment archive if it has a file named |beans.xml| in the |META-INF| directory.</text>
<note>covered in bb*, bc*, bd*</note>
</assertion>
<assertion id="b" testable="false">
- <text>The container is not required to support application client jar bean deployment archives.</text>
+ <text>The container is not required to support application client jar bean archives.</text>
</assertion>
<assertion id="ba" testable="false">
- <text>The container searches for beans in bean deployment archives in the application classpath.</text>
+ <text>The container searches for beans in all bean archives in the application classpath.</text>
<note>covered in bb*, bc*, bd*</note>
</assertion>
<group>
- <text>In an application deployed as an ear, the container searches every bean deployment archive bundled with or referenced by the ear, including bean deployment archives bundled with or referenced by wars and EJB jars contained in the ear. The bean deployment archives might be library jars, EJB jars, rars or war |WEB-INF/classes| directories.</text>
+ <text>In an application deployed as an ear, the container searches every bean archive bundled with or referenced by the ear, including bean archives bundled with or referenced by wars and EJB jars contained in the ear. The bean archives might be library jars, EJB jars, rars or war |WEB-INF/classes| directories.</text>
<assertion id="bba">
<text>Check an EJB jar in an EAR</text>
</assertion>
@@ -6343,7 +6351,7 @@
</group>
<group>
- <text>In an application deployed as a war, the container searches every bean deployment archive bundled with or referenced by the war. The bean deployment archives might be library jars or the |WEB-INF/classes| directory.</text>
+ <text>In an application deployed as a war, the container searches every bean archive bundled with or referenced by the war. The bean archives might be library jars or the |WEB-INF/classes| directory.</text>
<assertion id="bca">
<text>Check classes in the war</text>
</assertion>
@@ -6356,7 +6364,7 @@
</group>
<group>
- <text>In an application deployed as an EJB jar, the container searches the EJB jar, if it is a bean deployment archive, and every bean deployment archive referenced by the EJB jar.</text>
+ <text>In an application deployed as an EJB jar, the container searches the EJB jar, if it is a bean archive, and every bean archive referenced by the EJB jar.</text>
<assertion id="bcd">
<text>Check classes in the jar.</text>
@@ -6364,7 +6372,7 @@
</group>
<group>
- <text>An embeddable EJB container searches each bean deployment archive in the JVM classpath that is listed in the value of the embeddable container initialization property |javax.ejb.embeddable.modules|, or every bean deployment archive in the JVM classpath if the property is not specified. The bean deployment archives might be directories, library jars or EJB jars.</text>
+ <text>An embeddable EJB container searches each bean archive in the JVM classpath that is listed in the value of the embeddable container initialization property |javax.ejb.embeddable.modules|, or every bean archive in the JVM classpath if the property is not specified. The bean archives might be directories, library jars or EJB jars.</text>
<assertion id="bda" testable="false">
<text>Check modules specified by |javax.ejb.embeddable.modules|</text>
<note>1.0 release of the TCK does not cover embeddable EJB</note>
@@ -6384,12 +6392,12 @@
</group>
<assertion id="be" testable="false">
- <text>When searching for beans, the container considers any Java class in any bean deployment archive, any |ejb-jar.xml| file in the metadata directory of any EJB bean deployment archive, any Java class referenced by the |@New| qualifier of an injection point of another bean, and any interceptor or decorator class declared in the |beans.xml| file of any bean deployment archive.</text>
+ <text>When searching for beans, the container considers any Java class in any bean archive, any |ejb-jar.xml| file in the metadata directory of any EJB bean archive, any Java class referenced by the |@New| qualifier of an injection point of another bean, and any interceptor or decorator class declared in the |beans.xml| file of any bean archive.</text>
<note>covered in bb*, bc*, bd*</note>
</assertion>
<assertion id="d" testable="false">
- <text>If a bean class is deployed in two different bean deployment archives, non-portable behaviour results. Portable applications must deploy each bean class in exactly one bean deployment archive.</text>
+ <text>If a bean class is deployed in two different bean archives, non-portable behaviour results. Portable applications must deploy each bean class in no more than one bean archive.</text>
<note>Describes undefined behavior</note>
</assertion>
</section>
@@ -6409,7 +6417,7 @@
</assertion>
<group>
- <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". Additionally, for every Java EE component class supporting injection that may be instantiated by the container at runtime, the container must create an |InjectionTarget| for the class, as defined in 11.2, "The Producer and InjectionTarget interfaces", and fire an event of type ProcessInjectionTarget, as defined in Section 11.5.6, "ProcessInjectionTarget event".</text>
+ <text>Next, the container must perform bean discovery, and abort initialization of the application if any definition errors exist, as defined in Section 2.8, "Problems detected automatically by the container". Additionally, for every Java EE component class supporting injection that may be instantiated by the container at runtime, the container must create an |InjectionTarget| for the class, as defined in 11.2, "The Producer and InjectionTarget interfaces", and fire an event of type ProcessInjectionTarget, as defined in Section 11.5.6, "ProcessInjectionTarget event".</text>
<assertion id="da">
<text>Check beans are discovered</text>
@@ -6427,7 +6435,7 @@
</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>
+ <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 2.8, "Problems detected automatically by the container".</text>
</assertion>
<assertion id="g">
@@ -6442,12 +6450,12 @@
<section id="12.3" title="Bean discovery">
<assertion id="a" testable="false">
- <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, disposer methods and observer methods.</text>
+ <text>The container automatically discovers managed beans (according to the rules of Section 3.1.1, "Which Java classes are managed beans?") and session beans in bean archives and searches the bean classes for producer methods, producer fields, disposer methods and observer methods.</text>
<note>Statement of intent</note>
</assertion>
<group>
- <text>For each Java class or interface deployed in a bean deployment archive, the container must create an |AnnotatedType| representing the type and fire an event of type |ProcessAnnotatedType|, as defined in Section 11.5.5, "ProcessAnnotatedType event".</text>
+ <text>For each Java class or interface deployed in a bean archive, the container must create an |AnnotatedType| representing the type and fire an event of type |ProcessAnnotatedType|, as defined in Section 11.5.5, "ProcessAnnotatedType event".</text>
<assertion id="ba">
<text>Check managed bean</text>
</assertion>
@@ -6484,17 +6492,17 @@
</group>
<assertion id="c" testable="false">
- <text>For each Java class in any bean deployment archive, the container must inspect the type metadata to determine if it is a bean or other Java EE component class supporting injection.</text>
+ <text>For each Java class in any bean archive, the container must inspect the type metadata to determine if it is a bean or other Java EE component class supporting injection.</text>
<note>No consequence</note>
</assertion>
<assertion id="d" testable="false">
- <text>For each Java class in any bean deployment archive, the container must detect definition errors by validating the class and its metadata.</text>
+ <text>For each Java class in any bean archive, the container must detect definition errors by validating the class and its metadata.</text>
<note>Tested elsewhere</note>
</assertion>
<group>
- <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.2, "The Producer and InjectionTarget interfaces", and fire an event of type |ProcessInjectionTarget|, as defined in Section 11.5.6, "ProcessInjectionTarget event"</text>
+ <text>For each Java class in any bean archive, the container must, if the class is a managed bean, session bean, or other Java EE component class supporting injection, create an |InjectionTarget| for the class, as defined in Section 11.2, "The Producer and InjectionTarget interfaces", and fire an event of type |ProcessInjectionTarget|, as defined in Section 11.5.6, "ProcessInjectionTarget event"</text>
<assertion id="da">
<text>Check managed bean</text>
</assertion>
@@ -6531,7 +6539,7 @@
</group>
<group>
- <text>For each Java class in any bean deployment archive, the container must, if the class is an enabled bean, interceptor or decorator, create a |Bean| object that implements the rules defined in Section 7.3.1, "Lifecycle of managed beans", Section 7.3.2, "Lifecycle of stateful session beans" or Section 7.3.3, "Lifecycle of stateless session and singleton beans", and fire an event which is a subtype of |ProcessBean|, as defined in Section 11.5.8, "ProcessBean event".</text>
+ <text>For each Java class in any bean archive, the container must, if the class is an enabled bean, interceptor or decorator, create a |Bean| object that implements the rules defined in Section 7.3.1, "Lifecycle of managed beans", Section 7.3.2, "Lifecycle of stateful session beans" or Section 7.3.3, "Lifecycle of stateless session and singleton beans", and fire an event which is a subtype of |ProcessBean|, as defined in Section 11.5.8, "ProcessBean event".</text>
<assertion id="fa">
<text>Check a managed bean</text>
</assertion>
@@ -6560,7 +6568,7 @@
</assertion>
<group>
- <text>The container determines which alternatives, interceptors and decorators are enabled, according to the rules defined in Section 5.2.2, "Enabled and disabled beans", Section 9.4, "Interceptor enablement and ordering" and Section 8.2, "Decorator enablement and ordering", taking into account any |<enable>|, |<interceptors>| and |<decorators>| declarations in the |beans.xml| files, and registers the |Bean| and |ObserverMethod| objects.</text>
+ <text>The container determines which alternatives, interceptors and decorators are enabled, according to the rules defined in Section 5.1.2, "Enabled and disabled beans", Section 9.4, "Interceptor enablement and ordering" and Section 8.2, "Decorator enablement and ordering", taking into account any |<enable>|, |<interceptors>| and |<decorators>| declarations in the |beans.xml| files, and registers the |Bean| and |ObserverMethod| objects.</text>
<assertion id="ka">
<text>Check only beans for enabled policies registered</text>
</assertion>
@@ -6596,15 +6604,15 @@
<assertion id="a">
<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 defined in 5.3, "EL name resolution" and resolving ambiguities according to Section 5.3.1, "Ambiguous EL names".</text>
</assertion>
+
+ <assertion id="c">
+ <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="b">
<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="c">
- <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="d">
<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>
More information about the weld-commits
mailing list