Weld SVN: r4958 - build/trunk/dist-tck.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-10 09:27:52 -0500 (Tue, 10 Nov 2009)
New Revision: 4958
Modified:
build/trunk/dist-tck/readme.txt
build/trunk/dist-tck/release-notes.txt
Log:
update notes
Modified: build/trunk/dist-tck/readme.txt
===================================================================
--- build/trunk/dist-tck/readme.txt 2009-11-10 14:26:25 UTC (rev 4957)
+++ build/trunk/dist-tck/readme.txt 2009-11-10 14:27:52 UTC (rev 4958)
@@ -36,9 +36,3 @@
lib/
-- all libraries for the Weld implementation of the CDI porting package
-
-Generating the TCK audit coverage report
-----------------------------------------
-Run the following command to generate the TCK audit report:
-
- mvn clean install -Dtck-audit
Modified: build/trunk/dist-tck/release-notes.txt
===================================================================
--- build/trunk/dist-tck/release-notes.txt 2009-11-10 14:26:25 UTC (rev 4957)
+++ build/trunk/dist-tck/release-notes.txt 2009-11-10 14:27:52 UTC (rev 4958)
@@ -1,12 +1,9 @@
-------------
-* 1.0.0.CR1 *
+* 1.0.0 *
-------------
Known Issues
-------------
-These known issues will be fixed for 1.0.0.CR2
+There are no known critical or showstopper issues
-* CDITCK-34: log4j-1.2.14.jar must be included on the server classpath
-* CDITCK-37: harness tries to load classes from WEB-INF/classes, which the servlet spec doesn't require to be supported
-* CDITCK-38: coverage for 11.4, 11.5.6, 11.5.8 and 12.3 is low
14 years, 7 months
- 1
- 0
Weld SVN: r4957 - in build/trunk/dist-tck: src/main/assembly and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-10 09:26:25 -0500 (Tue, 10 Nov 2009)
New Revision: 4957
Added:
build/trunk/dist-tck/assembly.xml
Removed:
build/trunk/dist-tck/src/main/assembly/assembly.xml
Modified:
build/trunk/dist-tck/pom.xml
Log:
move assembly.xml, rename
Copied: build/trunk/dist-tck/assembly.xml (from rev 4956, build/trunk/dist-tck/src/main/assembly/assembly.xml)
===================================================================
--- build/trunk/dist-tck/assembly.xml (rev 0)
+++ build/trunk/dist-tck/assembly.xml 2009-11-10 14:26:25 UTC (rev 4957)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<assembly 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/xsd/assembly-1.1.1.xsd
+ ">
+ <id>dist</id>
+ <baseDirectory>jsr299-tck-${cdi.tck.version}</baseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>readme.txt</include>
+ <include>apl.txt</include>
+ <include>release-notes.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.jsr299.tck:jsr299-tck-impl</include>
+ <include>org.jboss.jsr299.tck:jsr299-tck-api</include>
+ </includes>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <outputDirectory>artifacts</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+ <dependencySet>
+ <excludes>
+ <exclude>org.jboss.jsr299.tck:jsr299-tck-impl</exclude>
+ <exclude>org.jboss.jsr299.tck:jsr299-tck-api</exclude>
+ <exclude>org.jboss.jsr299.tck:jsr299-tck-reference-guide</exclude>
+ <exclude>org.jboss.jsr299.tck:jsr299-tck-dist-porting-package</exclude>
+ </excludes>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.jsr299.tck:jsr299-tck-dist-porting-package</include>
+ </includes>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <outputDirectory>/weld</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.jsr299.tck:jsr299-tck-reference-guide</include>
+ </includes>
+ <unpack>true</unpack>
+ <outputDirectory>doc</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+
+
+
+</assembly>
Modified: build/trunk/dist-tck/pom.xml
===================================================================
--- build/trunk/dist-tck/pom.xml 2009-11-10 13:45:40 UTC (rev 4956)
+++ build/trunk/dist-tck/pom.xml 2009-11-10 14:26:25 UTC (rev 4957)
@@ -114,7 +114,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
+ <descriptor>assembly.xml</descriptor>
</descriptors>
<finalName>jsr299-tck-${cdi.tck.version}</finalName>
</configuration>
Deleted: build/trunk/dist-tck/src/main/assembly/assembly.xml
===================================================================
--- build/trunk/dist-tck/src/main/assembly/assembly.xml 2009-11-10 13:45:40 UTC (rev 4956)
+++ build/trunk/dist-tck/src/main/assembly/assembly.xml 2009-11-10 14:26:25 UTC (rev 4957)
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<assembly 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/xsd/assembly-1.1.1.xsd
- ">
- <id>dist</id>
- <baseDirectory>jsr299-tck-${project.version}</baseDirectory>
- <formats>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>readme.txt</include>
- <include>apl.txt</include>
- <include>release-notes.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <includes>
- <include>org.jboss.jsr299.tck:jsr299-tck-impl</include>
- <include>org.jboss.jsr299.tck:jsr299-tck-api</include>
- </includes>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <outputDirectory>artifacts</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>${artifact.artifactId}-${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- <dependencySet>
- <excludes>
- <exclude>org.jboss.jsr299.tck:jsr299-tck-impl</exclude>
- <exclude>org.jboss.jsr299.tck:jsr299-tck-api</exclude>
- <exclude>org.jboss.jsr299.tck:jsr299-tck-reference-guide</exclude>
- <exclude>org.jboss.jsr299.tck:jsr299-tck-dist-porting-package</exclude>
- </excludes>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <outputDirectory>lib</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.jboss.jsr299.tck:jsr299-tck-dist-porting-package</include>
- </includes>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <outputDirectory>/weld</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <unpack>true</unpack>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.jboss.jsr299.tck:jsr299-tck-reference-guide</include>
- </includes>
- <unpack>true</unpack>
- <outputDirectory>doc</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
- </dependencySets>
-
-
-
-</assembly>
14 years, 7 months
- 1
- 0
Weld SVN: r4956 - in cdi-tck/trunk: api and 2 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-10 08:45:40 -0500 (Tue, 10 Nov 2009)
New Revision: 4956
Modified:
cdi-tck/trunk/api/pom.xml
cdi-tck/trunk/doc/reference/pom.xml
cdi-tck/trunk/impl/pom.xml
cdi-tck/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: cdi-tck/trunk/api/pom.xml
===================================================================
--- cdi-tck/trunk/api/pom.xml 2009-11-10 13:45:28 UTC (rev 4955)
+++ cdi-tck/trunk/api/pom.xml 2009-11-10 13:45:40 UTC (rev 4956)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: cdi-tck/trunk/doc/reference/pom.xml
===================================================================
--- cdi-tck/trunk/doc/reference/pom.xml 2009-11-10 13:45:28 UTC (rev 4955)
+++ cdi-tck/trunk/doc/reference/pom.xml 2009-11-10 13:45:40 UTC (rev 4956)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -61,9 +61,9 @@
</build>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/tags/1.0.0</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/jsr299-tck-referenc...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk</developerConnection>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk/jsr299-tck-referen...</url>
</scm>
</project>
Modified: cdi-tck/trunk/impl/pom.xml
===================================================================
--- cdi-tck/trunk/impl/pom.xml 2009-11-10 13:45:28 UTC (rev 4955)
+++ cdi-tck/trunk/impl/pom.xml 2009-11-10 13:45:40 UTC (rev 4956)
@@ -3,7 +3,7 @@
<parent>
<artifactId>jsr299-tck-parent</artifactId>
<groupId>org.jboss.jsr299.tck</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2009-11-10 13:45:28 UTC (rev 4955)
+++ cdi-tck/trunk/pom.xml 2009-11-10 13:45:40 UTC (rev 4956)
@@ -4,7 +4,7 @@
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>CDI TCK</name>
<parent>
@@ -303,11 +303,11 @@
</build>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/tags/1.0.0</connection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/trunk</connection>
<developerConnection>
- scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0
+ scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk
</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0</url>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk</url>
</scm>
<profiles>
14 years, 7 months
- 1
- 0
Weld SVN: r4955 - cdi-tck/tags.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-10 08:45:28 -0500 (Tue, 10 Nov 2009)
New Revision: 4955
Added:
cdi-tck/tags/1.0.0/
Log:
[maven-scm] copy for tag 1.0.0
Copied: cdi-tck/tags/1.0.0 (from rev 4954, cdi-tck/trunk)
14 years, 7 months
- 1
- 0
Weld SVN: r4954 - in cdi-tck/trunk: api and 2 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-10 08:45:09 -0500 (Tue, 10 Nov 2009)
New Revision: 4954
Modified:
cdi-tck/trunk/api/pom.xml
cdi-tck/trunk/doc/reference/pom.xml
cdi-tck/trunk/impl/pom.xml
cdi-tck/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0
Modified: cdi-tck/trunk/api/pom.xml
===================================================================
--- cdi-tck/trunk/api/pom.xml 2009-11-10 13:30:32 UTC (rev 4953)
+++ cdi-tck/trunk/api/pom.xml 2009-11-10 13:45:09 UTC (rev 4954)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: cdi-tck/trunk/doc/reference/pom.xml
===================================================================
--- cdi-tck/trunk/doc/reference/pom.xml 2009-11-10 13:30:32 UTC (rev 4953)
+++ cdi-tck/trunk/doc/reference/pom.xml 2009-11-10 13:45:09 UTC (rev 4954)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -61,9 +61,9 @@
</build>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk/jsr299-tck-referen...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/tags/1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0</developerConnection>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/jsr299-tck-referenc...</url>
</scm>
</project>
Modified: cdi-tck/trunk/impl/pom.xml
===================================================================
--- cdi-tck/trunk/impl/pom.xml 2009-11-10 13:30:32 UTC (rev 4953)
+++ cdi-tck/trunk/impl/pom.xml 2009-11-10 13:45:09 UTC (rev 4954)
@@ -3,7 +3,7 @@
<parent>
<artifactId>jsr299-tck-parent</artifactId>
<groupId>org.jboss.jsr299.tck</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2009-11-10 13:30:32 UTC (rev 4953)
+++ cdi-tck/trunk/pom.xml 2009-11-10 13:45:09 UTC (rev 4954)
@@ -4,7 +4,7 @@
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>CDI TCK</name>
<parent>
@@ -303,11 +303,11 @@
</build>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/trunk</connection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/tags/1.0.0</connection>
<developerConnection>
- scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk
+ scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0
</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk</url>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0</url>
</scm>
<profiles>
14 years, 7 months
- 1
- 0
Weld SVN: r4953 - in cdi-tck/trunk: impl/src/main/java/org/jboss/jsr299/tck and 153 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-10 08:30:32 -0500 (Tue, 10 Nov 2009)
New Revision: 4953
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentFailure.java
Removed:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java
Modified:
cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/aroundInvoke/SimpleBean.java
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
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxHole.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MissileInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Transactional.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/Espoo_Broken.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/City.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBean.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/EventInjectionWithoutTypeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AnnotatedTypeWrapper.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/Grocery.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryInterceptorBinding.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverThrowsException/ThrowExceptionInProcessBeanObserverTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/inconsistent/InconsistentSpecializationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/AfterBeanDiscoveryObserver.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Foo.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Secure.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Slow.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java
Log:
mark tests ri-broken, remove distinction between definition error and deployment problem
Modified: cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java
===================================================================
--- cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,8 +2,6 @@
import javax.enterprise.inject.spi.BeanManager;
-import org.jboss.testharness.api.DeploymentException;
-
/**
* This interface provides operations relating to a Manager.
*
@@ -27,28 +25,4 @@
*/
public BeanManager getManager();
- /**
- * Checks whether there is a definition error, as described in Section 2.8,
- * "Problems detected automatically by the container".
- *
- * @param deploymentException the deployment exception context provided by
- * the deployment which is in error. The deployment is not required
- * to provide a deploymentException, even if the deployment is in
- * error
- * @return true if there is a definition error
- */
- public boolean isDefinitionError(DeploymentException deploymentException);
-
- /**
- * Checks whether there is a deployment problem, as described in Section 2.8,
- * "Problems detected automatically by the container".
- *
- * @param deploymentException the deployment exception context provided by
- * the deployment which is in error. The deployment is not required
- * to provide a deploymentException, even if the deployment is in
- * error
- * @return true if there is a deployment error
- */
- public boolean isDeploymentProblem(DeploymentException deploymentException);
-
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -22,6 +22,7 @@
import org.jboss.jsr299.tck.api.JSR299Configuration;
import org.jboss.jsr299.tck.impl.OldSPIBridge;
+import org.jboss.testharness.ExpectedException;
import org.jboss.testharness.api.DeploymentException;
import org.jboss.testharness.impl.ConfigurationFactory;
@@ -169,17 +170,13 @@
@Override
protected DeploymentException handleDeploymentFailure(DeploymentException deploymentException)
{
- if (getCurrentConfiguration().getManagers().isDefinitionError(deploymentException))
+ if (deploymentException.getCause().getClass().equals(ExpectedException.class))
{
- return new DeploymentException(deploymentException, new DefinitionError(deploymentException.getCause()));
+ return new DeploymentException(deploymentException, deploymentException.getCause());
}
- else if (getCurrentConfiguration().getManagers().isDeploymentProblem(deploymentException))
- {
- return new DeploymentException(deploymentException, new DeploymentError(deploymentException.getCause()));
- }
else
{
- return deploymentException;
+ return new DeploymentException(deploymentException, new DeploymentFailure());
}
}
}
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,40 +0,0 @@
-package org.jboss.jsr299.tck;
-
-/**
- * A category exception which can be declared in the @ExpectedDeploymentException
- * annotation of an @Artifact to detect a definition error as described in
- * Section 12.4, "Problems detected automatically by the container".
- *
- * @see org.jboss.jsr299.tck.spi.Managers#isDefinitionError(Throwable)
- */
-public class DefinitionError extends RuntimeException
-{
-
- /**
- *
- */
- private static final long serialVersionUID = 3544233876045340712L;
-
-public DefinitionError()
- {
- super();
- }
-
- public DefinitionError(String message, Throwable cause)
- {
- super(message, cause);
- }
-
- public DefinitionError(String message)
- {
- super(message);
- }
-
- public DefinitionError(Throwable cause)
- {
- super(cause);
- }
-
-
-
-}
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,40 +0,0 @@
-package org.jboss.jsr299.tck;
-
-/**
- * A category exception which can be declared in the @ExpectedDeploymentException
- * annotation of an @Artifact to detect a deployment error as described in
- * Section 12.4, "Problems detected automatically by the container".
- *
- * @see org.jboss.jsr299.tck.spi.Managers#isDeploymentProblem(Throwable)
- */
-public class DeploymentError extends RuntimeException
-{
-
- /**
- *
- */
- private static final long serialVersionUID = 6495327942053526437L;
-
-public DeploymentError()
- {
- super();
- }
-
- public DeploymentError(String message, Throwable cause)
- {
- super(message, cause);
- }
-
- public DeploymentError(String message)
- {
- super(message);
- }
-
- public DeploymentError(Throwable cause)
- {
- super(cause);
- }
-
-
-
-}
Copied: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentFailure.java (from rev 4854, cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java)
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentFailure.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentFailure.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -0,0 +1,40 @@
+package org.jboss.jsr299.tck;
+
+/**
+ * A category exception which can be declared in the @ExpectedDeploymentException
+ * annotation of an @Artifact to detect a definition error as described in
+ * Section 12.4, "Problems detected automatically by the container".
+ *
+ * @see org.jboss.jsr299.tck.spi.Managers#isDefinitionError(Throwable)
+ */
+public class DeploymentFailure extends RuntimeException
+{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 3544233876045340712L;
+
+public DeploymentFailure()
+ {
+ super();
+ }
+
+ public DeploymentFailure(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public DeploymentFailure(String message)
+ {
+ super(message);
+ }
+
+ public DeploymentFailure(Throwable cause)
+ {
+ super(cause);
+ }
+
+
+
+}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/aroundInvoke/SimpleBean.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/aroundInvoke/SimpleBean.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/aroundInvoke/SimpleBean.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,9 +2,7 @@
import javax.interceptor.Interceptors;
-import org.jboss.jsr299.tck.interceptors.tests.aroundInvoke.PackagePrivateInterceptor;
-
class SimpleBean
{
@Interceptors(PrivateInterceptor.class)
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-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -26,7 +26,7 @@
@SpecVersion(spec = "int", version = "3.1.PFD")
public class DefinitionTest extends AbstractJSR299Test
{
- @Test
+ @Test(groups="ri-broken")
@SpecAssertion(section = "1", id= "a")
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-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -27,7 +27,7 @@
@SpecVersion(spec = "int", version = "3.1.PFD")
public class InvocationOrderTest extends AbstractJSR299Test
{
- @Test
+ @Test(groups="ri-broken")
@SpecAssertions({
@SpecAssertion(section = "5.1", id = "c"),
@SpecAssertion(section = "5.1", id = "d"),
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxHole.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxHole.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxHole.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.context.dependent;
-import javax.enterprise.inject.Any;
import javax.inject.Inject;
class FoxHole
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MissileInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MissileInterceptor.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MissileInterceptor.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,8 +1,7 @@
package org.jboss.jsr299.tck.tests.context.dependent;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
class MissileInterceptor
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -3,7 +3,6 @@
import javax.annotation.PreDestroy;
import org.jboss.jsr299.tck.api.JSR299Configuration;
-import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl;
import org.jboss.testharness.impl.ConfigurationFactory;
class Tarantula extends Spider implements DeadlySpider
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Transactional.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Transactional.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Transactional.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,8 +1,6 @@
package org.jboss.jsr299.tck.tests.context.dependent;
-import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class DecoratorWithNonPassivatingBeanConstructorTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class DecoratorWithNonPassivatingInitializerMethodTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInjectedField;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class DecoratorWithNonPassivatingInjectedFieldTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,10 +1,11 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor;
+import java.io.Serializable;
+
+import javax.inject.Inject;
+import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.inject.Inject;
-import java.io.Serializable;
@Interceptor @CityBinding
class BrokenInterceptor implements Serializable
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
public class EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/Espoo_Broken.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/Espoo_Broken.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/Espoo_Broken.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -3,7 +3,6 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.enterprise.context.SessionScoped;
-import javax.interceptor.Interceptors;
@Stateful
@SessionScoped
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingConstructorFieldInDecorator;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingFieldInDecoratorTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingDecorator;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingDecoratorTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerInDecorator;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -3,9 +3,9 @@
import java.io.Serializable;
import javax.inject.Inject;
+import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/City.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/City.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/City.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,10 +1,11 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor;
-import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
import javax.interceptor.InterceptorBinding;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -9,12 +9,11 @@
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-
import org.testng.annotations.Test;
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInDecorator;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,9 +1,8 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor;
import javax.inject.Inject;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
class BrokenInterceptor
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -12,7 +12,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonSerializableIntializerMethod;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -12,7 +12,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class EnterpriseBeanWithNonSerializableIntializerMethodTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.finalProducerFieldNotPassivationCapable;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -18,7 +18,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@SpecVersion(spec="cdi", version="20091101")
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test
{
@Test(groups = { "passivation", "ri-wrong-cause" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,18 +1,17 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-
import org.testng.annotations.Test;
@Artifact
@BeansXml("beans.xml")
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBean.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBean.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBean.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,8 +1,9 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInjectedField;
-import javax.enterprise.context.SessionScoped;
import java.io.Serializable;
+import javax.enterprise.context.SessionScoped;
+
@SessionScoped @BakedBinding
class BakedBean implements Serializable
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInjectedField;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonPassivatingDecorator;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class ManagedBeanWithNonPassivatingDecoratorTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonSerializableInterceptorClass;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ManagedBeanWithNonSerializableInterceptorClassTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -16,7 +16,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class NonPassivationManagedBeanHasPassivatingScopeTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerField;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -18,7 +18,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@SpecVersion(spec="cdi", version="20091101")
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test
{
@Test(groups = { "passivation", "ri-wrong-cause" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerMethod;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -18,7 +18,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@SpecVersion(spec="cdi", version="20091101")
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
public class NonPassivationCapableProducerMethodTest extends AbstractJSR299Test
{
@Test(groups = { "passivation", "ri-wrong-cause" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingManagedBeanWithNonPassivatingBeanConstructor;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class PassivatingManagedBeanWithNonPassivatingBeanConstructorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingManagedBeanWithNonPassivatingInitializerMethod;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class PassivatingManagedBeanWithNonPassivatingInitializerMethodTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingManagedBeanWithNonPassivatingInjcetedField;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingProducerMethodWithNonPassivatingParameter;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class PassivatingProducerMethodWithNonPassivatingParameterTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.unserializableSimpleInjectedIntoPassivatingEnterpriseBean;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -12,7 +12,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.decorators.custom.broken.finalBeanClass;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -32,7 +32,7 @@
@SpecVersion(spec = "cdi", version = "20091101")
@IntegrationTest
@Extension("javax.enterprise.inject.spi.Extension")
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
public class CustomDecoratorMatchingBeanWithFinalClassTest extends AbstractJSR299Test
{
@Test(groups = "ri-broken")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -14,7 +14,7 @@
* @author Shane Bryzak
*/
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
public class DecoratorListedTwiceInBeansXmlTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.decorators.definition.broken.enabledDecoratorIsNotDecorator;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -29,7 +29,7 @@
* @author pmuir
*/
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
public class EnabledDecoratorNotADecoratorTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanClass;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -30,7 +30,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
public class FinalBeanClassTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanMethod;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -30,7 +30,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
public class FinalBeanMethodTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.decorators.definition.broken.multipleDelegateInjectionPoints;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -30,7 +30,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
public class MultipleDelegateInjectionPointsTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.decorators.definition.broken.noDelegateInjectionPoints;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -30,7 +30,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
public class NoDelegateInjectionPointsTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.decorators.definition.broken.nonDecoratorWithDecorates;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -13,7 +13,7 @@
* @author Shane Bryzak
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class NonDecoratorWithDecoratesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.decorators.definition.broken.nonExistantClassInBeansXml;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
public class NonExistantDecoratorClassInBeansXmlTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.decorators.definition.broken.notAllDecoratedTypesImplemented;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -30,7 +30,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
public class NotAllDecoratedTypesImplementedTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.decorators.definition.inject.broken.delegateProducerMethod;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -33,7 +33,7 @@
@Artifact
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
public class DelegateInjectionPointTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -16,8 +16,8 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateConstructor;
+import javax.decorator.Decorator;
import javax.decorator.Delegate;
-import javax.decorator.Decorator;
import javax.inject.Inject;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -16,8 +16,8 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateInitializerMethod;
+import javax.decorator.Decorator;
import javax.decorator.Delegate;
-import javax.decorator.Decorator;
import javax.inject.Inject;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.definition.bean.genericbroken;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class GenericManagedBeanTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class TooManyScopesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,6 @@
import java.lang.annotation.Annotation;
-import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.Dependent;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.SessionScoped;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class NonEmptyNamedTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.definition.stereotype.broken.scopeConflict;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class IncompatibleStereotypesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class TooManyScopeTypesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,12 +2,8 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
@Artifact
//(a)ExpectedDeploymentException(DefinitionError.class)
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDefinitionError;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -25,7 +25,7 @@
})
// Must be an integration test as it needs a resource copied to a folder
@IntegrationTest
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class AddDefinitionErrorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -18,7 +18,7 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDeploymentProblem;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -34,7 +34,7 @@
* @author Dan Allen
*/
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class AddDeploymentProblemTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.beanDiscoveryMethodThrowsException;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -35,13 +35,12 @@
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class BeforeBeanDiscoveryThrowsExceptionTest extends AbstractJSR299Test
{
- @Test(groups="jboss-as-broken")
- // WBRI-312
+ @Test
@SpecAssertion(section="11.5.1", id="ag")
public void testThrowsException()
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanDiscoveryObserver;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -16,7 +16,7 @@
* @author Dan Allen
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class AfterBeanDiscoveryObserverExecutionFailureTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -18,7 +18,7 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanValidationObserver;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -33,7 +33,7 @@
* @author Dan Allen
*/
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringBeanDiscovery;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class DeploymentFailureTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -18,7 +18,7 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringValidation;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -35,7 +35,7 @@
* @author Dan Allen
*/
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class AfterBeanDiscoveryFailureTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.normalScope;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -36,7 +36,7 @@
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class AddingNormalScopeTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.passivatingScope;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -35,7 +35,7 @@
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class AddingPassivatingScopeTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/EventInjectionWithoutTypeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/EventInjectionWithoutTypeTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/EventInjectionWithoutTypeTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -18,7 +18,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
@@ -30,7 +30,7 @@
* @author David Allen
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
public class EventInjectionWithoutTypeTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.dependentIsConditionalObserver;
+import javax.enterprise.event.Observes;
import javax.enterprise.event.Reception;
-import javax.enterprise.event.Observes;
class AlarmSystem
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.dependentIsConditionalObserver;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class DependentIsConditionalObserverTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -19,7 +19,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -33,7 +33,7 @@
* @author David Allen
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ObserverMethodAnnotatedDisposesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -19,7 +19,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -33,7 +33,7 @@
* @author David Allen
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ObserverMethodAnnotatedInitialzerTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -18,7 +18,7 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.isProducer;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -31,7 +31,7 @@
* @author David Allen
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ObserverMethodAnnotatedProducesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.notBusinessMethod;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -35,7 +35,7 @@
*/
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class EJBObserverMethodNotBusinessMethodTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.tooManyParameters;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ObserverMethodWithTwoEventParametersTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.event.broken.observer8;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
@@ -30,7 +30,7 @@
* @author David Allen
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
public class AsynchronousBeforeCompletionObserverTest extends AbstractJSR299Test
{
// @Test(groups = { "events" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.event.observer;
import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Observes;
import javax.enterprise.event.Reception;
-import javax.enterprise.event.Observes;
@RequestScoped
class AnotherObserver
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.event.observer.conditional;
import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Observes;
import javax.enterprise.event.Reception;
-import javax.enterprise.event.Observes;
/**
* Simple web bean that conditionally listens to events.
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AnnotatedTypeWrapper.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AnnotatedTypeWrapper.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AnnotatedTypeWrapper.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -8,8 +8,6 @@
import javax.enterprise.inject.spi.AnnotatedMethod;
import javax.enterprise.inject.spi.AnnotatedType;
-import org.jboss.jsr299.tck.tests.extensions.alternative.metadata.AnnotatedWrapper;
-
public class AnnotatedTypeWrapper<X> extends AnnotatedWrapper implements AnnotatedType<X>
{
private AnnotatedType<X> delegate;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/Grocery.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/Grocery.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/Grocery.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,9 +1,6 @@
package org.jboss.jsr299.tck.tests.extensions.alternative.metadata;
-import java.io.Serializable;
-
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.SessionScoped;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Produces;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryInterceptorBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryInterceptorBinding.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryInterceptorBinding.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,11 +1,12 @@
package org.jboss.jsr299.tck.tests.extensions.alternative.metadata;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
import javax.interceptor.InterceptorBinding;
@InterceptorBinding
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -8,8 +8,8 @@
import java.util.Set;
import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Observes;
import javax.enterprise.event.Reception;
-import javax.enterprise.event.Observes;
import javax.enterprise.event.TransactionPhase;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.AnnotatedConstructor;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -18,7 +18,7 @@
package org.jboss.jsr299.tck.tests.extensions.annotated.broken.processAnnotatedObserverThrowsException;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -35,7 +35,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Resources({
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@@ -43,7 +43,7 @@
@SpecVersion(spec="cdi", version="20091101")
public class ProcessAnnotatedTypeEventThrowsExceptionTest extends AbstractJSR299Test
{
- @Test(groups="jboss-as-broken")
+ @Test
@SpecAssertion(section = "11.5.5", id = "e")
public void testProcessAnnotatedTypeEventThrowsExceptionNotOk()
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -18,7 +18,7 @@
package org.jboss.jsr299.tck.tests.extensions.annotated.broken.processInjectionTargetThrowsException;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -35,7 +35,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Resources({
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@@ -43,7 +43,7 @@
@SpecVersion(spec="cdi", version="20091101")
public class ProcessInjectionTargetEventThrowsExceptionTest extends AbstractJSR299Test
{
- @Test(groups="jboss-as-broken")
+ @Test
@SpecAssertion(section = "11.5.6", id = "f")
public void testProcessInjectionTargetEventThrowsExceptionNotOk()
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.extensions.container.event.broken.processBeanObserverRegistersException;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -27,15 +27,14 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
@IntegrationTest
@SpecVersion(spec = "cdi", version = "20091101")
public class AddDefinitionErrorTest extends AbstractJSR299Test
{
- @Test(groups = "jboss-as-broken")
+ @Test
@SpecAssertion(section = "11.5.8", id = "h")
- // WELD-223
public void testAddDefinitionError()
{
assert false;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverThrowsException/ThrowExceptionInProcessBeanObserverTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverThrowsException/ThrowExceptionInProcessBeanObserverTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverThrowsException/ThrowExceptionInProcessBeanObserverTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.extensions.container.event.broken.processBeanObserverThrowsException;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -27,15 +27,14 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
@IntegrationTest
@SpecVersion(spec = "cdi", version = "20091101")
public class ThrowExceptionInProcessBeanObserverTest extends AbstractJSR299Test
{
- @Test(groups = "jboss-as-broken")
+ @Test
@SpecAssertion(section = "11.5.8", id = "hd")
- // WELD-224
public void testProcessBeanObserverThrowsException()
{
assert false;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -18,7 +18,7 @@
package org.jboss.jsr299.tck.tests.extensions.observer.broken.definitionError;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -35,7 +35,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Resources({
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -18,7 +18,7 @@
package org.jboss.jsr299.tck.tests.extensions.observer.broken.exception;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -36,7 +36,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Resources({
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.extensions.producer.broken.injectionTargetError;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -24,16 +24,15 @@
})
// Must be an integration test as it needs a resource copied to a folder
@IntegrationTest
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class InjectionTargetDefinitionErrorTest extends AbstractJSR299Test
{
- @Test(groups = "jboss-as-broken")
+ @Test
@SpecAssertions({
@SpecAssertion(section = "11.5.6", id = "da")
})
- // WBRII-345
public void testAddingDefinitionError()
{
assert false;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
public class InitializerUnallowedDefinitionTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.methodOnSessionBean;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -13,7 +13,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@IntegrationTest
@Packaging(PackagingType.EAR)
@SpecVersion(spec="cdi", version="20091101")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
public class MultipleDisposeParametersDefinitionTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.observesUnallowed;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
public class ObserverParameterUnallowedDefinitionTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ProducesUnallowedDefinitionTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
public class UnresolvedDisposalMethodDefinitionTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -11,7 +11,7 @@
import org.jboss.testharness.impl.packaging.PackagingType;
import org.testng.annotations.Test;
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Artifact
@Packaging(PackagingType.EAR)
@SpecVersion(spec="cdi", version="20091101")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Packaging(PackagingType.EAR)
@SpecVersion(spec="cdi", version="20091101")
public class SingletonWithRequestScopeTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Packaging(PackagingType.EAR)
@SpecVersion(spec="cdi", version="20091101")
public class SingletonWithSessionScopeTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Packaging(PackagingType.EAR)
@SpecVersion(spec="cdi", version="20091101")
public class StatelessWithApplicationScopeTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Packaging(PackagingType.EAR)
@SpecVersion(spec="cdi", version="20091101")
public class StatelessWithConversationScopeTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Packaging(PackagingType.EAR)
@SpecVersion(spec="cdi", version="20091101")
public class StatelessWithRequestScopeTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Packaging(PackagingType.EAR)
@SpecVersion(spec="cdi", version="20091101")
public class StatelessWithSessionScopeTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class InitializerMethodAnnotatedProducesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedObserves;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ParameterAnnotatedObservesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ParameterizedReturnTypeWithWildcardTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,10 +1,9 @@
package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
+import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.IllegalProductException;
import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
-import javax.enterprise.context.spi.CreationalContext;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ProducerMethodNotBusinessMethodTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ParameterAnnotatedObservesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ParameterizedTypeWithWildcardTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,6 @@
import java.util.Set;
-import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.CreationException;
import javax.enterprise.inject.IllegalProductException;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ConstructorHasDisposesParameterTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ConstructorHasObservesParameterTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class DependentWithPublicFieldTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class TooManyInitializerAnnotatedConstructorsTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,8 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.unproxyable;
-import javax.enterprise.inject.UnproxyableResolutionException;
-
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(UnproxyableResolutionException.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class UnproxyableManagedBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Packaging(PackagingType.EAR)
@SpecVersion(spec="cdi", version="20091101")
public class DirectlyExtendsNothingTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class DirectlyExtendsSimpleBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -11,7 +11,7 @@
import org.jboss.testharness.impl.packaging.PackagingType;
import org.testng.annotations.Test;
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Artifact
@Packaging(PackagingType.EAR)
@SpecVersion(spec="cdi", version="20091101")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -13,7 +13,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,21 +1,19 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two.TwoSpecializingBeansForOneSpecializedTest;
-import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.testng.annotations.Test;
@Artifact
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091018")
public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class IndirectOverrideTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class SpecializesStaticMethodTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class SpecializingAndSpecializedBeanHaveNameTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,16 +1,14 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two.TwoSpecializingBeansForOneSpecializedTest;
-import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091018")
public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class SpecializingBeanExtendsEnterpriseBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/inconsistent/InconsistentSpecializationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/inconsistent/InconsistentSpecializationTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/inconsistent/InconsistentSpecializationTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.inconsistent;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -25,7 +25,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class InconsistentSpecializationTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class SpecializingAndSpecializedBeanHasNameTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class SpecializingBeanImplementsInterfaceOnly extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class SpecializingBeanExtendsNothingTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -2,7 +2,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class SpecializingClassExtendsNonSimpleBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,16 +1,14 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean.TwoBeansSpecializeTheSameBeanTest;
-import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091018")
public class TwoSpecializingBeansForOneSpecializedTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.broken.interceptorCanNotBeDecorator;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class InterceptorCanNotBeDecoratorTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.broken.invalidBindingAnnotations;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class InvalidInterceptorBindingAnnotationsTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.broken.invalidLifecycleInterceptor;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class InvalidLifecycleInterceptorTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonExistantClassInBeansXml;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class NonExistantClassInBeansXmlTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonInterceptorClassInBeansXml;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class NonInterceptorClassInBeansXmlTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.broken.sameClassListedTwiceInBeansXml;
import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
-import javax.interceptor.Interceptor;
@Interceptor @Transactional
class FordInterceptor
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.broken.sameClassListedTwiceInBeansXml;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class SameClassListedTwiceInBeansXmlTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/AfterBeanDiscoveryObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/AfterBeanDiscoveryObserver.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/AfterBeanDiscoveryObserver.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,9 +1,15 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.custom;
+import static javax.enterprise.inject.spi.InterceptionType.AROUND_INVOKE;
+import static javax.enterprise.inject.spi.InterceptionType.AROUND_TIMEOUT;
+import static javax.enterprise.inject.spi.InterceptionType.POST_ACTIVATE;
+import static javax.enterprise.inject.spi.InterceptionType.POST_CONSTRUCT;
+import static javax.enterprise.inject.spi.InterceptionType.PRE_DESTROY;
+import static javax.enterprise.inject.spi.InterceptionType.PRE_PASSIVATE;
+
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.Extension;
-import static javax.enterprise.inject.spi.InterceptionType.*;
public class AfterBeanDiscoveryObserver implements Extension
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -16,7 +16,12 @@
*/
package org.jboss.jsr299.tck.tests.interceptors.definition.custom;
-import static javax.enterprise.inject.spi.InterceptionType.*;
+import static javax.enterprise.inject.spi.InterceptionType.AROUND_INVOKE;
+import static javax.enterprise.inject.spi.InterceptionType.AROUND_TIMEOUT;
+import static javax.enterprise.inject.spi.InterceptionType.POST_ACTIVATE;
+import static javax.enterprise.inject.spi.InterceptionType.POST_CONSTRUCT;
+import static javax.enterprise.inject.spi.InterceptionType.PRE_DESTROY;
+import static javax.enterprise.inject.spi.InterceptionType.PRE_PASSIVATE;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -5,7 +5,6 @@
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-
import org.testng.annotations.Test;
@Artifact
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,6 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.interceptorCalledBeforeDecorator;
import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
public class TransactionInterceptor
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,8 +1,6 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.interceptorNotListedInBeansXml;
-import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Foo.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Foo.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Foo.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.interceptorOrder;
-import javax.interceptor.Interceptors;
@Secure
class Foo
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Secure.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Secure.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Secure.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,8 +1,6 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.interceptorOrder;
-import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,8 +1,6 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.interceptorOrder;
-import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Slow.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Slow.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Slow.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,12 +1,11 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.multipleBindings;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import javax.interceptor.InterceptorBinding;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.binding.members.annotation;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -25,7 +25,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class BindingAnnotationWithMemberTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.binding.members.array;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -25,7 +25,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class BindingAnnotationWithMemberTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -18,7 +18,7 @@
package org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -26,7 +26,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class DuplicateNameResolutionTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -18,7 +18,7 @@
package org.jboss.jsr299.tck.tests.lookup.byname.duplicatePrefixResolution;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -26,7 +26,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class DuplicateNamePrefixResolutionTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.array;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -29,7 +29,7 @@
* Test for problem detection of array injection.
*/
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ArrayTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalClass;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -25,7 +25,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class FinalClassTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalMethod;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -25,7 +25,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class FinalMethodTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.primitive;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -25,7 +25,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class UnproxyableTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.privateConstructor;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -29,7 +29,7 @@
* Test for problem detection of unproxyable bean with private constructor.
*/
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class PrivateConstructorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.dependency.resolution.broken.ambiguous;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -25,7 +25,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class AmbiguousDependencyTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.dependency.resolution.broken.unsatisfied;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -25,7 +25,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class UnsatisfiedDependencyTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.lookup.injection.nullableBean;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class NullableBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.normal.scope;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -25,7 +25,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class NormalScopedBeanWithInjectionPoint extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.not.bean;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -29,7 +29,7 @@
@Artifact
@SpecVersion(spec="cdi", version="20091101")
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@IntegrationTest
@Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml")
public class InjectionPointTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.primitive;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -25,7 +25,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class PrimitiveInjectionPointTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.type.variable;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -25,7 +25,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class TypeVariableInjectionPointTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.policy.broken.incorrect.name;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -27,7 +27,7 @@
@Artifact
@BeansXml("beans.xml")
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class NoClassWithSpecifiedNameTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.policy.broken.incorrect.name.stereotype;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -27,7 +27,7 @@
@Artifact
@BeansXml("beans.xml")
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class NoAnnotationWithSpecifiedNameTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.policy.broken.not.policy;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -27,7 +27,7 @@
@Artifact
@BeansXml("beans.xml")
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ClassIsNotPolicyTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.policy.broken.not.policy.stereotype;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -27,7 +27,7 @@
@Artifact
@BeansXml("beans.xml")
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class ClassIsNotPolicyTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java 2009-11-10 13:13:57 UTC (rev 4952)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java 2009-11-10 13:30:32 UTC (rev 4953)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.policy.broken.same.type.twice;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.jsr299.tck.DeploymentFailure;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -27,7 +27,7 @@
@Artifact
@BeansXml("beans.xml")
-(a)ExpectedDeploymentException(DeploymentError.class)
+(a)ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class SameTypeListedTwiceTest extends AbstractJSR299Test
{
14 years, 7 months
- 1
- 0
Weld SVN: r4952 - in extensions/trunk: test and 75 other directories.
by weld-commits＠lists.jboss.org
Author: aslak
Date: 2009-11-10 08:13:57 -0500 (Tue, 10 Nov 2009)
New Revision: 4952
Added:
extensions/trunk/test/
extensions/trunk/test/core/
extensions/trunk/test/core/pom.xml
extensions/trunk/test/core/src/
extensions/trunk/test/core/src/main/
extensions/trunk/test/core/src/main/java/
extensions/trunk/test/core/src/main/java/org/
extensions/trunk/test/core/src/main/java/org/jboss/
extensions/trunk/test/core/src/main/java/org/jboss/weld/
extensions/trunk/test/core/src/main/java/org/jboss/weld/test/
extensions/trunk/test/core/src/main/java/org/jboss/weld/test/core/
extensions/trunk/test/core/src/main/java/org/jboss/weld/test/core/BootstrapResolver.java
extensions/trunk/test/core/src/main/java/org/jboss/weld/test/core/TestCore.java
extensions/trunk/test/core/src/main/resources/
extensions/trunk/test/core/src/test/
extensions/trunk/test/core/src/test/java/
extensions/trunk/test/core/src/test/resources/
extensions/trunk/test/junit/
extensions/trunk/test/junit/pom.xml
extensions/trunk/test/junit/src/
extensions/trunk/test/junit/src/main/
extensions/trunk/test/junit/src/main/java/
extensions/trunk/test/junit/src/main/java/org/
extensions/trunk/test/junit/src/main/java/org/jboss/
extensions/trunk/test/junit/src/main/java/org/jboss/weld/
extensions/trunk/test/junit/src/main/java/org/jboss/weld/test/
extensions/trunk/test/junit/src/main/java/org/jboss/weld/test/junit/
extensions/trunk/test/junit/src/main/java/org/jboss/weld/test/junit/CDIRunner.java
extensions/trunk/test/junit/src/main/resources/
extensions/trunk/test/junit/src/test/
extensions/trunk/test/junit/src/test/java/
extensions/trunk/test/junit/src/test/java/org/
extensions/trunk/test/junit/src/test/java/org/jboss/
extensions/trunk/test/junit/src/test/java/org/jboss/weld/
extensions/trunk/test/junit/src/test/java/org/jboss/weld/test/
extensions/trunk/test/junit/src/test/java/org/jboss/weld/test/junit/
extensions/trunk/test/junit/src/test/java/org/jboss/weld/test/junit/ModelTestCase.java
extensions/trunk/test/junit/src/test/resources/
extensions/trunk/test/pom.xml
extensions/trunk/test/spi/
extensions/trunk/test/spi/pom.xml
extensions/trunk/test/spi/src/
extensions/trunk/test/spi/src/main/
extensions/trunk/test/spi/src/main/java/
extensions/trunk/test/spi/src/main/java/org/
extensions/trunk/test/spi/src/main/java/org/jboss/
extensions/trunk/test/spi/src/main/java/org/jboss/weld/
extensions/trunk/test/spi/src/main/java/org/jboss/weld/test/
extensions/trunk/test/spi/src/main/java/org/jboss/weld/test/spi/
extensions/trunk/test/spi/src/main/java/org/jboss/weld/test/spi/Bootstrap.java
extensions/trunk/test/spi/src/main/resources/
extensions/trunk/test/test-model/
extensions/trunk/test/test-model/pom.xml
extensions/trunk/test/test-model/src/
extensions/trunk/test/test-model/src/main/
extensions/trunk/test/test-model/src/main/java/
extensions/trunk/test/test-model/src/main/java/org/
extensions/trunk/test/test-model/src/main/java/org/jboss/
extensions/trunk/test/test-model/src/main/java/org/jboss/weld/
extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/
extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/
extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/Greeted.java
extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/GreetingsObserver.java
extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/Language.java
extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/LanguageType.java
extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/NorwegianWelcomeService.java
extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/SwedishWelcomeService.java
extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/User.java
extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/WelcomeService.java
extensions/trunk/test/test-model/src/main/resources/
extensions/trunk/test/test-model/src/main/resources/META-INF/
extensions/trunk/test/test-model/src/main/resources/META-INF/beans.xml
extensions/trunk/test/testng/
extensions/trunk/test/testng/pom.xml
extensions/trunk/test/testng/src/
extensions/trunk/test/testng/src/main/
extensions/trunk/test/testng/src/main/java/
extensions/trunk/test/testng/src/main/java/org/
extensions/trunk/test/testng/src/main/java/org/jboss/
extensions/trunk/test/testng/src/main/java/org/jboss/weld/
extensions/trunk/test/testng/src/main/java/org/jboss/weld/test/
extensions/trunk/test/testng/src/main/java/org/jboss/weld/test/testng/
extensions/trunk/test/testng/src/main/java/org/jboss/weld/test/testng/AbstractCDITest.java
extensions/trunk/test/testng/src/main/resources/
extensions/trunk/test/testng/src/test/
extensions/trunk/test/testng/src/test/java/
extensions/trunk/test/testng/src/test/java/org/
extensions/trunk/test/testng/src/test/java/org/jboss/
extensions/trunk/test/testng/src/test/java/org/jboss/weld/
extensions/trunk/test/testng/src/test/java/org/jboss/weld/test/
extensions/trunk/test/testng/src/test/java/org/jboss/weld/test/testng/
extensions/trunk/test/testng/src/test/java/org/jboss/weld/test/testng/ModelTestCase.java
extensions/trunk/test/testng/src/test/resources/
extensions/trunk/test/weld-impl/
extensions/trunk/test/weld-impl/pom.xml
extensions/trunk/test/weld-impl/src/
extensions/trunk/test/weld-impl/src/main/
extensions/trunk/test/weld-impl/src/main/java/
extensions/trunk/test/weld-impl/src/main/java/org/
extensions/trunk/test/weld-impl/src/main/java/org/jboss/
extensions/trunk/test/weld-impl/src/main/java/org/jboss/weld/
extensions/trunk/test/weld-impl/src/main/java/org/jboss/weld/test/
extensions/trunk/test/weld-impl/src/main/java/org/jboss/weld/test/weld/
extensions/trunk/test/weld-impl/src/main/java/org/jboss/weld/test/weld/EnvironmentResolver.java
extensions/trunk/test/weld-impl/src/main/java/org/jboss/weld/test/weld/WeldTestBootstrap.java
extensions/trunk/test/weld-impl/src/main/resources/
extensions/trunk/test/weld-impl/src/main/resources/META-INF/
extensions/trunk/test/weld-impl/src/main/resources/META-INF/services/
extensions/trunk/test/weld-impl/src/main/resources/META-INF/services/org.jboss.weld.test.spi.Bootstrap
extensions/trunk/test/weld-impl/src/test/
extensions/trunk/test/weld-impl/src/test/java/
extensions/trunk/test/weld-impl/src/test/resources/
Log:
Initial commit of Weld Test extention. Adds support for CDI based injection in both JUnit and TestNG tests.
Property changes on: extensions/trunk/test/core
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Added: extensions/trunk/test/core/pom.xml
===================================================================
--- extensions/trunk/test/core/pom.xml (rev 0)
+++ extensions/trunk/test/core/pom.xml 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-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">
+ <parent>
+ <artifactId>weld-test-parent</artifactId>
+ <groupId>org.jboss.weld.test</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-core</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Weld Test Core</name>
+ <url>http://www.seamframework.org/Weld</url>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-spi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: extensions/trunk/test/core/src/main/java/org/jboss/weld/test/core/BootstrapResolver.java
===================================================================
--- extensions/trunk/test/core/src/main/java/org/jboss/weld/test/core/BootstrapResolver.java (rev 0)
+++ extensions/trunk/test/core/src/main/java/org/jboss/weld/test/core/BootstrapResolver.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.test.core;
+
+import java.util.ServiceLoader;
+
+import org.jboss.weld.test.spi.Bootstrap;
+
+/**
+ *
+ *
+ * @author <a href="mailto:aslak@conduct.no">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public class BootstrapResolver
+{
+
+ public Bootstrap resolve() throws Exception
+ {
+ // TODO: throw exception on missing bootsteap etc
+ return ServiceLoader.load(Bootstrap.class).iterator().next();
+ }
+
+}
Added: extensions/trunk/test/core/src/main/java/org/jboss/weld/test/core/TestCore.java
===================================================================
--- extensions/trunk/test/core/src/main/java/org/jboss/weld/test/core/TestCore.java (rev 0)
+++ extensions/trunk/test/core/src/main/java/org/jboss/weld/test/core/TestCore.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,82 @@
+package org.jboss.weld.test.core;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Qualifier;
+
+import org.jboss.weld.test.spi.Bootstrap;
+
+public class TestCore
+{
+ private Bootstrap boostrap;
+ private BeanManager manager;
+
+ public void start() throws Exception
+ {
+ boostrap = new BootstrapResolver().resolve();
+ manager = boostrap.start();
+ }
+
+ public void stop()
+ {
+ boostrap.stop();
+ }
+
+ public <T> T getInstanceByType(Class<T> type, Annotation... bindings)
+ {
+ return getInstanceByType(manager, type, bindings);
+ }
+
+ @SuppressWarnings("unchecked")
+ private <T> T getInstanceByType(BeanManager manager, Class<T> type,
+ Annotation... bindings)
+ {
+ final Bean<?> bean = manager.getBeans(type, bindings).iterator().next();
+ CreationalContext<?> cc = manager.createCreationalContext(bean);
+ return (T) manager.getReference(bean, type, cc);
+ }
+
+ public void injectFields(Object target) throws Exception
+ {
+ Field[] fields = target.getClass().getDeclaredFields();
+ for (Field field : fields)
+ {
+ injectField(field, target);
+ }
+ }
+
+ private void injectField(Field field, Object target) throws Exception
+ {
+ if (!hasBindTypeAnnotation(field.getAnnotations()))
+ {
+ return;
+ }
+ if (!field.isAccessible())
+ {
+ field.setAccessible(true);
+ }
+ Object injectable = getInstanceByType(field.getType(), field
+ .getAnnotations());
+
+ if (injectable != null)
+ {
+ field.set(target, injectable);
+ }
+ }
+
+ public static boolean hasBindTypeAnnotation(Annotation[] annotations)
+ {
+ for (Annotation annotation : annotations)
+ {
+ if (annotation.annotationType().isAnnotationPresent(Qualifier.class))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+}
Property changes on: extensions/trunk/test/junit
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Added: extensions/trunk/test/junit/pom.xml
===================================================================
--- extensions/trunk/test/junit/pom.xml (rev 0)
+++ extensions/trunk/test/junit/pom.xml 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-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">
+ <parent>
+ <artifactId>weld-test-parent</artifactId>
+ <groupId>org.jboss.weld.test</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-junit</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Weld Test JUnit Integration</name>
+ <url>http://www.seamframework.org/Weld</url>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-model</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-weld</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-se</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: extensions/trunk/test/junit/src/main/java/org/jboss/weld/test/junit/CDIRunner.java
===================================================================
--- extensions/trunk/test/junit/src/main/java/org/jboss/weld/test/junit/CDIRunner.java (rev 0)
+++ extensions/trunk/test/junit/src/main/java/org/jboss/weld/test/junit/CDIRunner.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,139 @@
+package org.jboss.weld.test.junit;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jboss.weld.test.core.TestCore;
+import org.junit.Test;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.Statement;
+
+public class CDIRunner extends BlockJUnit4ClassRunner
+{
+ private TestCore core;
+
+ public CDIRunner(Class<?> klass) throws InitializationError
+ {
+ super(klass);
+ initialize();
+ }
+
+ /*
+ * Try to resolve the appropriate environment and initialize it.
+ */
+ private void initialize() throws InitializationError
+ {
+ try
+ {
+ core = new TestCore();
+ core.start();
+ } catch (Exception e)
+ {
+ throw new InitializationError(Arrays.asList((Throwable) e));
+ }
+ }
+
+ /*
+ * Override the validation of TestMethods to support methods with arguments
+ */
+ @Override
+ protected void validateTestMethods(List<Throwable> errors)
+ {
+ validatePublicVoid(Test.class, false, errors);
+ }
+
+ protected void validatePublicVoid(Class<? extends Annotation> annotation,
+ boolean isStatic, List<Throwable> errors)
+ {
+ List<FrameworkMethod> methods = getTestClass().getAnnotatedMethods(
+ annotation);
+
+ for (FrameworkMethod eachTestMethod : methods)
+ {
+ eachTestMethod.validatePublicVoid(isStatic, errors);
+ validateBindingTypeParameters(eachTestMethod.getMethod(), errors);
+ }
+ }
+
+ protected void validateBindingTypeParameters(Method method,
+ List<Throwable> errors)
+ {
+ Annotation[][] parameterAnnotations = method.getParameterAnnotations();
+ Class<?>[] parameterTypes = method.getParameterTypes();
+
+ for (int i = 0; i < parameterTypes.length; i++)
+ {
+ Class<?> parameterType = parameterTypes[i];
+ if (!TestCore.hasBindTypeAnnotation(parameterAnnotations[i]))
+ {
+ errors.add(new Exception("Parameter of type "
+ + parameterType.getName() + " on method ("
+ + method.toGenericString() + ") "
+ + " should have a associated BindingType annotation"));
+ }
+ }
+ }
+
+ /*
+ * Override to inject TestCase class fields.
+ */
+ @Override
+ protected Object createTest() throws Exception
+ {
+ Object object = super.createTest();
+
+ core.injectFields(object);
+
+ return object;
+ }
+
+ /*
+ * Override to invoke TestMethod with injectable args.
+ */
+ @Override
+ protected Statement methodInvoker(FrameworkMethod method, Object test)
+ {
+ return new ParameterInvokerMethod(method, test);
+ }
+
+ private class ParameterInvokerMethod extends Statement
+ {
+
+ private final FrameworkMethod fTestMethod;
+
+ private Object fTarget;
+
+ public ParameterInvokerMethod(FrameworkMethod testMethod, Object target)
+ {
+ fTestMethod = testMethod;
+ fTarget = target;
+ }
+
+ @Override
+ public void evaluate() throws Throwable
+ {
+ fTestMethod.invokeExplosively(fTarget, getParameters());
+ }
+
+ private Object[] getParameters() throws Exception
+ {
+ Annotation[][] parameterAnnotations = fTestMethod.getMethod()
+ .getParameterAnnotations();
+ Class<?>[] parameterTypes = fTestMethod.getMethod()
+ .getParameterTypes();
+ Object[] parameters = new Object[parameterTypes.length];
+ for (int i = 0; i < parameterTypes.length; i++)
+ {
+ Class<?> parameterType = parameterTypes[i];
+ Annotation[] parameterAnnotation = parameterAnnotations[i];
+ parameters[i] = core.getInstanceByType(parameterType,
+ parameterAnnotation);
+ }
+ return parameters;
+ }
+ }
+}
Added: extensions/trunk/test/junit/src/test/java/org/jboss/weld/test/junit/ModelTestCase.java
===================================================================
--- extensions/trunk/test/junit/src/test/java/org/jboss/weld/test/junit/ModelTestCase.java (rev 0)
+++ extensions/trunk/test/junit/src/test/java/org/jboss/weld/test/junit/ModelTestCase.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,40 @@
+package org.jboss.weld.test.junit;
+
+import junit.framework.Assert;
+
+import org.jboss.weld.test.model.Language;
+import org.jboss.weld.test.model.LanguageType;
+import org.jboss.weld.test.model.User;
+import org.jboss.weld.test.model.WelcomeService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+(a)RunWith(CDIRunner.class)
+public class ModelTestCase
+{
+ // Will not be injected, no BindingType
+ private static String userName = "Aslak";
+
+ private @Language(LanguageType.NO)
+ WelcomeService service;
+
+ private User user = new User(userName);
+
+ @Test
+ public void shouldBeAbleToInjectInstanceVars() throws Exception
+ {
+ Assert.assertEquals("Hei " + userName, service.greet(user));
+ Assert.assertTrue(user.hasBeenGreetedIn(LanguageType.NO));
+ Assert.assertFalse(user.hasBeenGreetedIn(LanguageType.SE));
+ }
+
+ @Test
+ public void shouldBeAbleToInjectParameters(
+ @Language(LanguageType.SE) WelcomeService welcomeService)
+ throws Exception
+ {
+ Assert.assertEquals("Hej " + userName, welcomeService.greet(user));
+ Assert.assertTrue(user.hasBeenGreetedIn(LanguageType.SE));
+ Assert.assertFalse(user.hasBeenGreetedIn(LanguageType.NO));
+ }
+}
Added: extensions/trunk/test/pom.xml
===================================================================
--- extensions/trunk/test/pom.xml (rev 0)
+++ extensions/trunk/test/pom.xml 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,101 @@
+<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.test</groupId>
+ <artifactId>weld-test-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-extensions-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <name>Weld Test support build aggregator</name>
+ <url>http://www.seamframework.org/Weld</url>
+
+ <modules>
+ <module>core</module>
+ <module>spi</module>
+ <module>junit</module>
+ <module>testng</module>
+ <module>weld-impl</module>
+ <module>test-model</module>
+ </modules>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://jira.jboss.org/jira/browse/WELDX/component/12312750</url>
+ </issueManagement>
+
+ <description>
+ Support for CDI in Test frameworks
+ </description>
+
+ <developers>
+ <developer>
+ <name>Aslak Knutsen</name>
+ <roles>
+ <role>Project Lead</role>
+ </roles>
+ <email>aslak(a)conduct.no</email>
+ <organization>Conduct</organization>
+ </developer>
+ </developers>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-junit</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-testng</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-weld</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>4.6</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Property changes on: extensions/trunk/test/spi
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Added: extensions/trunk/test/spi/pom.xml
===================================================================
--- extensions/trunk/test/spi/pom.xml (rev 0)
+++ extensions/trunk/test/spi/pom.xml 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-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">
+ <parent>
+ <artifactId>weld-test-parent</artifactId>
+ <groupId>org.jboss.weld.test</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-spi</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Weld Test Bootstap SPI</name>
+ <url>http://www.seamframework.org/Weld</url>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: extensions/trunk/test/spi/src/main/java/org/jboss/weld/test/spi/Bootstrap.java
===================================================================
--- extensions/trunk/test/spi/src/main/java/org/jboss/weld/test/spi/Bootstrap.java (rev 0)
+++ extensions/trunk/test/spi/src/main/java/org/jboss/weld/test/spi/Bootstrap.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.test.spi;
+
+import javax.enterprise.inject.spi.BeanManager;
+
+/**
+ * Extension point for bootstrapping CDI containers.
+ *
+ * @author <a href="mailto:aslak@conduct.no">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public interface Bootstrap
+{
+
+ /**
+ * Called to initialize/start the container during test startup.
+ */
+ public BeanManager start() throws Exception;
+
+ /**
+ * Called to destroy/stop the container during test shutdown.
+ */
+ public void stop();
+}
Property changes on: extensions/trunk/test/test-model
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Added: extensions/trunk/test/test-model/pom.xml
===================================================================
--- extensions/trunk/test/test-model/pom.xml (rev 0)
+++ extensions/trunk/test/test-model/pom.xml 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-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">
+ <parent>
+ <artifactId>weld-test-parent</artifactId>
+ <groupId>org.jboss.weld.test</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-model</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Weld Test Test Model</name>
+ <url>http://www.seamframework.org/Weld</url>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/Greeted.java
===================================================================
--- extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/Greeted.java (rev 0)
+++ extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/Greeted.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,18 @@
+package org.jboss.weld.test.model;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+@Target( { PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Qualifier
+public @interface Greeted
+{
+
+}
Added: extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/GreetingsObserver.java
===================================================================
--- extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/GreetingsObserver.java (rev 0)
+++ extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/GreetingsObserver.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,20 @@
+package org.jboss.weld.test.model;
+
+import javax.enterprise.event.Observes;
+
+public class GreetingsObserver
+{
+
+ public void onUserGreetedInNorwegian(
+ @Observes @Greeted @Language(LanguageType.NO) User user)
+ {
+ user.wasGreetedIn(LanguageType.NO);
+ }
+
+ public void onUserGreetedInSwedish(
+ @Observes @Greeted @Language(LanguageType.SE) User user)
+ {
+ user.wasGreetedIn(LanguageType.SE);
+ }
+
+}
Added: extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/Language.java
===================================================================
--- extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/Language.java (rev 0)
+++ extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/Language.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,20 @@
+package org.jboss.weld.test.model;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+@Retention(RUNTIME)
+@Target( { TYPE, METHOD, FIELD, PARAMETER })
+@Qualifier
+public @interface Language
+{
+ LanguageType value();
+}
Added: extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/LanguageType.java
===================================================================
--- extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/LanguageType.java (rev 0)
+++ extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/LanguageType.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.model;
+
+public enum LanguageType
+{
+ NO, SE
+}
\ No newline at end of file
Added: extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/NorwegianWelcomeService.java
===================================================================
--- extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/NorwegianWelcomeService.java (rev 0)
+++ extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/NorwegianWelcomeService.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,20 @@
+package org.jboss.weld.test.model;
+
+import javax.enterprise.event.Event;
+import javax.inject.Inject;
+
+(a)Language(LanguageType.NO)
+public class NorwegianWelcomeService implements WelcomeService
+{
+ @Inject
+ @Greeted
+ @Language(LanguageType.NO)
+ private Event<User> greetedUserEvent;
+
+ public String greet(User user)
+ {
+ greetedUserEvent.fire(user);
+ return "Hei " + user.getFirstName();
+ }
+
+}
Added: extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/SwedishWelcomeService.java
===================================================================
--- extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/SwedishWelcomeService.java (rev 0)
+++ extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/SwedishWelcomeService.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,20 @@
+package org.jboss.weld.test.model;
+
+import javax.enterprise.event.Event;
+import javax.inject.Inject;
+
+(a)Language(LanguageType.SE)
+public class SwedishWelcomeService implements WelcomeService
+{
+ @Inject
+ @Greeted
+ @Language(LanguageType.SE)
+ private Event<User> greetedUserEvent;
+
+ public String greet(User user)
+ {
+ greetedUserEvent.fire(user);
+ return "Hej " + user.getFirstName();
+ }
+
+}
Added: extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/User.java
===================================================================
--- extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/User.java (rev 0)
+++ extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/User.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,37 @@
+package org.jboss.weld.test.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class User
+{
+ private String firstName;
+
+ private List<LanguageType> greetedInLanguage = new ArrayList<LanguageType>();
+
+ public User(String firstName)
+ {
+ this.firstName = firstName;
+ }
+
+ public String getFirstName()
+ {
+ return firstName;
+ }
+
+ @Override
+ public String toString()
+ {
+ return firstName;
+ }
+
+ public void wasGreetedIn(LanguageType language)
+ {
+ greetedInLanguage.add(language);
+ }
+
+ public boolean hasBeenGreetedIn(LanguageType language)
+ {
+ return greetedInLanguage.contains(language);
+ }
+}
Added: extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/WelcomeService.java
===================================================================
--- extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/WelcomeService.java (rev 0)
+++ extensions/trunk/test/test-model/src/main/java/org/jboss/weld/test/model/WelcomeService.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.model;
+
+public interface WelcomeService
+{
+ String greet(User user);
+}
Added: extensions/trunk/test/test-model/src/main/resources/META-INF/beans.xml
===================================================================
--- extensions/trunk/test/test-model/src/main/resources/META-INF/beans.xml (rev 0)
+++ extensions/trunk/test/test-model/src/main/resources/META-INF/beans.xml 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1 @@
+<beans/>
\ No newline at end of file
Property changes on: extensions/trunk/test/testng
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
temp-testng-customsuite.xml
test-output
Added: extensions/trunk/test/testng/pom.xml
===================================================================
--- extensions/trunk/test/testng/pom.xml (rev 0)
+++ extensions/trunk/test/testng/pom.xml 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-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">
+ <parent>
+ <artifactId>weld-test-parent</artifactId>
+ <groupId>org.jboss.weld.test</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-testng</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Weld Test TestNG Integration</name>
+ <url>http://www.seamframework.org/Weld</url>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-model</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-weld</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-se</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: extensions/trunk/test/testng/src/main/java/org/jboss/weld/test/testng/AbstractCDITest.java
===================================================================
--- extensions/trunk/test/testng/src/main/java/org/jboss/weld/test/testng/AbstractCDITest.java (rev 0)
+++ extensions/trunk/test/testng/src/main/java/org/jboss/weld/test/testng/AbstractCDITest.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,30 @@
+package org.jboss.weld.test.testng;
+
+import org.jboss.weld.test.core.TestCore;
+import org.testng.annotations.AfterSuite;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.BeforeTest;
+
+public class AbstractCDITest
+{
+ private TestCore core;
+
+ @BeforeSuite
+ public void create() throws Exception
+ {
+ core = new TestCore();
+ core.start();
+ }
+
+ @BeforeTest
+ public void injectParameters() throws Exception
+ {
+ core.injectFields(this);
+ }
+
+ @AfterSuite
+ public void destory()
+ {
+ core.stop();
+ }
+}
Added: extensions/trunk/test/testng/src/test/java/org/jboss/weld/test/testng/ModelTestCase.java
===================================================================
--- extensions/trunk/test/testng/src/test/java/org/jboss/weld/test/testng/ModelTestCase.java (rev 0)
+++ extensions/trunk/test/testng/src/test/java/org/jboss/weld/test/testng/ModelTestCase.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,28 @@
+package org.jboss.weld.test.testng;
+
+import org.jboss.weld.test.model.Language;
+import org.jboss.weld.test.model.LanguageType;
+import org.jboss.weld.test.model.User;
+import org.jboss.weld.test.model.WelcomeService;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class ModelTestCase extends AbstractCDITest
+{
+ // Will not be injected, no BindingType
+ private static String userName = "Aslak";
+
+ private @Language(LanguageType.NO)
+ WelcomeService service;
+
+ private User user = new User(userName);
+
+ @Test
+ public void shouldBeAbleToInjectInstanceVars() throws Exception
+ {
+ Assert.assertEquals("Hei " + userName, service.greet(user));
+ Assert.assertTrue(user.hasBeenGreetedIn(LanguageType.NO));
+ Assert.assertFalse(user.hasBeenGreetedIn(LanguageType.SE));
+ }
+
+}
Property changes on: extensions/trunk/test/weld-impl
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Added: extensions/trunk/test/weld-impl/pom.xml
===================================================================
--- extensions/trunk/test/weld-impl/pom.xml (rev 0)
+++ extensions/trunk/test/weld-impl/pom.xml 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-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">
+ <parent>
+ <artifactId>weld-test-parent</artifactId>
+ <groupId>org.jboss.weld.test</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-weld</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Weld Test Weld Bootstrap</name>
+ <url>http://www.seamframework.org/Weld</url>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.weld.test</groupId>
+ <artifactId>weld-test-spi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-se</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: extensions/trunk/test/weld-impl/src/main/java/org/jboss/weld/test/weld/EnvironmentResolver.java
===================================================================
--- extensions/trunk/test/weld-impl/src/main/java/org/jboss/weld/test/weld/EnvironmentResolver.java (rev 0)
+++ extensions/trunk/test/weld-impl/src/main/java/org/jboss/weld/test/weld/EnvironmentResolver.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,189 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.test.weld;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
+/**
+ * Helper class to find the appropriate environment to 'bootstrap'
+ *
+ * @author <a href="mailto:aslak@conduct.no">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public class EnvironmentResolver
+{
+ public Environment resolve() throws Exception
+ {
+ Environment environment = findSupported(
+// new EEEnvironment(),
+// new PreviouslyInitiatedEnvironment(),
+ new SEEnvironment());
+ if (environment == null)
+ {
+ throw new Exception(
+ "No appropriate environment found. "
+ + "The test is running in a non EE/Servlet environment and the Webbeans SE Extension is missing from classpath");
+ }
+ return environment;
+ }
+
+ private Environment findSupported(Environment... environments)
+ {
+ for (Environment environment : environments)
+ {
+ if (environment.isSupported())
+ {
+ return environment;
+ }
+ }
+ return null;
+ }
+
+ public static abstract class Environment
+ {
+
+ boolean isSupported()
+ {
+ try
+ {
+ if(getBeanManager() != null) {
+ return true;
+ }
+ } catch (Exception e)
+ {
+ }
+ return false;
+ }
+
+ void initialize() throws Exception
+ {
+ }
+
+ void stop()
+ {
+ }
+
+ abstract BeanManager getBeanManager() throws Exception;
+ }
+
+ public static class SEEnvironment extends Environment
+ {
+ private static final String SE_EXTENTION_CLASSNAME = "org.jboss.weld.environment.se.StartMain";
+ private static final String SE_EXTENTION_CLASSNAME_METHOD = "go";
+ private static final String SE_EXTENTION_BOOSTRAP = "org.jboss.weld.environment.se.ShutdownManager";
+ private static final String SE_EXTENTION_BOOSTRAP_METHOD = "shutdown";
+
+ private boolean initialized = false;
+ private BeanManager manager;
+
+ @Override
+ boolean isSupported()
+ {
+ try
+ {
+ Thread.currentThread().getContextClassLoader().loadClass(
+ SE_EXTENTION_CLASSNAME);
+ return true;
+ } catch (Exception e)
+ {
+ return false;
+ }
+ }
+
+ @Override
+ void initialize() throws Exception
+ {
+ if (!initialized)
+ {
+ Class<?> seExtensionMainClass = Thread.currentThread().getContextClassLoader()
+ .loadClass(SE_EXTENTION_CLASSNAME);
+
+ Method seExtensionStartMethod = seExtensionMainClass.getMethod(SE_EXTENTION_CLASSNAME_METHOD);
+ Constructor<?> seExtensionConstructor = seExtensionMainClass.getConstructor(String[].class);
+ Object seExtension = seExtensionConstructor.newInstance((Object)new String[0]);
+ manager = (BeanManager)seExtensionStartMethod.invoke(seExtension);
+ initialized = true;
+ }
+ }
+
+ @Override
+ BeanManager getBeanManager() throws Exception
+ {
+ if (!initialized)
+ {
+ throw new Exception("Environment has not been initialized.");
+ }
+ return manager;
+ }
+
+ @Override
+ void stop()
+ {
+ try
+ {
+ Class<?> bootstrapClass = Thread.currentThread().getContextClassLoader()
+ .loadClass(SE_EXTENTION_BOOSTRAP);
+
+ Method shutdownMethod = bootstrapClass.getMethod(SE_EXTENTION_BOOSTRAP_METHOD);
+ Object bootstrap = getInstanceByType(manager, bootstrapClass);
+
+ shutdownMethod.invoke(bootstrap);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(
+ "Could load bootstrap[" + SE_EXTENTION_BOOSTRAP + "] class for shutdown", e);
+ }
+ }
+ }
+
+// public static class EEEnvironment extends Environment
+// {
+// private static final String EE_CONTEXT_NAME = "java:comp/BeanManager";
+//
+// @Override
+// BeanManager getBeanManager() throws Exception
+// {
+// InitialContext context = new InitialContext();
+// return (BeanManager) context.lookup(EE_CONTEXT_NAME);
+// }
+// }
+
+// public static class PreviouslyInitiatedEnvironment extends Environment
+// {
+// @Override
+// BeanManager getBeanManager() throws Exception
+// {
+// return null; // CurrentManager.rootManager();
+// }
+// }
+
+ @SuppressWarnings("unchecked")
+ public static <T> T getInstanceByType(BeanManager manager, Class<T> type, Annotation... bindings)
+ {
+ final Bean<?> bean = manager.getBeans(type).iterator().next();
+ CreationalContext cc = manager.createCreationalContext(bean);
+ return (T) manager.getReference(bean, type, cc);
+ }
+
+}
Added: extensions/trunk/test/weld-impl/src/main/java/org/jboss/weld/test/weld/WeldTestBootstrap.java
===================================================================
--- extensions/trunk/test/weld-impl/src/main/java/org/jboss/weld/test/weld/WeldTestBootstrap.java (rev 0)
+++ extensions/trunk/test/weld-impl/src/main/java/org/jboss/weld/test/weld/WeldTestBootstrap.java 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.test.weld;
+
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.jboss.weld.test.spi.Bootstrap;
+import org.jboss.weld.test.weld.EnvironmentResolver.Environment;
+
+/**
+ * Weld Test extension Bootstrap SPI for the Weld CDI implementation.
+ *
+ * @author <a href="mailto:aslak@conduct.no">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public class WeldTestBootstrap implements Bootstrap
+{
+ private Environment environment;
+ private BeanManager manager;
+
+ public BeanManager start() throws Exception
+ {
+ if(environment == null && manager == null) {
+ environment = new EnvironmentResolver().resolve();
+ environment.initialize();
+ manager = environment.getBeanManager();
+ }
+ return manager;
+ }
+
+ public void stop()
+ {
+ if(environment != null && manager != null) {
+ environment.stop();
+ environment = null;
+ manager = null;
+ }
+ }
+}
Added: extensions/trunk/test/weld-impl/src/main/resources/META-INF/services/org.jboss.weld.test.spi.Bootstrap
===================================================================
--- extensions/trunk/test/weld-impl/src/main/resources/META-INF/services/org.jboss.weld.test.spi.Bootstrap (rev 0)
+++ extensions/trunk/test/weld-impl/src/main/resources/META-INF/services/org.jboss.weld.test.spi.Bootstrap 2009-11-10 13:13:57 UTC (rev 4952)
@@ -0,0 +1 @@
+org.jboss.weld.test.weld.WeldTestBootstrap
\ No newline at end of file
14 years, 7 months
- 1
- 0
Weld SVN: r4951 - cdi-tck/trunk/impl/src/main/resources.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-11-10 04:49:43 -0500 (Tue, 10 Nov 2009)
New Revision: 4951
Modified:
cdi-tck/trunk/impl/src/main/resources/tck-audit-int.xml
Log:
interceptors audit update
Modified: cdi-tck/trunk/impl/src/main/resources/tck-audit-int.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-audit-int.xml 2009-11-10 08:51:54 UTC (rev 4950)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-int.xml 2009-11-10 09:49:43 UTC (rev 4951)
@@ -57,6 +57,18 @@
</assertion>
</group>
+ <assertion id="ka">
+ <text>An interceptor implementation is not required to support the deployment descriptor approach to specifying interceptor metadata.</text>
+ </assertion>
+
+ <assertion id="kb">
+ <text>The |@Interceptor| annotation may be used to explicitly designate a class as an interceptor class. Support for this annotation is not required.</text>
+ </assertion>
+
+ <assertion id="kc">
+ <text>The |@InterceptorBinding| annotation specifies that an annotation type is an interceptor binding type. Support for this annotation is not required.</text>
+ </assertion>
+
<assertion id="l" testable="false">
<text>Default interceptors may be defined using the deployment descriptor.</text>
</assertion>
14 years, 7 months
- 1
- 0
Weld SVN: r4950 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-11-10 03:51:54 -0500 (Tue, 10 Nov 2009)
New Revision: 4950
Removed:
doc/trunk/reference/en-US/part1.5.xml
doc/trunk/reference/en-US/producerfields.xml
Log:
delete
Deleted: doc/trunk/reference/en-US/part1.5.xml
===================================================================
--- doc/trunk/reference/en-US/part1.5.xml 2009-11-10 08:33:12 UTC (rev 4949)
+++ doc/trunk/reference/en-US/part1.5.xml 2009-11-10 08:51:54 UTC (rev 4950)
@@ -1,16 +0,0 @@
-<!DOCTYPE partintro PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ ]>
-<partintro>
-
- <para>
- Weld, the JSR-299 Reference Implementation (RI), is being developed as part of the <ulink
- url="http://seamframework.org/Weld">Seam project</ulink>. You can download the latest community release of Weld
- from the <ulink url="http://seamframework.org/Download">download page</ulink>. Information about the Weld source
- code repository and instructions about how to obtain and build the source can be found on the same page.
- </para>
-
- <para>
- Weld comes with an extensive library of examples, which are a great starting point from which to learn CDI.
- </para>
-
-</partintro>
\ No newline at end of file
Deleted: doc/trunk/reference/en-US/producerfields.xml
===================================================================
--- doc/trunk/reference/en-US/producerfields.xml 2009-11-10 08:33:12 UTC (rev 4949)
+++ doc/trunk/reference/en-US/producerfields.xml 2009-11-10 08:51:54 UTC (rev 4950)
@@ -1,9 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ ]>
-<chapter id="producerfields">
-
- <title>Producer fields</title>
-
- <para>TODO</para>
-
-</chapter>
14 years, 7 months
- 1
- 0
Weld SVN: r4949 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-11-10 03:33:12 -0500 (Tue, 10 Nov 2009)
New Revision: 4949
Modified:
doc/trunk/reference/en-US/beans.xml
doc/trunk/reference/en-US/events.xml
doc/trunk/reference/en-US/injection.xml
doc/trunk/reference/en-US/scopescontexts.xml
doc/trunk/reference/en-US/weldexamples.xml
Log:
reorg, reorg, reorg
Modified: doc/trunk/reference/en-US/beans.xml
===================================================================
--- doc/trunk/reference/en-US/beans.xml 2009-11-10 08:17:29 UTC (rev 4948)
+++ doc/trunk/reference/en-US/beans.xml 2009-11-10 08:33:12 UTC (rev 4949)
@@ -1,7 +1,7 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ ]>
<chapter id="beanscdi">
- <title>Beans in CDI</title>
+ <title>More about beans</title>
<para>
A bean is usually an application class that contains business logic. It may be called directly from Java code,
Modified: doc/trunk/reference/en-US/events.xml
===================================================================
--- doc/trunk/reference/en-US/events.xml 2009-11-10 08:17:29 UTC (rev 4948)
+++ doc/trunk/reference/en-US/events.xml 2009-11-10 08:33:12 UTC (rev 4949)
@@ -240,7 +240,7 @@
</section>
<section>
- <title>Multiple event bindings</title>
+ <title>Multiple event qualifiers</title>
<para>Event qualifier types may be combined, for example:</para>
Modified: doc/trunk/reference/en-US/injection.xml
===================================================================
--- doc/trunk/reference/en-US/injection.xml 2009-11-10 08:17:29 UTC (rev 4948)
+++ doc/trunk/reference/en-US/injection.xml 2009-11-10 08:33:12 UTC (rev 4949)
@@ -261,6 +261,8 @@
may be multiple alterative implementations of <literal>@Asynchronous PaymentProcessor</literal>!
</para>
+ </section>
+
<section>
<title>Qualifiers with members</title>
@@ -299,7 +301,7 @@
</section>
<section>
- <title>Combining qualifiers</title>
+ <title>Multiple qualifiers</title>
<para>
An injection point may specify multiple qualifiers:
@@ -318,8 +320,6 @@
}]]></programlisting>
</section>
-
- </section>
<section id="alternatives">
<title>Alternatives</title>
Modified: doc/trunk/reference/en-US/scopescontexts.xml
===================================================================
--- doc/trunk/reference/en-US/scopescontexts.xml 2009-11-10 08:17:29 UTC (rev 4948)
+++ doc/trunk/reference/en-US/scopescontexts.xml 2009-11-10 08:33:12 UTC (rev 4949)
@@ -307,6 +307,8 @@
CDI makes it easy to obtain a dependent instance of a bean, even if the bean is already declared as a bean with
some other scope type.
</para>
+
+ </section>
<section>
<title>The <literal>@New</literal> qualifier</title>
@@ -348,8 +350,6 @@
</section>
- </section>
-
<!--
vim:et:ts=3:sw=3:tw=120
-->
Modified: doc/trunk/reference/en-US/weldexamples.xml
===================================================================
--- doc/trunk/reference/en-US/weldexamples.xml 2009-11-10 08:17:29 UTC (rev 4948)
+++ doc/trunk/reference/en-US/weldexamples.xml 2009-11-10 08:33:12 UTC (rev 4949)
@@ -398,8 +398,10 @@
interface name. You generally don't need to access this interface, but Weld makes use of it.
</para>
- </section>
-
+ </section>
+
+ </section>
+
<section id="numberguess-wicket">
<title>The numberguess example for Apache Wicket</title>
<para>
@@ -1123,7 +1125,6 @@
</programlistingco>
</section>
- </section>
<section id="translator">
<title>The translator example in depth</title>
14 years, 7 months
- 1
- 0