Weld SVN: r4867 - in core/trunk: bom and 7 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-09 10:39:49 -0500 (Mon, 09 Nov 2009)
New Revision: 4867
Modified:
core/trunk/bom/pom.xml
core/trunk/impl/pom.xml
core/trunk/inject-tck-runner/pom.xml
core/trunk/jboss-tck-runner/pom.xml
core/trunk/osgi-bundle/pom.xml
core/trunk/parent/pom.xml
core/trunk/pom.xml
core/trunk/porting-package/pom.xml
core/trunk/tests/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2009-11-09 15:39:31 UTC (rev 4866)
+++ core/trunk/bom/pom.xml 2009-11-09 15:39:49 UTC (rev 4867)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
<packaging>pom</packaging>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -175,9 +175,9 @@
<!-- SCM and distribution management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.0/bom</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0/bom</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0/core/bom</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/bom</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/bom</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Weld/core/bom</url>
</scm>
</project>
Modified: core/trunk/impl/pom.xml
===================================================================
--- core/trunk/impl/pom.xml 2009-11-09 15:39:31 UTC (rev 4866)
+++ core/trunk/impl/pom.xml 2009-11-09 15:39:49 UTC (rev 4867)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/inject-tck-runner/pom.xml
===================================================================
--- core/trunk/inject-tck-runner/pom.xml 2009-11-09 15:39:31 UTC (rev 4866)
+++ core/trunk/inject-tck-runner/pom.xml 2009-11-09 15:39:49 UTC (rev 4867)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/jboss-tck-runner/pom.xml
===================================================================
--- core/trunk/jboss-tck-runner/pom.xml 2009-11-09 15:39:31 UTC (rev 4866)
+++ core/trunk/jboss-tck-runner/pom.xml 2009-11-09 15:39:49 UTC (rev 4867)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/osgi-bundle/pom.xml
===================================================================
--- core/trunk/osgi-bundle/pom.xml 2009-11-09 15:39:31 UTC (rev 4866)
+++ core/trunk/osgi-bundle/pom.xml 2009-11-09 15:39:49 UTC (rev 4867)
@@ -16,7 +16,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2009-11-09 15:39:31 UTC (rev 4866)
+++ core/trunk/parent/pom.xml 2009-11-09 15:39:49 UTC (rev 4867)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../bom</relativePath>
</parent>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2009-11-09 15:39:31 UTC (rev 4866)
+++ core/trunk/pom.xml 2009-11-09 15:39:49 UTC (rev 4867)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -18,9 +18,9 @@
<!-- SCM and distribution management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.0</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Weld</url>
</scm>
<profiles>
Modified: core/trunk/porting-package/pom.xml
===================================================================
--- core/trunk/porting-package/pom.xml 2009-11-09 15:39:31 UTC (rev 4866)
+++ core/trunk/porting-package/pom.xml 2009-11-09 15:39:49 UTC (rev 4867)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/tests/pom.xml
===================================================================
--- core/trunk/tests/pom.xml 2009-11-09 15:39:31 UTC (rev 4866)
+++ core/trunk/tests/pom.xml 2009-11-09 15:39:49 UTC (rev 4867)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
14 years, 11 months
Weld SVN: r4866 - core/tags.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-09 10:39:31 -0500 (Mon, 09 Nov 2009)
New Revision: 4866
Added:
core/tags/1.0.0/
Log:
[maven-scm] copy for tag 1.0.0
Copied: core/tags/1.0.0 (from rev 4865, core/trunk)
14 years, 11 months
Weld SVN: r4865 - in core/trunk: bom and 7 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-09 10:39:12 -0500 (Mon, 09 Nov 2009)
New Revision: 4865
Modified:
core/trunk/bom/pom.xml
core/trunk/impl/pom.xml
core/trunk/inject-tck-runner/pom.xml
core/trunk/jboss-tck-runner/pom.xml
core/trunk/osgi-bundle/pom.xml
core/trunk/parent/pom.xml
core/trunk/pom.xml
core/trunk/porting-package/pom.xml
core/trunk/tests/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2009-11-09 15:23:50 UTC (rev 4864)
+++ core/trunk/bom/pom.xml 2009-11-09 15:39:12 UTC (rev 4865)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -175,9 +175,9 @@
<!-- SCM and distribution management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/bom</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/bom</developerConnection>
- <url>http://fisheye.jboss.org/browse/Weld/core/bom</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.0/bom</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0/bom</developerConnection>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0/core/bom</url>
</scm>
</project>
Modified: core/trunk/impl/pom.xml
===================================================================
--- core/trunk/impl/pom.xml 2009-11-09 15:23:50 UTC (rev 4864)
+++ core/trunk/impl/pom.xml 2009-11-09 15:39:12 UTC (rev 4865)
@@ -1,9 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/inject-tck-runner/pom.xml
===================================================================
--- core/trunk/inject-tck-runner/pom.xml 2009-11-09 15:23:50 UTC (rev 4864)
+++ core/trunk/inject-tck-runner/pom.xml 2009-11-09 15:39:12 UTC (rev 4865)
@@ -1,9 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/jboss-tck-runner/pom.xml
===================================================================
--- core/trunk/jboss-tck-runner/pom.xml 2009-11-09 15:23:50 UTC (rev 4864)
+++ core/trunk/jboss-tck-runner/pom.xml 2009-11-09 15:39:12 UTC (rev 4865)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/osgi-bundle/pom.xml
===================================================================
--- core/trunk/osgi-bundle/pom.xml 2009-11-09 15:23:50 UTC (rev 4864)
+++ core/trunk/osgi-bundle/pom.xml 2009-11-09 15:39:12 UTC (rev 4865)
@@ -16,7 +16,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2009-11-09 15:23:50 UTC (rev 4864)
+++ core/trunk/parent/pom.xml 2009-11-09 15:39:12 UTC (rev 4865)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-parent</artifactId>
@@ -8,7 +7,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<relativePath>../bom</relativePath>
</parent>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2009-11-09 15:23:50 UTC (rev 4864)
+++ core/trunk/pom.xml 2009-11-09 15:39:12 UTC (rev 4865)
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -19,9 +18,9 @@
<!-- SCM and distribution management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/Weld</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0</developerConnection>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0</url>
</scm>
<profiles>
Modified: core/trunk/porting-package/pom.xml
===================================================================
--- core/trunk/porting-package/pom.xml 2009-11-09 15:23:50 UTC (rev 4864)
+++ core/trunk/porting-package/pom.xml 2009-11-09 15:39:12 UTC (rev 4865)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/tests/pom.xml
===================================================================
--- core/trunk/tests/pom.xml 2009-11-09 15:23:50 UTC (rev 4864)
+++ core/trunk/tests/pom.xml 2009-11-09 15:39:12 UTC (rev 4865)
@@ -1,9 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
14 years, 11 months
Weld SVN: r4864 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests: lifecycleCallback/order and 1 other directory.
by weld-commits＠lists.jboss.org
Author: jharting
Date: 2009-11-09 10:23:50 -0500 (Mon, 09 Nov 2009)
New Revision: 4864
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java
Log:
Removed ri-broken flags
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java 2009-11-09 15:20:24 UTC (rev 4863)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java 2009-11-09 15:23:50 UTC (rev 4864)
@@ -26,9 +26,8 @@
@SpecVersion(spec = "int", version = "3.1.PFD")
public class DefinitionTest extends AbstractJSR299Test
{
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section = "1", id= "a")
- // WELD-276
public void testInterceptorMethodDefinedOnTargetClass() {
assert getInstanceByType(ClassWithAroundInvokeMethod.class).foo().equals("barbar");
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java 2009-11-09 15:20:24 UTC (rev 4863)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java 2009-11-09 15:23:50 UTC (rev 4864)
@@ -27,14 +27,13 @@
@SpecVersion(spec = "int", version = "3.1.PFD")
public class InvocationOrderTest extends AbstractJSR299Test
{
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertions({
@SpecAssertion(section = "5.1", id = "c"),
@SpecAssertion(section = "5.1", id = "d"),
@SpecAssertion(section = "5.1", id = "e"),
@SpecAssertion(section = "5.1", id = "f")
})
- // WELD-280
public void testInvocationOrder() {
getInstanceByType(LakeCargoShip.class);
assert LakeCargoShip.getSequence() == 7;
14 years, 11 months
Weld SVN: r4862 - core/trunk/jboss-tck-runner/src/test/resources.
by weld-commits＠lists.jboss.org
Author: jharting
Date: 2009-11-09 09:49:40 -0500 (Mon, 09 Nov 2009)
New Revision: 4862
Modified:
core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
Log:
Added interceptor tests package to the testsuite
Modified: core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2009-11-09 14:37:44 UTC (rev 4861)
+++ core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2009-11-09 14:49:40 UTC (rev 4862)
@@ -18,6 +18,7 @@
</groups>
<packages>
<package name="org.jboss.jsr299.tck.tests.*" />
+ <package name="org.jboss.jsr299.tck.interceptors.tests.*" />
</packages>
<classes>
<class name="org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInjectedField.PassivationCapableBeanWithNonPassivatingInterceptorTest">
14 years, 11 months
Weld SVN: r4861 - cdi-tck/trunk/impl/src/main/resources.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-11-09 09:37:44 -0500 (Mon, 09 Nov 2009)
New Revision: 4861
Modified:
cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
Log:
audit corrections for chapter 10
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-09 13:03:37 UTC (rev 4860)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-11-09 14:37:44 UTC (rev 4861)
@@ -4730,7 +4730,7 @@
</assertion>
<assertion id="g">
- <text>All event qualifier types must specify the |(a)javax.enterprise.inject.BindingType| meta-annotation</text>
+ <text>All event qualifier types must specify the |(a)javax.inject.Qualifier| meta-annotation</text>
</assertion>
<assertion id="i">
@@ -4859,7 +4859,7 @@
<section id="10.3.2" title="The built-in Event">
<assertion id="a">
- <text>The container must provide a built-in bean with |Event<X>| for every legal observed event type X in its set of bean types.</text>
+ <text>The container must provide a built-in bean with |Event<X>| in its set of bean types, for every Java type |x| that does not contain a type variable.</text>
</assertion>
<assertion id="b">
@@ -4962,7 +4962,7 @@
</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.</text>
+ <text>If an observer method has a parameter annotated |@Disposes|, the container automatically detects the problem and treats it as a definition error.</text>
</assertion>
<assertion id="g">
@@ -5071,7 +5071,7 @@
</assertion>
<assertion id="f">
- <text>For a custom implementation of the |ObserverMethod| interface defined in Section 11.1.3, "The ObserverMethod interface", the container must call |getReception()| and |getTransactionPhase()| to determine is the observer method is a conditional or transactional observer method, and |notify()| to invoke the method.</text>
+ <text>For a custom implementation of the |ObserverMethod| interface defined in Section 11.1.3, "The ObserverMethod interface", the container must call |getReception()| and |getTransactionPhase()| to determine if the observer method is a conditional or transactional observer method, and |notify()| to invoke the method.</text>
</assertion>
</section>
14 years, 11 months
Weld SVN: r4860 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests: lifecycleCallback and 1 other directory.
by weld-commits＠lists.jboss.org
Author: jharting
Date: 2009-11-09 08:03:37 -0500 (Mon, 09 Nov 2009)
New Revision: 4860
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/LifecycleCallbackInterceptor.java
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/SimpleBean.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/LifecycleCallbackInterceptorTest.java
Log:
Removed ri-broken flags, added test for InvocationContext
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java 2009-11-09 12:38:09 UTC (rev 4859)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java 2009-11-09 13:03:37 UTC (rev 4860)
@@ -52,34 +52,39 @@
@Test
@SpecAssertion(section = "6", id = "g")
- public void testGetMethodMethod()
+ public void testGetMethodForAroundInvokeInterceptorMethod()
{
assert getInstanceByType(SimpleBean.class).testGetMethod();
}
+
+ @Test
+ @SpecAssertion(section = "6", id = "h")
+ public void testGetMethodForLifecycleCallbackInterceptorMethod()
+ {
+ getInstanceByType(SimpleBean.class);
+ assert LifecycleCallbackInterceptor.isGetMethodReturnsNull();
+ }
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertions( {
@SpecAssertion(section = "6", id = "i"),
@SpecAssertion(section = "6", id = "j"),
@SpecAssertion(section = "6", id = "k")
})
- // WELD-275
public void testMethodParameters()
{
assert getInstanceByType(SimpleBean.class).add(1, 2) == 5;
}
- @Test(expectedExceptions = IllegalArgumentException.class, groups = "ri-broken")
+ @Test(expectedExceptions = IllegalArgumentException.class)
@SpecAssertion(section = "6", id = "la")
- // WELD-275
public void testIllegalNumberOfParameters()
{
getInstanceByType(SimpleBean.class).add2(1, 1);
}
- @Test(expectedExceptions = IllegalArgumentException.class, groups = "ri-broken")
+ @Test(expectedExceptions = IllegalArgumentException.class)
@SpecAssertion(section = "6", id = "lb")
- // WELD-275
public void testIllegalTypeOfParameters()
{
assert getInstanceByType(SimpleBean.class).add3(1, 1) == 2;
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/LifecycleCallbackInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/LifecycleCallbackInterceptor.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/LifecycleCallbackInterceptor.java 2009-11-09 13:03:37 UTC (rev 4860)
@@ -0,0 +1,27 @@
+package org.jboss.jsr299.tck.interceptors.tests.invocationContext;
+
+import javax.annotation.PostConstruct;
+import javax.interceptor.InvocationContext;
+
+class LifecycleCallbackInterceptor
+{
+ private static boolean getMethodReturnsNull = false;
+
+ @PostConstruct
+ public void postConstruct(InvocationContext ctx)
+ {
+ getMethodReturnsNull = ctx.getMethod() == null;
+ try
+ {
+ ctx.proceed();
+ }
+ catch (Exception e)
+ {
+ }
+ }
+
+ public static boolean isGetMethodReturnsNull()
+ {
+ return getMethodReturnsNull;
+ }
+}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/SimpleBean.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/SimpleBean.java 2009-11-09 12:38:09 UTC (rev 4859)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/SimpleBean.java 2009-11-09 13:03:37 UTC (rev 4860)
@@ -2,6 +2,7 @@
import javax.interceptor.Interceptors;
+(a)Interceptors(LifecycleCallbackInterceptor.class)
class SimpleBean
{
private int id = 0;
@@ -57,9 +58,10 @@
public void foo()
{
}
-
+
@Interceptors(Interceptor10.class)
- public String echo(String s) {
+ public String echo(String s)
+ {
echoCalled = true;
return s;
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/LifecycleCallbackInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/LifecycleCallbackInterceptorTest.java 2009-11-09 12:38:09 UTC (rev 4859)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/LifecycleCallbackInterceptorTest.java 2009-11-09 13:03:37 UTC (rev 4860)
@@ -38,9 +38,8 @@
assert GoatInterceptor.isPostConstructInterceptorCalled();
}
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section = "5", id = "a")
- // WELD-279
public void testPreDestroyInterceptor()
{
// create the instance
14 years, 11 months
Weld SVN: r4859 - core/trunk/impl/src/main/java/org/jboss/weld/bean and 2 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-09 07:38:09 -0500 (Mon, 09 Nov 2009)
New Revision: 4859
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java
core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
Log:
WELD-277
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-11-09 12:24:25 UTC (rev 4858)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-11-09 12:38:09 UTC (rev 4859)
@@ -93,7 +93,7 @@
public void testProducerPoliciesOnClass() throws Exception
{
assert getBeans(Sheep.class, new AnnotationLiteral<Wild>(){}).size() == 2;
- assert getBeans(Sheep.class, new AnnotationLiteral<Tame>(){}).size() == 0;
+ assert getBeans(Sheep.class, new AnnotationLiteral<Tame>(){}).size() == 2;
}
@Test
@@ -104,6 +104,6 @@
public void testProducerPoliciesOnMethodAndField() throws Exception
{
assert getBeans(Cat.class, new AnnotationLiteral<Wild>(){}).size() == 2;
- assert getBeans(Cat.class, new AnnotationLiteral<Tame>(){}).size() == 0;
+ assert getBeans(Cat.class, new AnnotationLiteral<Tame>(){}).size() == 2;
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-11-09 12:24:25 UTC (rev 4858)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-11-09 12:38:09 UTC (rev 4859)
@@ -37,7 +37,6 @@
import javax.decorator.Delegate;
import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Alternative;
import javax.enterprise.inject.New;
import javax.enterprise.inject.Specializes;
import javax.enterprise.inject.Stereotype;
@@ -58,6 +57,7 @@
import org.jboss.weld.literal.DefaultLiteral;
import org.jboss.weld.metadata.cache.MergedStereotypes;
import org.jboss.weld.metadata.cache.MetaAnnotationStore;
+import org.jboss.weld.util.Beans;
import org.jboss.weld.util.Reflections;
import org.slf4j.cal10n.LocLogger;
@@ -88,7 +88,7 @@
// The merged stereotypes
private MergedStereotypes<T, S> mergedStereotypes;
// Is it a policy, either defined by stereotypes or directly?
- private boolean policy;
+ protected boolean alternative;
// The type
protected Class<T> type;
// The API types
@@ -254,16 +254,9 @@
this.bindings.add(ANY_LITERAL);
}
- protected void initPolicy()
+ protected void initAlternative()
{
- if (getAnnotatedItem().isAnnotationPresent(Alternative.class))
- {
- this.policy = true;
- }
- else
- {
- this.policy = getMergedStereotypes().isPolicy();
- }
+ this.alternative = Beans.isAlternative(getAnnotatedItem(), getMergedStereotypes());
}
/**
@@ -513,7 +506,7 @@
public boolean isAlternative()
{
- return policy;
+ return alternative;
}
@Override
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2009-11-09 12:24:25 UTC (rev 4858)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2009-11-09 12:38:09 UTC (rev 4859)
@@ -132,7 +132,7 @@
};
initStereotypes();
- initPolicy();
+ initAlternative();
initInitializerMethods();
initInjectableFields();
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java 2009-11-09 12:24:25 UTC (rev 4858)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java 2009-11-09 12:38:09 UTC (rev 4859)
@@ -163,6 +163,7 @@
super.initialize(environment);
checkProducerReturnType();
initPassivationCapable();
+ initAlternative();
}
private void initPassivationCapable()
@@ -176,6 +177,12 @@
this.passivationCapable = true;
}
}
+
+ @Override
+ protected void initAlternative()
+ {
+ super.alternative = Beans.isAlternative(getAnnotatedItem(), getMergedStereotypes()) || getDeclaringBean().isAlternative();
+ }
@Override
public boolean isPassivationCapable()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java 2009-11-09 12:24:25 UTC (rev 4858)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java 2009-11-09 12:38:09 UTC (rev 4859)
@@ -105,7 +105,7 @@
}
@Override
- protected void initPolicy()
+ protected void initAlternative()
{
if (getDeclaringBean().isAlternative())
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java 2009-11-09 12:24:25 UTC (rev 4858)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java 2009-11-09 12:38:09 UTC (rev 4859)
@@ -57,7 +57,6 @@
initType();
initTypes();
initStereotypes();
- initPolicy();
addInjectionPoints(Beans.getParameterInjectionPoints(this, disposalMethodInjectionPoint));
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java 2009-11-09 12:24:25 UTC (rev 4858)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java 2009-11-09 12:38:09 UTC (rev 4859)
@@ -71,7 +71,7 @@
initTypes();
initBindings();
initStereotypes();
- initPolicy();
+ initAlternative();
}
@Override
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java 2009-11-09 12:24:25 UTC (rev 4858)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java 2009-11-09 12:38:09 UTC (rev 4859)
@@ -84,7 +84,7 @@
initBindings();
this.id = new StringBuilder().append(BEAN_ID_PREFIX).append(getClass().getSimpleName()).append(BEAN_ID_SEPARATOR).append(declaringBean.getAnnotatedItem().getName()).append(getAnnotatedItem().getSignature().toString()).toString();
initStereotypes();
- initPolicy();
+ initAlternative();
initProducerMethodInjectableParameters();
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-11-09 12:24:25 UTC (rev 4858)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-11-09 12:38:09 UTC (rev 4859)
@@ -44,6 +44,7 @@
import javax.enterprise.context.spi.Contextual;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Alternative;
import javax.enterprise.inject.CreationException;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
@@ -56,9 +57,9 @@
import org.jboss.weld.BeanManagerImpl;
import org.jboss.weld.Container;
import org.jboss.weld.DefinitionException;
+import org.jboss.weld.bean.DecoratorImpl;
import org.jboss.weld.bean.RIBean;
import org.jboss.weld.bean.SessionBean;
-import org.jboss.weld.bean.DecoratorImpl;
import org.jboss.weld.ejb.EJBApiAbstraction;
import org.jboss.weld.injection.ConstructorInjectionPoint;
import org.jboss.weld.injection.FieldInjectionPoint;
@@ -69,6 +70,7 @@
import org.jboss.weld.injection.spi.JpaInjectionServices;
import org.jboss.weld.injection.spi.ResourceInjectionServices;
import org.jboss.weld.introspector.MethodSignature;
+import org.jboss.weld.introspector.WeldAnnotated;
import org.jboss.weld.introspector.WeldClass;
import org.jboss.weld.introspector.WeldConstructor;
import org.jboss.weld.introspector.WeldField;
@@ -77,6 +79,7 @@
import org.jboss.weld.introspector.WeldParameter;
import org.jboss.weld.metadata.cache.BindingTypeModel;
import org.jboss.weld.metadata.cache.InterceptorBindingModel;
+import org.jboss.weld.metadata.cache.MergedStereotypes;
import org.jboss.weld.metadata.cache.MetaAnnotationStore;
import org.jboss.weld.persistence.PersistenceApiAbstraction;
import org.slf4j.cal10n.LocLogger;
@@ -584,6 +587,18 @@
return false;
}
+ public static boolean isAlternative(WeldAnnotated<?, ?> annotated, MergedStereotypes<?, ?> mergedStereotypes)
+ {
+ if (annotated.isAnnotationPresent(Alternative.class))
+ {
+ return true;
+ }
+ else
+ {
+ return mergedStereotypes.isPolicy();
+ }
+ }
+
/**
* Check if bean is specialized by any of beans
*
Modified: core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2009-11-09 12:24:25 UTC (rev 4858)
+++ core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2009-11-09 12:38:09 UTC (rev 4859)
@@ -30,6 +30,12 @@
<exclude name="testManagedBeanWithNonSerializableInterceptorClassNotOK" />
</methods>
</class>
+ <class name="org.jboss.jsr299.tck.tests.policy.PolicyAvailabilityTest">
+ <methods>
+ <exclude name="testProducerPoliciesOnClass" />
+ <exclude name="testProducerPoliciesOnMethodAndField" />
+ </methods>
+ </class>
</classes>
</test>
14 years, 11 months
Weld SVN: r4858 - cdi-tck/trunk/impl/src/main/resources.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-11-09 07:24:25 -0500 (Mon, 09 Nov 2009)
New Revision: 4858
Modified:
cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
Log:
audit corrections
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-09 12:16:48 UTC (rev 4857)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-11-09 12:24:25 UTC (rev 4858)
@@ -4377,7 +4377,7 @@
<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 |<Decorators>| element in |beans.xml| file of the bean deployment archive.</text>
+ <text>By default, decorators are not enabled. A decorator must be explicitly enabled by listing its bean class under the |<decorators>| element in |beans.xml| file of the bean archive.</text>
</assertion>
<assertion id="b">
@@ -4406,7 +4406,7 @@
<section id="8.3" title="Decorator resolution">
<assertion id="aa">
- <text>The process of matching decorators to a certain bean is called decorator resolution. A decorator is bound to a bean if the bean is assignable to the delegate injection point according to the rules defined in Section 5.3, "Typesafe resolution", and the decorator is enabled in the bean deployment archive of the bean.</text>
+ <text>The process of matching decorators to a certain bean is called decorator resolution. A decorator is bound to a bean if the bean is assignable to the delegate injection point according to the rules defined in Section 5.2, "Typesafe resolution", and the decorator is enabled in the bean archive containing the bean.</text>
</assertion>
<assertion id="ab">
@@ -4418,13 +4418,13 @@
</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()|, |getDelegateQualifiers()| and |getDecoratedTypes()| to determine the delegate type and qualifiers and decorated types of the decorator.</text>
+ <text>For a custom implementation of the |Decorator| interface defined in Section 11.1.1, "The Decorator interface", the container calls |getDelegateType()|, |getDelegateQualifiers()| and |getDecoratedTypes()| to determine the delegate type and qualifiers and decorated types of the decorator.</text>
</assertion>
</section>
<section id="8.3.1" title="Assignability of raw and parameterized types for delegate injection points">
<group>
- <text>A raw bean type is considered assignable to a parameterized delegate type if the raw types are identical and all type parameters of the delegate type are either unbounded type variables or java.lang.Object.</text>
+ <text>A raw bean type is considered assignable to a parameterized delegate type if the raw types are identical and all type parameters of the delegate type are either unbounded type variables or |java.lang.Object|.</text>
<assertion id="ab">
<text>Check all type parameters are unbounded type variables</text>
@@ -4440,7 +4440,7 @@
</group>
<group>
- <text>A parameterized bean type is considered assignable to a parameterized delegate type if they have identical raw type and for each parameter: the delegate 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 delegate type parameter according to these rules, or the delegate 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, or the delegate 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, or the delegate type parameter and the bean type parameter are both type variables and the upper bound of the bean type parameter !
is assignable to the upper bound, if any, of the delegate type parameter, or the delegate type parameter is a type variable, the bean type parameter is an actual type, and the actual type is as- signable to the upper bound, if any, of the type variable.</text>
+ <text>A parameterized bean type is considered assignable to a parameterized delegate type if they have identical raw type and for each parameter: the delegate 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 delegate type parameter according to these rules, or the delegate 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, or the delegate 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, or the delegate type parameter and the bean type parameter are both type variables and the upper bound of the bean type parameter !
is assignable to the upper bound, if any, of the delegate type parameter, or the delegate type parameter is a type variable, the bean type parameter is an actual type, and the actual type is assignable to the upper bound, if any, of the type variable.</text>
<assertion id="c">
<text>Check both have identical type parameters</text>
@@ -4557,8 +4557,8 @@
<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.</text>
+ <assertion id="c" testable="false">
+ <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, non-portable behavior results.</text>
</assertion>
<assertion id="d">
@@ -4586,8 +4586,7 @@
<section id="9.4" title="Interceptor enablement and ordering">
<assertion id="a">
- <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 |<Interceptors>| element of the |beans.xml| file for the bean deployment archive.</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 |<interceptors>| element of the |beans.xml| file of the bean archive.</text>
</assertion>
<assertion id="b">
@@ -4622,12 +4621,12 @@
<section id="9.5" title="Interceptor resolution">
<assertion id="a">
- <text>For a lifecycle callback method, the interceptor bindings include the interceptor bindings declared or inherited 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 method, the interceptor bindings include the interceptor bindings declared or inherited by the bean at the class level, including, recursively, interceptor bindings declared as meta-annotations of other interceptor bindings and stereotypes.
</text>
</assertion>
<group>
- <text>For a business method, or EJB timeout method, the bean interceptor bindings include the interceptor bindings declared or inherited 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 business method, or EJB timeout method, the bean interceptor bindings include the interceptor bindings declared or inherited by the bean at the class level, including, recursively, interceptor bindings declared as meta-annotations of other interceptor bindings and stereotypes, together with all interceptor bindings declared at the method level, including, recursively, interceptor bindings declared as meta-annotations of other interceptor bindings.</text>
<assertion id="ba">
<text>Check a business method</text>
</assertion>
@@ -4637,7 +4636,7 @@
</group>
<assertion id="ca">
- <text>An interceptor is bound to a method if the method has all the interceptor bindings of the interceptor. A method has an interceptor binding of an interceptor if it has an interceptor binding with (a) the same type and (b) the same annotation member value for each member which is not annotated |(a)javax.enterprise.util.NonBinding|, 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>
+ <text>An interceptor is bound to a method if the method has all the interceptor bindings of the interceptor. A method has an interceptor binding of an interceptor if it has an interceptor binding with (a) the same type and (b) the same annotation member value for each member which is not annotated |(a)javax.enterprise.util.NonBinding|, and the interceptor intercepts the given kind of lifecycle callback or business method, and the interceptor is enabled in the bean archive containing the bean.</text>
</assertion>
<group>
@@ -4681,9 +4680,13 @@
<assertion id="a">
<text>Interceptor binding types may have annotation members.</text>
</assertion>
+
+ <assertion id="ab">
+ <text>Annotation member values are compared using |equals()|.</text>
+ </assertion>
<assertion id="b">
- <text>An annotation member may be excluded from consideration using the @Nonbinding annotation.</text>
+ <text>An annotation member may be excluded from consideration using the |@Nonbinding| annotation.</text>
</assertion>
<assertion id="ca" testable="false">
14 years, 11 months