Author: shane.bryzak(a)jboss.com Date: 2009-03-18 05:47:11 -0400 (Wed, 18 Mar 2009) New Revision: 2086 Modified: tck/trunk/impl/src/main/resources/tck-audit.xml Log: removed ambiguous language Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-03-18 09:41:01 UTC (rev 2085) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-03-18 09:47:11 UTC (rev 2086) @@ -2146,27 +2146,27 @@ <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 _simple_ 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> + <text>For class X which is extended _directly_ by the bean class of a _simple_ 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 id="ab"> - <text>For class X which is extended _directly_ by the bean class of a _simple_ 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> + <text>For class X which is extended _directly_ by the bean class of a _simple_ 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 id="ac"> - <text>For class X which is extended _directly_ by the bean class of a _simple_ bean Y, if X is annotated with a _interceptor 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> + <text>For class X which is extended _directly_ by the bean class of a _simple_ bean Y, if X is annotated with a _interceptor 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 id="ad"> - <text>For class X which is extended _directly_ by the bean class of a _session_ 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> + <text>For class X which is extended _directly_ by the bean class of a _session_ 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 id="ae"> - <text>For class X which is extended _directly_ by the bean class of a _session_ 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> + <text>For class X which is extended _directly_ by the bean class of a _session_ 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 id="af"> - <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X is annotated with a _interceptor 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> + <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X is annotated with a _interceptor 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 id="ag"> @@ -2194,11 +2194,11 @@ </assertion> <assertion id="ba"> - <text>For class X which is extended _directly_ by the bean class of a _simple_ 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> + <text>For class X which is extended _directly_ by the bean class of a _simple_ 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 _session_ 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> + <text>For class X which is extended _directly_ by the bean class of a _session_ 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"> @@ -2210,11 +2210,11 @@ </assertion> <assertion id="ca"> - <text>For class X which is extended _directly_ by the bean class of a _simple_ bean Y, if X is annotated with a deployment 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 deployment type.</text> + <text>For class X which is extended _directly_ by the bean class of a _simple_ bean Y, if X is annotated with a deployment type Z then Y inherits the annotation if and only if Z declares the @Inherited meta-annotation and Y does not declare a deployment type.</text> </assertion> <assertion id="cb"> - <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X is annotated with a deployment 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 deployment type.</text> + <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X is annotated with a deployment type Z then Y inherits the annotation if and only if Z declares the @Inherited meta-annotation and Y does not declare a deployment type.</text> </assertion> <assertion id="cc"> @@ -2335,11 +2335,11 @@ </assertion> <assertion id="baa"> - <text>For class X which is extended _directly_ by the bean class of a _simple_ 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> + <text>For class X which is extended _directly_ by the bean class of a _simple_ 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 _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> + <text>For class X which is extended _directly_ by the bean class of a _session_ 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"> @@ -2351,11 +2351,11 @@ </assertion> <assertion id="bba"> - <text>For class X which is extended _directly_ by the bean class of a _simple_ 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> + <text>For class X which is extended _directly_ by the bean class of a _simple_ 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 neither Y nor any intermediate class that is a subclass of X and a superclass of Y overrides the method x()</text> + <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"> @@ -2367,11 +2367,11 @@ </assertion> <assertion id="ca"> - <text>For class X which is extended _directly_ by the bean class of a _simple_ bean Y, if X declares a _non-static method_ x() annotated with an interceptor binding type Z then Y inherits the binding 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> + <text>For class X which is extended _directly_ by the bean class of a _simple_ bean Y, if X declares a _non-static method_ x() annotated with an interceptor binding type Z then Y inherits the binding if and only if Y does not override the method x().</text> </assertion> <assertion id="cb"> - <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X declares a _non-static method_ x() annotated with an interceptor binding type Z then Y inherits the binding 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> + <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X declares a _non-static method_ x() annotated with an interceptor binding type Z then Y inherits the binding if and only if Y does not override the method x().</text> </assertion> <assertion id="cc"> @@ -2447,11 +2447,11 @@ </assertion> <assertion id="fa"> - <text>For class X which is extended _directly_ by the bean class of a _simple_ bean Y, if Y is a decorator and X declares a delegate attribute 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 defines a delegate attribute</text> + <text>For class X which is extended _directly_ by the bean class of a _simple_ bean Y, if Y is a decorator and X declares a delegate attribute x then Y inherits x if and only if Y does not define a delegate attribute</text> </assertion> <assertion id="fb"> - <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if Y is a decorator and X declares a delegate attribute 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 defines a delegate attribute</text> + <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if Y is a decorator and X declares a delegate attribute x then Y inherits x if and only if neither Y does not define a delegate attribute</text> </assertion> <assertion id="fc">