January 2009 - weld-commits - Jboss List Archives

[webbeans-commits] Webbeans SVN: r992 - in ri/trunk: webbeans-ri and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-15 14:20:42 -0500 (Thu, 15 Jan 2009) New Revision: 992 Modified: ri/trunk/pom.xml ri/trunk/webbeans-ri/pom.xml Log: add a report to the test execution Modified: ri/trunk/pom.xml =================================================================== --- ri/trunk/pom.xml 2009-01-15 19:01:04 UTC (rev 991) +++ ri/trunk/pom.xml 2009-01-15 19:20:42 UTC (rev 992) @@ -315,6 +315,16 @@ </archive> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.4.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + </plugin> </plugins> </pluginManagement> </build> Modified: ri/trunk/webbeans-ri/pom.xml =================================================================== --- ri/trunk/webbeans-ri/pom.xml 2009-01-15 19:01:04 UTC (rev 991) +++ ri/trunk/webbeans-ri/pom.xml 2009-01-15 19:20:42 UTC (rev 992) @@ -138,7 +138,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> <configuration> <suiteXmlFiles> <suiteXmlFile>unit-tests.xml,</suiteXmlFile> @@ -146,6 +145,23 @@ </suiteXmlFiles> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <executions> + <execution> + <id>generate-test-report</id> + <phase>test</phase> + <goals> + <goal>report-only</goal> + </goals> + </execution> + </executions> + <configuration> + <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> + <outputName>index</outputName> + </configuration> + </plugin> </plugins> </build>

17 years, 3 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r991 - doc/trunk/reference/es-ES.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-15 14:01:04 -0500 (Thu, 15 Jan 2009) New Revision: 991 Modified: doc/trunk/reference/es-ES/part3.po Log: xml bug Modified: doc/trunk/reference/es-ES/part3.po =================================================================== --- doc/trunk/reference/es-ES/part3.po 2009-01-15 19:00:23 UTC (rev 990) +++ doc/trunk/reference/es-ES/part3.po 2009-01-15 19:01:04 UTC (rev 991) @@ -34,7 +34,7 @@ "framework is hiding them from you using clever defaulting rulesso-" "called \"configuration by convention\"but because there are simply no " "strings there to begin with!" -msgstr "No necesita ver los identificadores de cadena en código de Web Beans, no porque el marco los esté escondiendo del uso inteligente de las reglasllamadas\"configuración por convención\"&#151,sino porque simplemente ¡no hay cadenas con qué comenzar!" +msgstr "No necesita ver los identificadores de cadena en código de Web Beans, no porque el marco los esté escondiendo del uso inteligente de las reglasllamadas\"configuración por convención\",sino porque simplemente ¡no hay cadenas con qué comenzar!" #. Tag: para #: part3.xml:15

17 years, 3 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r990 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition: common and 4 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-15 14:00:23 -0500 (Thu, 15 Jan 2009) New Revision: 990 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Chunky.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ScottishFish.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Whitefish.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/Animal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/DependentFinalTuna.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/Spider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/WolfSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Animal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/HornedAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/MammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Reindeer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Rhinoceros.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Spider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Animal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Haddock.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/MammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Minnow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Moose.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/RiverFishStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Animal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/AnotherScopeType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/BeanWithTooManyScopeTypes.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Grayling.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Minnow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Mullet.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Order.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Pollock.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/RiverFishStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Scallop_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/ScopeTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/Animal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/Haddock.java Log: move beans into packages Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/AnotherDeploymentType.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +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 java.lang.annotation.Target; + +import javax.webbeans.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} \ No newline at end of file Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Chunky.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Chunky.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,24 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +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.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Chunky +{ + + boolean realChunky(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Chunky.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DeadlyAnimal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DeadlyAnimal.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +interface DeadlyAnimal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DeadlyAnimal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DeadlySpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DeadlySpider.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +interface DeadlySpider extends DeadlyAnimal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DeadlySpider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ScottishFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ScottishFish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ScottishFish.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,7 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + + +interface ScottishFish extends Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ScottishFish.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Whitefish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Whitefish.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,22 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +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.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Whitefish +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Whitefish.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/Animal.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.common; + +interface Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/AnimalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/AnimalStereotype.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.tck.tests.definition.common; + +import static java.lang.annotation.ElementType.FIELD; +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.webbeans.RequestScoped; +import javax.webbeans.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +@interface AnimalStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/AnimalStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/AnotherDeploymentType.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.tests.definition.common; + +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 java.lang.annotation.Target; + +import javax.webbeans.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} \ No newline at end of file Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/DeadlyAnimal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/DeadlyAnimal.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.common; + +interface DeadlyAnimal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/DeadlyAnimal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/DeadlySpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/DeadlySpider.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.common; + +interface DeadlySpider extends DeadlyAnimal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/DeadlySpider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/DependentFinalTuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/DependentFinalTuna.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/DependentFinalTuna.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,7 @@ +package org.jboss.webbeans.tck.tests.definition.common; + +@AnotherDeploymentType +final class DependentFinalTuna +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/DependentFinalTuna.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/FishStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/FishStereotype.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.tck.tests.definition.common; + +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.webbeans.ApplicationScoped; +import javax.webbeans.Named; +import javax.webbeans.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@Named +@interface FishStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/FishStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/RedSnapper.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/RedSnapper.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.tck.tests.definition.common; + +import javax.webbeans.RequestScoped; + +@FishStereotype +@RequestScoped +class RedSnapper implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/RedSnapper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/Spider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/Spider.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.tck.tests.definition.common; + + +class Spider implements Animal +{ + + public final void layEggs() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/Spider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/SpiderProducer.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,24 @@ +package org.jboss.webbeans.tck.tests.definition.common; + +import javax.webbeans.Produces; + +@AnotherDeploymentType +class SpiderProducer +{ + + @Produces @AnimalStereotype public WolfSpider produceWolfSpider() + { + return new WolfSpider(); + } + + @Produces public Animal makeASpider() + { + return new WolfSpider(); + } + + @Produces public int getWolfSpiderSize() + { + return 4; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/SpiderProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/Tarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/Tarantula.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.common; + +class Tarantula extends Spider implements DeadlySpider +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/Tarantula.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/WolfSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/WolfSpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/WolfSpider.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.common; + +class WolfSpider implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/WolfSpider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Animal.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +interface Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/AnotherDeploymentType.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +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 java.lang.annotation.Target; + +import javax.webbeans.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} \ No newline at end of file Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/BlackWidow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/BlackWidow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/BlackWidow.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +class BlackWidow extends Spider implements DeadlySpider +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/BlackWidow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeadlyAnimal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeadlyAnimal.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +interface DeadlyAnimal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeadlyAnimal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeadlySpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeadlySpider.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +interface DeadlySpider extends DeadlyAnimal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeadlySpider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/FishStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/FishStereotype.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +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.webbeans.ApplicationScoped; +import javax.webbeans.Named; +import javax.webbeans.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@Named +@interface FishStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/FishStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/HornedAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/HornedAnimalDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/HornedAnimalDeploymentType.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +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 java.lang.annotation.Target; + +import javax.webbeans.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface HornedAnimalDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/HornedAnimalDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/HornedMammalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/HornedMammalStereotype.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,18 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +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.webbeans.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@HornedAnimalDeploymentType +@interface HornedMammalStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/HornedMammalStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/MammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/MammalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/MammalStereotype.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,18 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +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.webbeans.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@AnotherDeploymentType +@interface MammalStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/MammalStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/RedSnapper.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/RedSnapper.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +import javax.webbeans.RequestScoped; + +@FishStereotype +@RequestScoped +class RedSnapper implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/RedSnapper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Reindeer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Reindeer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Reindeer.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +import javax.webbeans.Production; + +@HornedMammalStereotype +@Production +class Reindeer implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Reindeer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Rhinoceros.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Rhinoceros.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Rhinoceros.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,8 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +@HornedMammalStereotype +@MammalStereotype +class Rhinoceros implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Rhinoceros.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Spider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Spider.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + + +class Spider implements Animal +{ + + public final void layEggs() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Spider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/SpiderProducer.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,17 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +import javax.webbeans.Named; +import javax.webbeans.Produces; + +@AnotherDeploymentType +class SpiderProducer +{ + + @Produces @Named("blackWidow") public BlackWidow produceBlackWidow() + { + return new BlackWidow(); + } + + + +} \ No newline at end of file Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/SpiderProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Animal.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.name; + +interface Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/AnotherDeploymentType.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.tests.definition.name; + +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 java.lang.annotation.Target; + +import javax.webbeans.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} \ No newline at end of file Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/FishStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/FishStereotype.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.tck.tests.definition.name; + +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.webbeans.ApplicationScoped; +import javax.webbeans.Named; +import javax.webbeans.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@Named +@interface FishStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/FishStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Haddock.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Haddock.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.tests.definition.name; + +import javax.webbeans.Named; +import javax.webbeans.Production; + +@Production +@Named +class Haddock implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Haddock.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/MammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/MammalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/MammalStereotype.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,18 @@ +package org.jboss.webbeans.tck.tests.definition.name; + +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.webbeans.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@AnotherDeploymentType +@interface MammalStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/MammalStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Minnow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Minnow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Minnow.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.tck.tests.definition.name; + +import javax.webbeans.RequestScoped; + +@RiverFishStereotype +@RequestScoped +class Minnow implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Minnow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Moose.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Moose.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Moose.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.tck.tests.definition.name; + +import javax.webbeans.Named; + +@MammalStereotype +@Named("aMoose") +class Moose implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/Moose.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/RedSnapper.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/RedSnapper.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.tck.tests.definition.name; + +import javax.webbeans.RequestScoped; + +@FishStereotype +@RequestScoped +class RedSnapper implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/RedSnapper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/RiverFishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/RiverFishStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/RiverFishStereotype.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,19 @@ +package org.jboss.webbeans.tck.tests.definition.name; + +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.webbeans.ApplicationScoped; +import javax.webbeans.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@interface RiverFishStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/RiverFishStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/SeaBass.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/SeaBass.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.tests.definition.name; + +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +@Production +@RequestScoped +class SeaBass implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/SeaBass.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Animal.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.scope; + +interface Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/AnimalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/AnimalStereotype.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.tck.tests.definition.scope; + +import static java.lang.annotation.ElementType.FIELD; +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.webbeans.RequestScoped; +import javax.webbeans.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +@interface AnimalStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/AnimalStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/AnotherScopeType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/AnotherScopeType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/AnotherScopeType.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.tests.definition.scope; + +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 java.lang.annotation.Target; + +import javax.webbeans.ScopeType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@ScopeType +@interface AnotherScopeType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/AnotherScopeType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/BeanWithTooManyScopeTypes.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/BeanWithTooManyScopeTypes.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/BeanWithTooManyScopeTypes.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.tests.definition.scope; + +import javax.webbeans.ConversationScoped; +import javax.webbeans.RequestScoped; + +@RequestScoped +@ConversationScoped +class BeanWithTooManyScopeTypes +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/BeanWithTooManyScopeTypes.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/FishStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/FishStereotype.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.tck.tests.definition.scope; + +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.webbeans.ApplicationScoped; +import javax.webbeans.Named; +import javax.webbeans.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@Named +@interface FishStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/FishStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Grayling.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Grayling.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Grayling.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,8 @@ +package org.jboss.webbeans.tck.tests.definition.scope; + +@RiverFishStereotype +@FishStereotype +class Grayling implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Grayling.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Minnow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Minnow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Minnow.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.tck.tests.definition.scope; + +import javax.webbeans.RequestScoped; + +@RiverFishStereotype +@RequestScoped +class Minnow implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Minnow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Mullet.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Mullet.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Mullet.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,7 @@ +package org.jboss.webbeans.tck.tests.definition.scope; + +@AnotherScopeType +public class Mullet +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Mullet.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Order.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Order.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.tck.tests.definition.scope; + +import javax.webbeans.Production; + +@Production +class Order +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Order.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Pollock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Pollock.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Pollock.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.tests.definition.scope; + +import javax.webbeans.Dependent; + +@AnimalStereotype +@FishStereotype +@Dependent +class Pollock implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Pollock.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/RedSnapper.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/RedSnapper.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.tck.tests.definition.scope; + +import javax.webbeans.RequestScoped; + +@FishStereotype +@RequestScoped +public class RedSnapper implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/RedSnapper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/RiverFishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/RiverFishStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/RiverFishStereotype.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,19 @@ +package org.jboss.webbeans.tck.tests.definition.scope; + +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.webbeans.ApplicationScoped; +import javax.webbeans.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@interface RiverFishStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/RiverFishStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Scallop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Scallop_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Scallop_Broken.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,8 @@ +package org.jboss.webbeans.tck.tests.definition.scope; + +@AnimalStereotype +@FishStereotype +public class Scallop_Broken +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/Scallop_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/ScopeTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/ScopeTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/ScopeTypeTest.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,141 @@ +package org.jboss.webbeans.tck.tests.definition.scope; + +import javax.webbeans.ApplicationScoped; +import javax.webbeans.DefinitionException; +import javax.webbeans.Dependent; +import javax.webbeans.RequestScoped; +import javax.webbeans.manager.Bean; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + +@SpecVersion("20081206") +public class ScopeTypeTest extends AbstractTest +{ + + @Test @SpecAssertion(section="2.4") + public void testScopeTypesAreExtensible() + { + Bean<Mullet> mullet = getSimpleBean(Mullet.class); + assert mullet.getScopeType().equals(AnotherScopeType.class); + } + + @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.4.2") + public void testScopeTypeHasCorrectTarget() + { + assert false; + } + + @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.4.2") + public void testScopeTypeHasCorrectRetention() + { + assert false; + } + + @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.4.2") + public void testScopeTypeDeclaresScopeTypeAnnotation() + { + assert false; + } + + @Test @SpecAssertion(section="2.4.3") + public void testScopeDeclaredInJava() + { + Bean<SeaBass> trout = getSimpleBean(SeaBass.class); + assert trout.getScopeType().equals(RequestScoped.class); + } + + @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.4.3") + public void testTooManyScopesSpecifiedInJava() + { + getSimpleBean(BeanWithTooManyScopeTypes.class); + } + + @Test(expectedExceptions=DefinitionException.class, groups={"stub", "webbeansxml"}) + public void testTooManyScopesSpecifiedInXml() + { + //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + //annotations.put(RequestScoped.class, new RequestScopedAnnotationLiteral()); + //annotations.put(ConversationScoped.class, new ConversationScopedAnnotationLiteral()); + //AnnotatedClass<Antelope> antelopeAnnotatedItem = new SimpleAnnotatedClass<Antelope>(Antelope.class, annotations); + //createSimpleBean(null, antelopeAnnotatedItem, manager); + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.4.4") + public void testScopeDeclaredInXml() + { + //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + //annotations.put(RequestScoped.class, new RequestScopedAnnotationLiteral()); + //AnnotatedClass<Order> annotatedItem = new SimpleAnnotatedClass<Order>(Order.class, annotations); + + //SimpleBean<Order> order = createSimpleBean(Order.class, annotatedItem, manager); + //assert order.getScopeType().equals(RequestScoped.class); + assert false; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.4.4") + public void testScopeMissingInXml() + { + //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + //AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations); + + //SimpleBean<SeaBass> trout =createSimpleBean(SeaBass.class, annotatedItem, manager); + //assert trout.getScopeType().equals(RequestScoped.class); + assert false; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.4.4") + public void testScopeDeclaredInXmlOverridesJava() + { + //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + //annotations.put(ConversationScoped.class, new ConversationScopedAnnotationLiteral()); + //AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations); + //SimpleBean<SeaBass> trout = createSimpleBean(SeaBass.class, annotatedItem, manager); + //assert trout.getScopeType().equals(ConversationScoped.class); + assert false; + } + + @Test @SpecAssertion(section="2.4.5") + public void testDefaultScope() + { + Bean<Order> order = getSimpleBean(Order.class); + assert order.getScopeType().equals(Dependent.class); + } + + @Test @SpecAssertion(section={"2.4.5", "2.7.2"}) + public void testScopeSpecifiedAndStereotyped() + { + Bean<Minnow> minnow = getSimpleBean(Minnow.class); + assert minnow.getScopeType().equals(RequestScoped.class); + } + + @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.4.5") + public void testMutipleIncompatibleScopeStereotypes() + { + getSimpleBean(Scallop_Broken.class); + } + + @Test @SpecAssertion(section="2.4.5") + public void testMutipleIncompatibleScopeStereotypesWithScopeSpecified() + { + Bean<Pollock> pollock = getSimpleBean(Pollock.class); + assert pollock.getScopeType().equals(Dependent.class); + } + + @Test @SpecAssertion(section="2.4.5") + public void testMutipleCompatibleScopeStereotypes() + { + Bean<Grayling> grayling = getSimpleBean(Grayling.class); + assert grayling.getScopeType().equals(ApplicationScoped.class); + } + + @Test @SpecAssertion(section="2.7.2") + public void testWebBeanScopeTypeOverridesStereotype() + { + Bean<RedSnapper> bean = getSimpleBean(RedSnapper.class); + assert bean.getScopeType().equals(RequestScoped.class); + } + +} \ No newline at end of file Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/ScopeTypeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/SeaBass.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/SeaBass.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.tests.definition.scope; + +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +@Production +@RequestScoped +class SeaBass implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/SeaBass.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/Animal.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.type; + +interface Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/Haddock.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/Haddock.java 2009-01-15 19:00:23 UTC (rev 990) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.tests.definition.type; + +import javax.webbeans.Named; +import javax.webbeans.Production; + +@Production +@Named +class Haddock implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/Haddock.java ___________________________________________________________________ Name: svn:mime-type + text/plain

17 years, 3 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r989 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck: impl/literals and 9 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-15 13:57:39 -0500 (Thu, 15 Jan 2009) New Revision: 989 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Animal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Barn.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cat.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cod.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Order.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Spider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Synchronous.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tame.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tuna.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DefaultDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Gazelle_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/NameTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/TypeTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Animal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Barn.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BeanWithTooManyScopeTypes.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cat.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cod.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DependentFinalTuna.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Grayling.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Haddock.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Minnow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Moose.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Mullet.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Order.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Pollock.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Reindeer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Rhinoceros.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/ScottishFish.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Spider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/TrapdoorSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tuna.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/WolfSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/broken/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/binding/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/BindingTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DefaultDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/ScopeTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/TypeTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/WebBeansTCKImpl.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java Log: split out test beans Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/WebBeansTCKImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/WebBeansTCKImpl.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/WebBeansTCKImpl.java 2009-01-15 18:57:39 UTC (rev 989) @@ -134,4 +134,5 @@ } } } + } Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/binding) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/binding/CurrentBinding.java 2009-01-15 16:22:44 UTC (rev 984) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.tck.impl.test.binding; +package org.jboss.webbeans.tck.impl.literals; import javax.webbeans.AnnotationLiteral; import javax.webbeans.Current; Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Animal.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Animal.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public interface Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Barn.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Barn.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Barn.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,10 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import org.jboss.webbeans.tck.impl.test.annotations.Tame; - -public class Barn -{ - @Tame - public Tarantula petSpider; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BeanWithTooManyScopeTypes.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BeanWithTooManyScopeTypes.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BeanWithTooManyScopeTypes.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.ConversationScoped; -import javax.webbeans.RequestScoped; - -@RequestScoped -@ConversationScoped -public class BeanWithTooManyScopeTypes -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BlackWidow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BlackWidow.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BlackWidow.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class BlackWidow extends Spider implements DeadlySpider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cat.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cat.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cat.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Production; - -import org.jboss.webbeans.tck.impl.test.annotations.Synchronous; - -@Production -@Synchronous -public class Cat -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cod.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cod.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,16 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Named; -import javax.webbeans.Production; - -import org.jboss.webbeans.tck.impl.test.annotations.Chunky; -import org.jboss.webbeans.tck.impl.test.annotations.Whitefish; - -@Production -@Whitefish -@Chunky(realChunky=true) -@Named("whitefish") -public class Cod implements ScottishFish -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DaddyLongLegs.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DaddyLongLegs.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DaddyLongLegs.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class DaddyLongLegs extends Spider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlyAnimal.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlyAnimal.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public interface DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlySpider.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlySpider.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public interface DeadlySpider extends DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DefangedTarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DefangedTarantula.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DefangedTarantula.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class DefangedTarantula extends Tarantula -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DependentFinalTuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DependentFinalTuna.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DependentFinalTuna.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType; - -@AnotherDeploymentType -public final class DependentFinalTuna -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/FunnelWeaver.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/FunnelWeaver.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class FunnelWeaver<T> -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Grayling.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Grayling.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Grayling.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import org.jboss.webbeans.tck.impl.test.annotations.FishStereotype; -import org.jboss.webbeans.tck.impl.test.annotations.RiverFishStereotype; - -@RiverFishStereotype -@FishStereotype -public class Grayling implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Haddock.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Haddock.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Named; -import javax.webbeans.Production; - -@Production -@Named -public class Haddock implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/LadybirdSpider.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/LadybirdSpider.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.ApplicationScoped; - -@ApplicationScoped -public class LadybirdSpider extends Spider -{ - - public void spinWeb() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Minnow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Minnow.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Minnow.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.tck.impl.test.annotations.RiverFishStereotype; - -@RiverFishStereotype -@RequestScoped -public class Minnow implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Moose.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Moose.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Moose.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Named; - -import org.jboss.webbeans.tck.impl.test.annotations.MammalStereotype; - -@MammalStereotype -@Named("aMoose") -public class Moose implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Mullet.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Mullet.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Mullet.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import org.jboss.webbeans.tck.impl.test.annotations.AnotherScopeType; - -@AnotherScopeType -public class Mullet -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Order.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Order.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Production; - -@Production -public class Order -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Pollock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Pollock.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Pollock.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Dependent; - -import org.jboss.webbeans.tck.impl.test.annotations.AnimalStereotype; -import org.jboss.webbeans.tck.impl.test.annotations.FishStereotype; - -@AnimalStereotype -@FishStereotype -@Dependent -public class Pollock implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/RedSnapper.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/RedSnapper.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.tck.impl.test.annotations.FishStereotype; - -@FishStereotype -@RequestScoped -public class RedSnapper implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Reindeer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Reindeer.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Reindeer.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Production; - -import org.jboss.webbeans.tck.impl.test.annotations.HornedMammalStereotype; - -@HornedMammalStereotype -@Production -public class Reindeer implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Rhinoceros.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Rhinoceros.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Rhinoceros.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import org.jboss.webbeans.tck.impl.test.annotations.HornedMammalStereotype; -import org.jboss.webbeans.tck.impl.test.annotations.MammalStereotype; - -@HornedMammalStereotype -@MammalStereotype -public class Rhinoceros implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/ScottishFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/ScottishFish.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/ScottishFish.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public interface ScottishFish extends Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SeaBass.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SeaBass.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -@Production -@RequestScoped -public class SeaBass implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Spider.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Spider.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class Spider implements Animal -{ - - public final void layEggs() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SpiderProducer.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SpiderProducer.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,104 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Dependent; -import javax.webbeans.Named; -import javax.webbeans.Produces; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.tck.impl.test.annotations.AnimalStereotype; -import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType; -import org.jboss.webbeans.tck.impl.test.annotations.Tame; - -@AnotherDeploymentType -public class SpiderProducer -{ - - private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; - - @Produces @Tame public Tarantula produceTameTarantula() - { - return new DefangedTarantula(); - } - - @Produces public Tarantula produceTarantula() - { - return new Tarantula(); - } - - @Produces @Dependent public final TrapdoorSpider produceTrapdoorSpider() - { - return new TrapdoorSpider(); - } - - @Produces @Named("blackWidow") public BlackWidow produceBlackWidow() - { - return new BlackWidow(); - } - - @Produces @Named @RequestScoped public DaddyLongLegs produceDaddyLongLegs() - { - return new DaddyLongLegs(); - } - - @Produces @Named @Production public LadybirdSpider getLadybirdSpider() - { - return new LadybirdSpider(); - } - - @Produces @Named("Shelob") public Tarantula produceShelob() - { - return null; - } - - @Produces @AnimalStereotype public WolfSpider produceWolfSpider() - { - return new WolfSpider(); - } - - @Produces public Animal makeASpider() - { - return new WolfSpider(); - } - - @Produces public int getWolfSpiderSize() - { - return 4; - } - - @Produces public Spider[] getSpiders() - { - return ALL_SPIDERS; - } - - @Produces public String[] getStrings() - { - return new String[0]; - } - - @Produces public <T> FunnelWeaver<T> getFunnelWeaver() - { - return new FunnelWeaver<T>(); - } - - @Produces public FunnelWeaver<?> getAnotherFunnelWeaver() - { - return new FunnelWeaver<Object>(); - } - - @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider() - { - return new FunnelWeaver<Spider>(); - } - - @Produces public Spider getNullSpider() - { - return null; - } - - @Produces public Spider produceSpiderFromInjection(@Tame Tarantula tarantula) - { - return tarantula; - } - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tarantula.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tarantula.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class Tarantula extends Spider implements DeadlySpider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/TrapdoorSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/TrapdoorSpider.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/TrapdoorSpider.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class TrapdoorSpider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tuna.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tuna.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,17 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType; - -@AnotherDeploymentType -@RequestScoped -public class Tuna -{ - - public String getName() - { - return "Ophir"; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/WolfSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/WolfSpider.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/WolfSpider.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class WolfSpider implements Animal -{ - -} Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -7,20 +7,26 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.lang.annotation.Annotation; import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; +import java.util.List; import javax.webbeans.Production; import javax.webbeans.Standard; import javax.webbeans.manager.Bean; import javax.webbeans.manager.Manager; -import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType; -import org.jboss.webbeans.tck.impl.test.annotations.HornedAnimalDeploymentType; import org.testng.annotations.BeforeMethod; +@SuppressWarnings("unchecked") public class AbstractTest { + + private static final List<Class<? extends Annotation>> STANDARD_DEPLOYMENT_TYPES = Collections.unmodifiableList(Arrays.asList(Standard.class, Production.class)); + protected static final int BUILT_IN_BEANS = 3; protected Manager manager; @@ -31,7 +37,7 @@ public final void before() { manager = configuration().getManagers().createManager(); - addStandardDeploymentTypesForTests(); + configuration().getManagers().setEnabledDeploymentTypes(getEnabledDeploymentTypes()); } public <T> Bean<T> getSimpleBean(Class<T> beanClass) @@ -72,11 +78,11 @@ */ - @SuppressWarnings("unchecked") - protected void addStandardDeploymentTypesForTests() + protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { - configuration().getManagers().setEnabledDeploymentTypes(Arrays.asList(Standard.class, Production.class, AnotherDeploymentType.class, HornedAnimalDeploymentType.class)); + return new ArrayList<Class<? extends Annotation>>(STANDARD_DEPLOYMENT_TYPES); } + /* protected <T> void addToEjbCache(Class<T> clazz) { Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/BindingTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/BindingTypeTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/BindingTypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,169 +0,0 @@ -package org.jboss.webbeans.tck.tests.definition; - - -import java.lang.reflect.Method; - -import javax.webbeans.Production; -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecVersion; -import org.jboss.webbeans.tck.impl.test.annotations.Synchronous; -import org.jboss.webbeans.tck.impl.test.beans.Barn; -import org.jboss.webbeans.tck.impl.test.beans.Cat; -import org.jboss.webbeans.tck.impl.test.beans.Cod; -import org.jboss.webbeans.tck.impl.test.beans.DefangedTarantula; -import org.jboss.webbeans.tck.impl.test.beans.Order; -import org.jboss.webbeans.tck.impl.test.beans.Spider; -import org.jboss.webbeans.tck.impl.test.beans.SpiderProducer; -import org.jboss.webbeans.tck.impl.test.beans.Tarantula; -import org.jboss.webbeans.tck.impl.test.beans.Tuna; -import org.jboss.webbeans.tck.impl.test.binding.CurrentBinding; -import org.jboss.webbeans.tck.impl.util.Reflections; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - -@SpecVersion("20081206") -public class BindingTypeTest extends AbstractTest -{ - - @Test @SpecAssertion(section={"2.3.3", "2.3.1"}) - public void testDefaultBindingDeclaredInJava() - { - Bean<Order> order = getSimpleBean(Order.class); - assert order.getBindings().size() == 1; - order.getBindings().iterator().next().annotationType().equals(Production.class); - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") - public void testBindingHasCorrectTarget() - { - assert false; - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") - public void testBindingHasCorrectRetention() - { - assert false; - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") - public void testBindingDeclaresBindingAnnotation() - { - assert false; - } - - @SuppressWarnings("unchecked") - @Test @SpecAssertion(section="2.3.3") - public void testBindingsDeclaredInJava() - { - Bean<Cat> cat = getSimpleBean(Cat.class); - assert cat.getBindings().size() == 1; - assert Reflections.annotationSetMatches(cat.getBindings(), Synchronous.class); - } - - @Test @SpecAssertion(section="2.3.3") - public void testMultipleBindings() - { - Bean<?> model = getSimpleBean(Cod.class); - assert model.getBindings().size() == 2; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") - public void testBindingsDeclaredInXml() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); - //AnnotatedClass annotatedItem = new SimpleAnnotatedClass(Antelope.class, annotations); - - //SimpleBean<Antelope> antelope = createSimpleBean(Antelope.class, annotatedItem, manager); - // assert Reflections.annotationSetMatches(antelope.getBindingTypes(), Asynchronous.class); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") - public void testXmlBindingOverridesAndIgnoresJava() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); - //AnnotatedClass<Cat> annotatedItem = new SimpleAnnotatedClass<Cat>(Cat.class, annotations); - - //SimpleBean<Cat> cat = createSimpleBean(Cat.class, annotatedItem, manager); - //assert cat.getBindingTypes().size() == 1; - //assert cat.getBindingTypes().contains(new AnnotationLiteral<Asynchronous>() {}); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") - public void testNoBindingsDeclaredInXml() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //AnnotatedClass<Cat> annotatedItem = new SimpleAnnotatedClass<Cat>(Cat.class, annotations); - - //SimpleBean<Cat> cat = createSimpleBean(Cat.class, annotatedItem, manager); - //assert cat.getBindingTypes().size() == 1; - //assert cat.getBindingTypes().contains(new AnnotationLiteral<Synchronous>() {}); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section={"2.3.4", "2.3.1"}) - public void testDefaultBindingDeclaredInXml() - { - Bean<?> model = getSimpleBean(Tuna.class); - assert model.getBindings().size() == 1; - assert model.getBindings().contains(new CurrentBinding()); - assert false; - } - - @Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="2.3.5") - public void testFieldInjectedFromProducerMethod() throws Exception - { - Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class); - manager.addBean(spiderProducer); - Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - manager.addBean(getProducerMethodBean(method, spiderProducer)); - Barn barn = getSimpleBean(Barn.class).create(); - assert barn.petSpider != null; - assert barn.petSpider instanceof DefangedTarantula; - } - - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.5") - public void testFieldWithBindingInXml() - { - assert false; - } - - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.5") - public void testFieldWithBindingInXmlIgnoresAnnotations() - { - assert false; - } - - @SuppressWarnings("unchecked") - @Test(groups={"injection", "producerMethod"}) - public void testMethodWithBindingAnnotationsOnParametersAreInjected() throws Exception - { - Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class); - manager.addBean(spiderProducer); - Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - manager.addBean(getProducerMethodBean(method, spiderProducer)); - method = SpiderProducer.class.getMethod("produceSpiderFromInjection", Tarantula.class); - Bean<Spider> spiderBean = (Bean<Spider>) getProducerMethodBean(method, spiderProducer); - Spider spider = spiderBean.create(); - assert spider != null; - assert spider instanceof DefangedTarantula; - } - - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.6") - public void testMethodWithBindingAnnotationsOnParametersDeclaredInXml() - { - assert false; - } - - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.6") - public void testMethodWithBindingAnnotationsOnParametersDeclaredInXmlIgnoresAnnotations() - { - assert false; - } - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,103 +0,0 @@ -package org.jboss.webbeans.tck.tests.definition; - -import java.lang.reflect.Method; - -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecVersion; -import org.jboss.webbeans.tck.impl.test.beans.Animal; -import org.jboss.webbeans.tck.impl.test.beans.DeadlyAnimal; -import org.jboss.webbeans.tck.impl.test.beans.DeadlySpider; -import org.jboss.webbeans.tck.impl.test.beans.DependentFinalTuna; -import org.jboss.webbeans.tck.impl.test.beans.RedSnapper; -import org.jboss.webbeans.tck.impl.test.beans.Spider; -import org.jboss.webbeans.tck.impl.test.beans.SpiderProducer; -import org.jboss.webbeans.tck.impl.test.beans.Tarantula; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - -/** - * This test class should be used for common assertions about Web Beans - * - * @author Pete Muir - * - */ -@SpecVersion("20081206") -public class CommonWebBeanTest extends AbstractTest -{ - - // TODO This should actually somehow test the reverse - that the container - // throws a definition exception if any of these occur - - @Test - @SpecAssertion(section = "2") - public void testApiTypesNonEmpty() - { - Bean<?> model = getSimpleBean(RedSnapper.class); - assert model.getTypes().size() > 0; - } - - @Test - @SpecAssertion(section = "2") - public void testBindingTypesNonEmpty() - { - Bean<?> model = getSimpleBean(RedSnapper.class); - assert model.getBindings().size() > 0; - } - - @Test - @SpecAssertion(section = "2") - public void testHasScopeType() - { - Bean<?> model = getSimpleBean(RedSnapper.class); - assert model.getScopeType().equals(RequestScoped.class); - } - - @Test - @SpecAssertion(section = "2") - public void testHasDeploymentType() - { - Bean<?> model = getSimpleBean(RedSnapper.class); - assert model.getDeploymentType().equals(Production.class); - } - - @SuppressWarnings("unchecked") - @Test(groups = "producerMethod") - @SpecAssertion(section = "5.2") - public void testIsNullable() throws Exception - { - Bean<SpiderProducer> spiderProducerBean = getSimpleBean(SpiderProducer.class); - manager.addBean(spiderProducerBean); - Method method = SpiderProducer.class.getMethod("getWolfSpiderSize"); - Bean<Integer> bean = (Bean<Integer>) getProducerMethodBean(method, spiderProducerBean); - assert !bean.isNullable(); - method = SpiderProducer.class.getMethod("makeASpider"); - Bean<Spider> spiderBean = (Bean<Spider>) getProducerMethodBean(method, spiderProducerBean); - assert spiderBean.isNullable(); - } - - @Test - @SpecAssertion(section = { "3.2.2", "2.2" }) - public void testApiTypes() - { - Bean<Tarantula> bean = getSimpleBean(Tarantula.class); - assert bean.getTypes().size() == 6; - assert bean.getTypes().contains(Tarantula.class); - assert bean.getTypes().contains(Spider.class); - assert bean.getTypes().contains(Animal.class); - assert bean.getTypes().contains(Object.class); - assert bean.getTypes().contains(DeadlySpider.class); - assert bean.getTypes().contains(DeadlyAnimal.class); - } - - @Test - @SpecAssertion(section = "2.2") - public void testFinalApiType() - { - getSimpleBean(DependentFinalTuna.class); - } - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DefaultDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DefaultDeploymentTypeTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DefaultDeploymentTypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,30 +0,0 @@ -package org.jboss.webbeans.tck.tests.definition; - -import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration; - -import javax.webbeans.Production; -import javax.webbeans.Standard; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - - -public class DefaultDeploymentTypeTest extends AbstractTest -{ - - @Override - protected void addStandardDeploymentTypesForTests() - { - // No-op - } - - @Test @SpecAssertion(section={"2.5.6", "2.5.7"}) - public void testDefaultEnabledDeploymentTypes() - { - assert configuration().getManagers().getEnabledDeploymentTypes().size() == 2; - assert configuration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); - assert configuration().getManagers().getEnabledDeploymentTypes().get(1).equals(Production.class); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DeploymentTypeTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DeploymentTypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,159 +0,0 @@ -package org.jboss.webbeans.tck.tests.definition; - -import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration; - -import java.lang.reflect.Method; -import java.util.Arrays; - -import javax.webbeans.DefinitionException; -import javax.webbeans.DeploymentException; -import javax.webbeans.Production; -import javax.webbeans.Standard; -import javax.webbeans.UnsatisfiedDependencyException; -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecVersion; -import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType; -import org.jboss.webbeans.tck.impl.test.annotations.HornedAnimalDeploymentType; -import org.jboss.webbeans.tck.impl.test.beans.BlackWidow; -import org.jboss.webbeans.tck.impl.test.beans.RedSnapper; -import org.jboss.webbeans.tck.impl.test.beans.Reindeer; -import org.jboss.webbeans.tck.impl.test.beans.Rhinoceros; -import org.jboss.webbeans.tck.impl.test.beans.SpiderProducer; -import org.jboss.webbeans.tck.impl.test.beans.broken.BeanWithTooManyDeploymentTypes; -import org.jboss.webbeans.tck.impl.test.beans.broken.Gazelle; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - -@SpecVersion("20081206") -public class DeploymentTypeTest extends AbstractTest -{ - - @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.5.1") - public void testNonBuiltInComponentUsesStandard() - { - getSimpleBean(Gazelle.class); - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.5.2") - public void testDeploymentTypeHasCorrectTarget() - { - assert false; - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.5.2") - public void testDeploymentTypeHasCorrectRetention() - { - assert false; - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.5.2") - public void testDeploymentTypeDeclaresScopeTypeAnnotation() - { - assert false; - } - - @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.5.3") - public void testTooManyDeploymentTypes() - { - getSimpleBean(BeanWithTooManyDeploymentTypes.class); - } - - @SuppressWarnings("unchecked") - @Test @SpecAssertion(section="2.5.3") - public void testDeploymentTypeInhertitedFromDeclaringBean() throws Exception - { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); - manager.addBean(bean); - Method method = SpiderProducer.class.getMethod("produceBlackWidow"); - Bean<BlackWidow> blackWidowSpiderModel = (Bean<BlackWidow>) getProducerMethodBean(method, bean); - assert blackWidowSpiderModel.getDeploymentType().equals(AnotherDeploymentType.class); - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.5.4") - public void testXmlDeploymentTypeOverridesJava() - { - //Map<Class<? extends Annotation>, Annotation> xmlDefinedDeploymentTypeAnnotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //xmlDefinedDeploymentTypeAnnotations.put(AnotherDeploymentType.class, new AnotherDeploymentTypeAnnotationLiteral()); - //AnnotatedClass<BeanWithTooManyDeploymentTypes> xmlDefinedDeploymentTypeAnnotatedItem = new SimpleAnnotatedClass<BeanWithTooManyDeploymentTypes>(BeanWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotations); - - //SimpleBean<BeanWithTooManyDeploymentTypes> model = createSimpleBean(BeanWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotatedItem, manager); - //assert model.getDeploymentType().equals(AnotherDeploymentType.class); - assert false; - } - - - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.5.4") - public void testXmlRespectsJavaDeploymentType() - { - //AnnotatedClass<Tuna> annotatedItem = new SimpleAnnotatedClass<Tuna>(Tuna.class, new HashMap<Class<? extends Annotation>, Annotation>()); - //SimpleBean<Tuna> tuna = createSimpleBean(Tuna.class, annotatedItem, manager); - //assert tuna.getDeploymentType().equals(AnotherDeploymentType.class); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.5.5") - public void testXmlDefaultDeploymentType() - { - //AnnotatedClass<Antelope> antelopeAnnotatedItem = new SimpleAnnotatedClass<Antelope>(Antelope.class, new HashMap<Class<? extends Annotation>, Annotation>()); - //SimpleBean<Antelope> antelope = createSimpleBean(Antelope.class, antelopeAnnotatedItem, manager); - // assert antelope.getDeploymentType().equals(Production.class); - assert false; - } - - @Test @SpecAssertion(section="2.5.5") - public void testHighestPrecedenceDeploymentTypeFromStereotype() - { - Bean<?> bean = getSimpleBean(Rhinoceros.class); - assert bean.getDeploymentType().equals(HornedAnimalDeploymentType.class); - } - - @SuppressWarnings("unchecked") - @Test(groups="beanLifecycle", expectedExceptions=UnsatisfiedDependencyException.class) @SpecAssertion(section="2.5.6") - public void testBeanWithDisabledDeploymentTypeNotInstantiated() - { - configuration().getManagers().setEnabledDeploymentTypes( - Arrays.asList(Standard.class, AnotherDeploymentType.class, - HornedAnimalDeploymentType.class)); - - Bean<RedSnapper> bean = getSimpleBean(RedSnapper.class); - manager.addBean(bean); - manager.getInstanceByType(RedSnapper.class); - } - - @SuppressWarnings("unchecked") - @Test @SpecAssertion(section={"2.5.6", "2.5.7"}) - public void testCustomDeploymentTypes() - { - configuration().getManagers().setEnabledDeploymentTypes( - Arrays.asList(Standard.class, AnotherDeploymentType.class, - HornedAnimalDeploymentType.class)); - assert configuration().getManagers().getEnabledDeploymentTypes().size() == 3; - assert configuration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); - assert configuration().getManagers().getEnabledDeploymentTypes().get(1).equals(AnotherDeploymentType.class); - assert configuration().getManagers().getEnabledDeploymentTypes().get(2).equals(HornedAnimalDeploymentType.class); - } - - @SuppressWarnings("unchecked") - @Test(expectedExceptions=DeploymentException.class) @SpecAssertion(section="2.5.6") - public void testStandardMustBeDeclared() - { - configuration().getManagers().setEnabledDeploymentTypes( - Arrays.asList(AnotherDeploymentType.class, HornedAnimalDeploymentType.class)); - } - - @Test(groups={"stub", "webbeansxml"}, expectedExceptions=DeploymentException.class) @SpecAssertion(section="2.5.6") - public void testMultipleDeployElementsCannotBeDefined() - { - - } - - @Test @SpecAssertion(section={"2.5.5", "2.7.2"}) - public void testWebBeanDeploymentTypeOverridesStereotype() - { - Bean<Reindeer> bean = getSimpleBean(Reindeer.class); - assert bean.getDeploymentType().equals(Production.class); - } -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,140 +0,0 @@ -package org.jboss.webbeans.tck.tests.definition; - -import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration; - -import javax.webbeans.DefinitionException; -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecVersion; -import org.jboss.webbeans.tck.impl.test.beans.Haddock; -import org.jboss.webbeans.tck.impl.test.beans.Minnow; -import org.jboss.webbeans.tck.impl.test.beans.Moose; -import org.jboss.webbeans.tck.impl.test.beans.RedSnapper; -import org.jboss.webbeans.tck.impl.test.beans.SeaBass; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - -@SpecVersion("20081206") -public class NameTest extends AbstractTest -{ - - @Test(groups="stub", expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.6") - public void testInvalidElIdentifierUsedAsWebBeanName() - { - assert false; - } - - @Test @SpecAssertion(section="2.6.1") - public void testNonDefaultNamed() - { - Bean<Moose> moose = getSimpleBean(Moose.class); - assert moose.getName().equals("aMoose"); - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.6.2") - public void testNonDefaultXmlNamed() - { - /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(Named.class, new NamedAnnotationLiteral(){ - - public String value() - { - return "aTrout"; - } - - }); - AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations);*/ - //SimpleBean<SeaBass> trout = createSimpleBean(SeaBass.class, annotatedItem, manager); - - //assert trout.getName().equals("aTrout"); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.6.2") - public void testXmlNamedOverridesJavaNamed() - { - /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(Named.class, new NamedAnnotationLiteral(){ - - public String value() - { - return "aTrout"; - } - - }); - AnnotatedClass<Cod> annotatedItem = new SimpleAnnotatedClass<Cod>(Cod.class, annotations);*/ - //SimpleBean<Cod> cod = createSimpleBean(Cod.class, annotatedItem, manager); - - //assert cod.getName().equals("aTrout"); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section={"2.6.2", "2.6.3"}) - public void testJavaNamedUsedWhenNoXmlSpecified() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //AnnotatedClass<Cod> annotatedItem = new SimpleAnnotatedClass<Cod>(Cod.class, annotations); - //SimpleBean<Cod> cod = createSimpleBean(Cod.class, annotatedItem, manager); - - //assert cod.getName().equals("whitefish"); - assert false; - } - - @Test @SpecAssertion(section={"2.6.3", "3.2.7"}) - public void testDefaultNamed() - { - Bean<Haddock> haddock = getSimpleBean(Haddock.class); - assert haddock.getName() != null; - assert haddock.getName().equals("haddock"); - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.6.3") - public void testDefaultXmlNamed() - { - /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(Named.class, new NamedAnnotationLiteral() { - - public String value() - { - return ""; - } - - }); - AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations);*/ - //SimpleBean<SeaBass> trout = createSimpleBean(SeaBass.class, annotatedItem, manager); - - //assert trout.getName() != null; - //assert trout.getName().equals("seaBass"); - assert false; - } - - @Test @SpecAssertion(section={"2.6.3", "2.7"}) - public void testSterotypeDefaultsName() - { - Bean<RedSnapper> model = getSimpleBean(RedSnapper.class); - assert model.getName().equals("redSnapper"); - } - - @Test @SpecAssertion(section="2.6.4") - public void testNotNamedInJava() - { - Bean<SeaBass> model = getSimpleBean(SeaBass.class); - assert model.getName() == null; - } - - @Test @SpecAssertion(section="2.6.4") - public void testNotNamedInXml() - { - Bean<SeaBass> model = getSimpleBean(SeaBass.class); - assert model.getName() == null; - } - - @Test @SpecAssertion(section="2.6.4") - public void testNotNamedInStereotype() - { - Bean<Minnow> model = getSimpleBean(Minnow.class); - assert model.getName() == null; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/ScopeTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/ScopeTypeTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/ScopeTypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,151 +0,0 @@ -package org.jboss.webbeans.tck.tests.definition; - -import javax.webbeans.ApplicationScoped; -import javax.webbeans.DefinitionException; -import javax.webbeans.Dependent; -import javax.webbeans.RequestScoped; -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecVersion; -import org.jboss.webbeans.tck.impl.test.annotations.AnotherScopeType; -import org.jboss.webbeans.tck.impl.test.beans.BeanWithTooManyScopeTypes; -import org.jboss.webbeans.tck.impl.test.beans.Grayling; -import org.jboss.webbeans.tck.impl.test.beans.Minnow; -import org.jboss.webbeans.tck.impl.test.beans.Mullet; -import org.jboss.webbeans.tck.impl.test.beans.Order; -import org.jboss.webbeans.tck.impl.test.beans.Pollock; -import org.jboss.webbeans.tck.impl.test.beans.RedSnapper; -import org.jboss.webbeans.tck.impl.test.beans.SeaBass; -import org.jboss.webbeans.tck.impl.test.beans.broken.Scallop; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - -@SpecVersion("20081206") -public class ScopeTypeTest extends AbstractTest -{ - - @Test @SpecAssertion(section="2.4") - public void testScopeTypesAreExtensible() - { - Bean<Mullet> mullet = getSimpleBean(Mullet.class); - assert mullet.getScopeType().equals(AnotherScopeType.class); - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.4.2") - public void testScopeTypeHasCorrectTarget() - { - assert false; - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.4.2") - public void testScopeTypeHasCorrectRetention() - { - assert false; - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.4.2") - public void testScopeTypeDeclaresScopeTypeAnnotation() - { - assert false; - } - - @Test @SpecAssertion(section="2.4.3") - public void testScopeDeclaredInJava() - { - Bean<SeaBass> trout = getSimpleBean(SeaBass.class); - assert trout.getScopeType().equals(RequestScoped.class); - } - - @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.4.3") - public void testTooManyScopesSpecifiedInJava() - { - getSimpleBean(BeanWithTooManyScopeTypes.class); - } - - @Test(expectedExceptions=DefinitionException.class, groups={"stub", "webbeansxml"}) - public void testTooManyScopesSpecifiedInXml() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //annotations.put(RequestScoped.class, new RequestScopedAnnotationLiteral()); - //annotations.put(ConversationScoped.class, new ConversationScopedAnnotationLiteral()); - //AnnotatedClass<Antelope> antelopeAnnotatedItem = new SimpleAnnotatedClass<Antelope>(Antelope.class, annotations); - //createSimpleBean(null, antelopeAnnotatedItem, manager); - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.4.4") - public void testScopeDeclaredInXml() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //annotations.put(RequestScoped.class, new RequestScopedAnnotationLiteral()); - //AnnotatedClass<Order> annotatedItem = new SimpleAnnotatedClass<Order>(Order.class, annotations); - - //SimpleBean<Order> order = createSimpleBean(Order.class, annotatedItem, manager); - //assert order.getScopeType().equals(RequestScoped.class); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.4.4") - public void testScopeMissingInXml() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations); - - //SimpleBean<SeaBass> trout =createSimpleBean(SeaBass.class, annotatedItem, manager); - //assert trout.getScopeType().equals(RequestScoped.class); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.4.4") - public void testScopeDeclaredInXmlOverridesJava() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //annotations.put(ConversationScoped.class, new ConversationScopedAnnotationLiteral()); - //AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations); - //SimpleBean<SeaBass> trout = createSimpleBean(SeaBass.class, annotatedItem, manager); - //assert trout.getScopeType().equals(ConversationScoped.class); - assert false; - } - - @Test @SpecAssertion(section="2.4.5") - public void testDefaultScope() - { - Bean<Order> order = getSimpleBean(Order.class); - assert order.getScopeType().equals(Dependent.class); - } - - @Test @SpecAssertion(section={"2.4.5", "2.7.2"}) - public void testScopeSpecifiedAndStereotyped() - { - Bean<Minnow> minnow = getSimpleBean(Minnow.class); - assert minnow.getScopeType().equals(RequestScoped.class); - } - - @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.4.5") - public void testMutipleIncompatibleScopeStereotypes() - { - getSimpleBean(Scallop.class); - } - - @Test @SpecAssertion(section="2.4.5") - public void testMutipleIncompatibleScopeStereotypesWithScopeSpecified() - { - Bean<Pollock> pollock = getSimpleBean(Pollock.class); - assert pollock.getScopeType().equals(Dependent.class); - } - - @Test @SpecAssertion(section="2.4.5") - public void testMutipleCompatibleScopeStereotypes() - { - Bean<Grayling> grayling = getSimpleBean(Grayling.class); - assert grayling.getScopeType().equals(ApplicationScoped.class); - } - - @Test @SpecAssertion(section="2.7.2") - public void testWebBeanScopeTypeOverridesStereotype() - { - Bean<RedSnapper> bean = getSimpleBean(RedSnapper.class); - assert bean.getScopeType().equals(RequestScoped.class); - } - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/TypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/TypeTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/TypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,22 +0,0 @@ -package org.jboss.webbeans.tck.tests.definition; - -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.test.beans.Haddock; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - -public class TypeTest extends AbstractTest -{ - - @Test @SpecAssertion(section="2.6.3") - public void testDefaultNamed() - { - Bean<Haddock> haddock = getSimpleBean(Haddock.class); - assert haddock.getName() != null; - assert haddock.getName().equals("haddock"); - } - -} - Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Animal.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Animal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Animal.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +interface Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Barn.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Barn.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Barn.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Barn.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + + +class Barn +{ + @Tame + public Tarantula petSpider; + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTypeTest.java (from rev 986, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/BindingTypeTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,169 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.List; + +import javax.webbeans.Production; +import javax.webbeans.manager.Bean; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.impl.literals.CurrentBinding; +import org.jboss.webbeans.tck.impl.util.Reflections; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + +@SpecVersion("20081206") +public class BindingTypeTest extends AbstractTest +{ + + @Override + protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() + { + List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes(); + deploymentTypes.add(AnotherDeploymentType.class); + return deploymentTypes; + } + + @Test @SpecAssertion(section={"2.3.3", "2.3.1"}) + public void testDefaultBindingDeclaredInJava() + { + Bean<Order> order = getSimpleBean(Order.class); + assert order.getBindings().size() == 1; + order.getBindings().iterator().next().annotationType().equals(Production.class); + } + + @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") + public void testBindingHasCorrectTarget() + { + assert false; + } + + @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") + public void testBindingHasCorrectRetention() + { + assert false; + } + + @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") + public void testBindingDeclaresBindingAnnotation() + { + assert false; + } + + @SuppressWarnings("unchecked") + @Test @SpecAssertion(section="2.3.3") + public void testBindingsDeclaredInJava() + { + Bean<Cat> cat = getSimpleBean(Cat.class); + assert cat.getBindings().size() == 1; + assert Reflections.annotationSetMatches(cat.getBindings(), Synchronous.class); + } + + @Test @SpecAssertion(section="2.3.3") + public void testMultipleBindings() + { + Bean<?> model = getSimpleBean(Cod.class); + assert model.getBindings().size() == 2; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") + public void testBindingsDeclaredInXml() + { + //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); + //AnnotatedClass annotatedItem = new SimpleAnnotatedClass(Antelope.class, annotations); + + //SimpleBean<Antelope> antelope = createSimpleBean(Antelope.class, annotatedItem, manager); + // assert Reflections.annotationSetMatches(antelope.getBindingTypes(), Asynchronous.class); + assert false; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") + public void testXmlBindingOverridesAndIgnoresJava() + { + //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); + //AnnotatedClass<Cat> annotatedItem = new SimpleAnnotatedClass<Cat>(Cat.class, annotations); + + //SimpleBean<Cat> cat = createSimpleBean(Cat.class, annotatedItem, manager); + //assert cat.getBindingTypes().size() == 1; + //assert cat.getBindingTypes().contains(new AnnotationLiteral<Asynchronous>() {}); + assert false; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") + public void testNoBindingsDeclaredInXml() + { + //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + //AnnotatedClass<Cat> annotatedItem = new SimpleAnnotatedClass<Cat>(Cat.class, annotations); + + //SimpleBean<Cat> cat = createSimpleBean(Cat.class, annotatedItem, manager); + //assert cat.getBindingTypes().size() == 1; + //assert cat.getBindingTypes().contains(new AnnotationLiteral<Synchronous>() {}); + assert false; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section={"2.3.4", "2.3.1"}) + public void testDefaultBindingDeclaredInXml() + { + Bean<?> model = getSimpleBean(Tuna.class); + assert model.getBindings().size() == 1; + assert model.getBindings().contains(new CurrentBinding()); + assert false; + } + + @Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="2.3.5") + public void testFieldInjectedFromProducerMethod() throws Exception + { + Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class); + manager.addBean(spiderProducer); + Method method = SpiderProducer.class.getMethod("produceTameTarantula"); + manager.addBean(getProducerMethodBean(method, spiderProducer)); + Barn barn = getSimpleBean(Barn.class).create(); + assert barn.petSpider != null; + assert barn.petSpider instanceof DefangedTarantula; + } + + @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.5") + public void testFieldWithBindingInXml() + { + assert false; + } + + @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.5") + public void testFieldWithBindingInXmlIgnoresAnnotations() + { + assert false; + } + + @SuppressWarnings("unchecked") + @Test(groups={"injection", "producerMethod"}) + public void testMethodWithBindingAnnotationsOnParametersAreInjected() throws Exception + { + Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class); + manager.addBean(spiderProducer); + Method method = SpiderProducer.class.getMethod("produceTameTarantula"); + manager.addBean(getProducerMethodBean(method, spiderProducer)); + method = SpiderProducer.class.getMethod("produceSpiderFromInjection", Tarantula.class); + Bean<Spider> spiderBean = (Bean<Spider>) getProducerMethodBean(method, spiderProducer); + Spider spider = spiderBean.create(); + assert spider != null; + assert spider instanceof DefangedTarantula; + } + + @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.6") + public void testMethodWithBindingAnnotationsOnParametersDeclaredInXml() + { + assert false; + } + + @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.6") + public void testMethodWithBindingAnnotationsOnParametersDeclaredInXmlIgnoresAnnotations() + { + assert false; + } + +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cat.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cat.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cat.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cat.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +import javax.webbeans.Production; + + +@Production +@Synchronous +class Cat +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cod.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cod.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cod.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cod.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,13 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +import javax.webbeans.Named; +import javax.webbeans.Production; + +@Production +@Whitefish +@Chunky(realChunky=true) +@Named("whitefish") +class Cod implements ScottishFish +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DefangedTarantula.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DefangedTarantula.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DefangedTarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DefangedTarantula.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,5 @@ +package org.jboss.webbeans.tck.tests.definition.binding; +class DefangedTarantula extends Tarantula +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Order.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Order.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Order.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Order.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +import javax.webbeans.Production; + +@Production +class Order +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Spider.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Spider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Spider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Spider.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + + +class Spider implements Animal +{ + + public final void layEggs() + { + + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/SpiderProducer.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SpiderProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/SpiderProducer.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +import javax.webbeans.Produces; + + + +@AnotherDeploymentType +class SpiderProducer +{ + + @Produces @Tame public Tarantula produceTameTarantula() + { + return new DefangedTarantula(); + } + + @Produces public Spider produceSpiderFromInjection(@Tame Tarantula tarantula) + { + return tarantula; + } + +} \ No newline at end of file Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Synchronous.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Synchronous.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Synchronous.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +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.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.BindingType; + +@Target( { TYPE, METHOD, PARAMETER }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Synchronous +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tame.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Tame.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tame.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,22 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +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.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Tame +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tarantula.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tarantula.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tarantula.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +class Tarantula extends Spider implements DeadlySpider +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tuna.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tuna.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tuna.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tuna.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,15 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +import javax.webbeans.RequestScoped; + +@AnotherDeploymentType +@RequestScoped +class Tuna +{ + + public String getName() + { + return "Ophir"; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,95 @@ +package org.jboss.webbeans.tck.tests.definition.common; + +import java.lang.reflect.Method; + +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; +import javax.webbeans.manager.Bean; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + +/** + * This test class should be used for common assertions about Web Beans + * + * @author Pete Muir + * + */ +@SpecVersion("20081206") +public class CommonWebBeanTest extends AbstractTest +{ + + // TODO This should actually somehow test the reverse - that the container + // throws a definition exception if any of these occur + + @Test + @SpecAssertion(section = "2") + public void testApiTypesNonEmpty() + { + Bean<?> model = getSimpleBean(RedSnapper.class); + assert model.getTypes().size() > 0; + } + + @Test + @SpecAssertion(section = "2") + public void testBindingTypesNonEmpty() + { + Bean<?> model = getSimpleBean(RedSnapper.class); + assert model.getBindings().size() > 0; + } + + @Test + @SpecAssertion(section = "2") + public void testHasScopeType() + { + Bean<?> model = getSimpleBean(RedSnapper.class); + assert model.getScopeType().equals(RequestScoped.class); + } + + @Test + @SpecAssertion(section = "2") + public void testHasDeploymentType() + { + Bean<?> model = getSimpleBean(RedSnapper.class); + assert model.getDeploymentType().equals(Production.class); + } + + @SuppressWarnings("unchecked") + @Test(groups = "producerMethod") + @SpecAssertion(section = "5.2") + public void testIsNullable() throws Exception + { + Bean<SpiderProducer> spiderProducerBean = getSimpleBean(SpiderProducer.class); + manager.addBean(spiderProducerBean); + Method method = SpiderProducer.class.getMethod("getWolfSpiderSize"); + Bean<Integer> bean = (Bean<Integer>) getProducerMethodBean(method, spiderProducerBean); + assert !bean.isNullable(); + method = SpiderProducer.class.getMethod("makeASpider"); + Bean<Spider> spiderBean = (Bean<Spider>) getProducerMethodBean(method, spiderProducerBean); + assert spiderBean.isNullable(); + } + + @Test + @SpecAssertion(section = { "3.2.2", "2.2" }) + public void testApiTypes() + { + Bean<Tarantula> bean = getSimpleBean(Tarantula.class); + assert bean.getTypes().size() == 6; + assert bean.getTypes().contains(Tarantula.class); + assert bean.getTypes().contains(Spider.class); + assert bean.getTypes().contains(Animal.class); + assert bean.getTypes().contains(Object.class); + assert bean.getTypes().contains(DeadlySpider.class); + assert bean.getTypes().contains(DeadlyAnimal.class); + } + + @Test + @SpecAssertion(section = "2.2") + public void testFinalApiType() + { + getSimpleBean(DependentFinalTuna.class); + } + +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/broken/BeanWithTooManyDeploymentTypes.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +import javax.webbeans.Production; + +@Production +@AnotherDeploymentType +class BeanWithTooManyDeploymentTypes_Broken +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DefaultDeploymentTypeTest.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DefaultDeploymentTypeTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DefaultDeploymentTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DefaultDeploymentTypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,24 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration; + +import javax.webbeans.Production; +import javax.webbeans.Standard; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + + +public class DefaultDeploymentTypeTest extends AbstractTest +{ + + @Test @SpecAssertion(section={"2.5.6", "2.5.7"}) + public void testDefaultEnabledDeploymentTypes() + { + assert configuration().getManagers().getEnabledDeploymentTypes().size() == 2; + assert configuration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert configuration().getManagers().getEnabledDeploymentTypes().get(1).equals(Production.class); + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DeploymentTypeTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,160 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.List; + +import javax.webbeans.DefinitionException; +import javax.webbeans.DeploymentException; +import javax.webbeans.Production; +import javax.webbeans.Standard; +import javax.webbeans.UnsatisfiedDependencyException; +import javax.webbeans.manager.Bean; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + +@SpecVersion("20081206") +public class DeploymentTypeTest extends AbstractTest +{ + + @Override + protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() + { + List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes(); + deploymentTypes.add(HornedAnimalDeploymentType.class); + return deploymentTypes; + } + + @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.5.1") + public void testNonBuiltInComponentUsesStandard() + { + getSimpleBean(Gazelle_Broken.class); + } + + @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.5.2") + public void testDeploymentTypeHasCorrectTarget() + { + assert false; + } + + @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.5.2") + public void testDeploymentTypeHasCorrectRetention() + { + assert false; + } + + @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.5.2") + public void testDeploymentTypeDeclaresScopeTypeAnnotation() + { + assert false; + } + + @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.5.3") + public void testTooManyDeploymentTypes() + { + getSimpleBean(BeanWithTooManyDeploymentTypes_Broken.class); + } + + @SuppressWarnings("unchecked") + @Test @SpecAssertion(section="2.5.3") + public void testDeploymentTypeInhertitedFromDeclaringBean() throws Exception + { + Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + manager.addBean(bean); + Method method = SpiderProducer.class.getMethod("produceBlackWidow"); + Bean<BlackWidow> blackWidowSpiderModel = (Bean<BlackWidow>) getProducerMethodBean(method, bean); + assert blackWidowSpiderModel.getDeploymentType().equals(AnotherDeploymentType.class); + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.5.4") + public void testXmlDeploymentTypeOverridesJava() + { + //Map<Class<? extends Annotation>, Annotation> xmlDefinedDeploymentTypeAnnotations = new HashMap<Class<? extends Annotation>, Annotation>(); + //xmlDefinedDeploymentTypeAnnotations.put(AnotherDeploymentType.class, new AnotherDeploymentTypeAnnotationLiteral()); + //AnnotatedClass<BeanWithTooManyDeploymentTypes> xmlDefinedDeploymentTypeAnnotatedItem = new SimpleAnnotatedClass<BeanWithTooManyDeploymentTypes>(BeanWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotations); + + //SimpleBean<BeanWithTooManyDeploymentTypes> model = createSimpleBean(BeanWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotatedItem, manager); + //assert model.getDeploymentType().equals(AnotherDeploymentType.class); + assert false; + } + + + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.5.4") + public void testXmlRespectsJavaDeploymentType() + { + //AnnotatedClass<Tuna> annotatedItem = new SimpleAnnotatedClass<Tuna>(Tuna.class, new HashMap<Class<? extends Annotation>, Annotation>()); + //SimpleBean<Tuna> tuna = createSimpleBean(Tuna.class, annotatedItem, manager); + //assert tuna.getDeploymentType().equals(AnotherDeploymentType.class); + assert false; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.5.5") + public void testXmlDefaultDeploymentType() + { + //AnnotatedClass<Antelope> antelopeAnnotatedItem = new SimpleAnnotatedClass<Antelope>(Antelope.class, new HashMap<Class<? extends Annotation>, Annotation>()); + //SimpleBean<Antelope> antelope = createSimpleBean(Antelope.class, antelopeAnnotatedItem, manager); + // assert antelope.getDeploymentType().equals(Production.class); + assert false; + } + + @Test @SpecAssertion(section="2.5.5") + public void testHighestPrecedenceDeploymentTypeFromStereotype() + { + Bean<?> bean = getSimpleBean(Rhinoceros.class); + assert bean.getDeploymentType().equals(HornedAnimalDeploymentType.class); + } + + @SuppressWarnings("unchecked") + @Test(groups="beanLifecycle", expectedExceptions=UnsatisfiedDependencyException.class) @SpecAssertion(section="2.5.6") + public void testBeanWithDisabledDeploymentTypeNotInstantiated() + { + configuration().getManagers().setEnabledDeploymentTypes( + Arrays.asList(Standard.class, AnotherDeploymentType.class, + HornedAnimalDeploymentType.class)); + + Bean<RedSnapper> bean = getSimpleBean(RedSnapper.class); + manager.addBean(bean); + manager.getInstanceByType(RedSnapper.class); + } + + @SuppressWarnings("unchecked") + @Test @SpecAssertion(section={"2.5.6", "2.5.7"}) + public void testCustomDeploymentTypes() + { + configuration().getManagers().setEnabledDeploymentTypes( + Arrays.asList(Standard.class, AnotherDeploymentType.class, + HornedAnimalDeploymentType.class)); + assert configuration().getManagers().getEnabledDeploymentTypes().size() == 3; + assert configuration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert configuration().getManagers().getEnabledDeploymentTypes().get(1).equals(AnotherDeploymentType.class); + assert configuration().getManagers().getEnabledDeploymentTypes().get(2).equals(HornedAnimalDeploymentType.class); + } + + @SuppressWarnings("unchecked") + @Test(expectedExceptions=DeploymentException.class) @SpecAssertion(section="2.5.6") + public void testStandardMustBeDeclared() + { + configuration().getManagers().setEnabledDeploymentTypes( + Arrays.asList(AnotherDeploymentType.class, HornedAnimalDeploymentType.class)); + } + + @Test(groups={"stub", "webbeansxml"}, expectedExceptions=DeploymentException.class) @SpecAssertion(section="2.5.6") + public void testMultipleDeployElementsCannotBeDefined() + { + + } + + @Test @SpecAssertion(section={"2.5.5", "2.7.2"}) + public void testWebBeanDeploymentTypeOverridesStereotype() + { + Bean<Reindeer> bean = getSimpleBean(Reindeer.class); + assert bean.getDeploymentType().equals(Production.class); + } +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Gazelle_Broken.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/broken/Gazelle.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Gazelle_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Gazelle_Broken.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +import javax.webbeans.Standard; + +@Standard +class Gazelle_Broken +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/NameTest.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/NameTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/NameTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,144 @@ +package org.jboss.webbeans.tck.tests.definition.name; + +import java.lang.annotation.Annotation; +import java.util.List; + +import javax.webbeans.DefinitionException; +import javax.webbeans.manager.Bean; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + +@SpecVersion("20081206") +public class NameTest extends AbstractTest +{ + + @Override + protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() + { + List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes(); + deploymentTypes.add(AnotherDeploymentType.class); + return deploymentTypes; + } + + @Test(groups="stub", expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.6") + public void testInvalidElIdentifierUsedAsWebBeanName() + { + assert false; + } + + @Test @SpecAssertion(section="2.6.1") + public void testNonDefaultNamed() + { + Bean<Moose> moose = getSimpleBean(Moose.class); + assert moose.getName().equals("aMoose"); + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.6.2") + public void testNonDefaultXmlNamed() + { + /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(Named.class, new NamedAnnotationLiteral(){ + + public String value() + { + return "aTrout"; + } + + }); + AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations);*/ + //SimpleBean<SeaBass> trout = createSimpleBean(SeaBass.class, annotatedItem, manager); + + //assert trout.getName().equals("aTrout"); + assert false; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.6.2") + public void testXmlNamedOverridesJavaNamed() + { + /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(Named.class, new NamedAnnotationLiteral(){ + + public String value() + { + return "aTrout"; + } + + }); + AnnotatedClass<Cod> annotatedItem = new SimpleAnnotatedClass<Cod>(Cod.class, annotations);*/ + //SimpleBean<Cod> cod = createSimpleBean(Cod.class, annotatedItem, manager); + + //assert cod.getName().equals("aTrout"); + assert false; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section={"2.6.2", "2.6.3"}) + public void testJavaNamedUsedWhenNoXmlSpecified() + { + //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + //AnnotatedClass<Cod> annotatedItem = new SimpleAnnotatedClass<Cod>(Cod.class, annotations); + //SimpleBean<Cod> cod = createSimpleBean(Cod.class, annotatedItem, manager); + + //assert cod.getName().equals("whitefish"); + assert false; + } + + @Test @SpecAssertion(section={"2.6.3", "3.2.7"}) + public void testDefaultNamed() + { + Bean<Haddock> haddock = getSimpleBean(Haddock.class); + assert haddock.getName() != null; + assert haddock.getName().equals("haddock"); + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.6.3") + public void testDefaultXmlNamed() + { + /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(Named.class, new NamedAnnotationLiteral() { + + public String value() + { + return ""; + } + + }); + AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations);*/ + //SimpleBean<SeaBass> trout = createSimpleBean(SeaBass.class, annotatedItem, manager); + + //assert trout.getName() != null; + //assert trout.getName().equals("seaBass"); + assert false; + } + + @Test @SpecAssertion(section={"2.6.3", "2.7"}) + public void testSterotypeDefaultsName() + { + Bean<RedSnapper> model = getSimpleBean(RedSnapper.class); + assert model.getName().equals("redSnapper"); + } + + @Test @SpecAssertion(section="2.6.4") + public void testNotNamedInJava() + { + Bean<SeaBass> model = getSimpleBean(SeaBass.class); + assert model.getName() == null; + } + + @Test @SpecAssertion(section="2.6.4") + public void testNotNamedInXml() + { + Bean<SeaBass> model = getSimpleBean(SeaBass.class); + assert model.getName() == null; + } + + @Test @SpecAssertion(section="2.6.4") + public void testNotNamedInStereotype() + { + Bean<Minnow> model = getSimpleBean(Minnow.class); + assert model.getName() == null; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/TypeTest.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/TypeTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/TypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/TypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.tck.tests.definition.type; + +import javax.webbeans.manager.Bean; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + +public class TypeTest extends AbstractTest +{ + + @Test @SpecAssertion(section="2.6.3") + public void testDefaultNamed() + { + Bean<Haddock> haddock = getSimpleBean(Haddock.class); + assert haddock.getName() != null; + assert haddock.getName().equals("haddock"); + } + +} +

17 years, 3 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r988 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-15 13:57:28 -0500 (Thu, 15 Jan 2009) New Revision: 988 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java Log: fix bug in reflections Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-01-15 18:08:24 UTC (rev 987) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-01-15 18:57:28 UTC (rev 988) @@ -433,6 +433,7 @@ { try { + method.setAccessible(true); return method.invoke(instance, parameters); } catch (IllegalArgumentException e)

17 years, 3 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r987 - tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-15 13:08:24 -0500 (Thu, 15 Jan 2009) New Revision: 987 Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java Log: Need to generify Contexts() Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java 2009-01-15 17:36:59 UTC (rev 986) +++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java 2009-01-15 18:08:24 UTC (rev 987) @@ -1,5 +1,7 @@ package org.jboss.webbeans.tck.api; +import javax.webbeans.manager.Context; + public class TCKConfiguration { @@ -37,9 +39,10 @@ return beans; } - public Contexts<?> getContexts() + @SuppressWarnings("unchecked") + public <T extends Context> Contexts<T> getContexts() { - return contexts; + return (Contexts<T>) contexts; } public Managers getManagers()

17 years, 3 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r986 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-15 12:36:59 -0500 (Thu, 15 Jan 2009) New Revision: 986 Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/BindingTypeTest.java Log: Fix naming Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/BindingTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/BindingTypeTest.java 2009-01-15 17:30:08 UTC (rev 985) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/BindingTypeTest.java 2009-01-15 17:36:59 UTC (rev 986) @@ -28,7 +28,7 @@ { @Test @SpecAssertion(section={"2.3.3", "2.3.1"}) - public void testDefaultBindingTypeDeclaredInJava() + public void testDefaultBindingDeclaredInJava() { Bean<Order> order = getSimpleBean(Order.class); assert order.getBindings().size() == 1; @@ -36,26 +36,26 @@ } @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") - public void testBindingTypeHasCorrectTarget() + public void testBindingHasCorrectTarget() { assert false; } @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") - public void testBindingTypeHasCorrectRetention() + public void testBindingHasCorrectRetention() { assert false; } @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") - public void testBindingTypeDeclaresBindingTypeAnnotation() + public void testBindingDeclaresBindingAnnotation() { assert false; } @SuppressWarnings("unchecked") @Test @SpecAssertion(section="2.3.3") - public void testBindingTypesDeclaredInJava() + public void testBindingsDeclaredInJava() { Bean<Cat> cat = getSimpleBean(Cat.class); assert cat.getBindings().size() == 1; @@ -63,14 +63,14 @@ } @Test @SpecAssertion(section="2.3.3") - public void testMultipleBindingTypes() + public void testMultipleBindings() { Bean<?> model = getSimpleBean(Cod.class); assert model.getBindings().size() == 2; } @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") - public void testBindingTypesDeclaredInXml() + public void testBindingsDeclaredInXml() { //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); @@ -82,7 +82,7 @@ } @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") - public void testXmlBindingTypeOverridesAndIgnoresJava() + public void testXmlBindingOverridesAndIgnoresJava() { //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); @@ -95,7 +95,7 @@ } @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") - public void testNoBindingTypesDeclaredInXml() + public void testNoBindingsDeclaredInXml() { //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); //AnnotatedClass<Cat> annotatedItem = new SimpleAnnotatedClass<Cat>(Cat.class, annotations); @@ -107,7 +107,7 @@ } @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section={"2.3.4", "2.3.1"}) - public void testDefaultBindingTypeDeclaredInXml() + public void testDefaultBindingDeclaredInXml() { Bean<?> model = getSimpleBean(Tuna.class); assert model.getBindings().size() == 1; @@ -128,13 +128,13 @@ } @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.5") - public void testFieldWithBindingTypeInXml() + public void testFieldWithBindingInXml() { assert false; } @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.5") - public void testFieldWithBindingTypeInXmlIgnoresAnnotations() + public void testFieldWithBindingInXmlIgnoresAnnotations() { assert false; }

17 years, 3 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r985 - in ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test: resource and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-15 12:30:08 -0500 (Thu, 15 Jan 2009) New Revision: 985 Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/resource/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/resource/ResourceInjectionTest.java Log: Basic stubs for JEE resource injection Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/resource/ResourceInjectionTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/resource/ResourceInjectionTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/resource/ResourceInjectionTest.java 2009-01-15 17:30:08 UTC (rev 985) @@ -0,0 +1,28 @@ +package org.jboss.webbeans.test.resource; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.test.AbstractEjbEmbeddableTest; +import org.testng.annotations.Test; + +public class ResourceInjectionTest extends AbstractEjbEmbeddableTest +{ + + @Test(groups="stub") @SpecAssertion(section="3.10") + public void testInjectionOfPersistenceContext() + { + assert false; + } + + @Test(groups="stub") @SpecAssertion(section="3.10") + public void testInjectionOfResource() + { + assert false; + } + + @Test(groups="stub") @SpecAssertion(section="3.10") + public void testInjectionOfEJB() + { + assert false; + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/resource/ResourceInjectionTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain

17 years, 3 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r984 - in ri/trunk: webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap and 5 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-15 11:22:44 -0500 (Thu, 15 Jan 2009) New Revision: 984 Added: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/EjbDiscovery.java ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/ForwardingEjbDiscovery.java ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/ForwardingEjbResolver.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDiscovery.java Modified: ri/trunk/jboss-as/build.xml ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/WebBeanDiscovery.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java Log: split out ejb discovery from bean discovery, restructure bootstrap to be a bit nicer Modified: ri/trunk/jboss-as/build.xml =================================================================== --- ri/trunk/jboss-as/build.xml 2009-01-15 15:23:12 UTC (rev 983) +++ ri/trunk/jboss-as/build.xml 2009-01-15 16:22:44 UTC (rev 984) @@ -60,9 +60,10 @@ <copy todir="${jboss.home}/server/default/deployers/webbeans.deployer/lib-int"> <fileset dir="target/webbeans.deployer"> <include name="webbeans-ri.jar" /> - <include name="webbeans-ri-int-jbossas.jar" /> - <include name="webbeans-api.jar" /> - <include name="webbeans-ri-spi.jar" /> + <include name="webbeans-ri-int-jbossas.jar" /> + <include name="webbeans-ri-int-jboss-ejb.jar" /> + <include name="webbeans-api.jar" /> + <include name="webbeans-ri-spi.jar" /> </fileset> </copy> Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-15 15:23:12 UTC (rev 983) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-15 16:22:44 UTC (rev 984) @@ -48,8 +48,9 @@ import org.jboss.webbeans.bean.ProducerFieldBean; import org.jboss.webbeans.bean.ProducerMethodBean; import org.jboss.webbeans.bean.SimpleBean; +import org.jboss.webbeans.binding.DeployedBinding; import org.jboss.webbeans.binding.InitializedBinding; -import org.jboss.webbeans.binding.DeployedBinding; +import org.jboss.webbeans.bootstrap.spi.EjbDiscovery; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; import org.jboss.webbeans.ejb.EJBApiAbstraction; import org.jboss.webbeans.ejb.spi.EjbResolver; @@ -130,6 +131,8 @@ } protected abstract WebBeanDiscovery getWebBeanDiscovery(); + + protected abstract EjbDiscovery getEjbDiscovery(); public abstract ResourceLoader getResourceLoader(); @@ -298,15 +301,14 @@ validateBootstrap(); // Must populate EJB cache first, as we need it to detect whether a // bean is an EJB! - getManager().getEjbDescriptorCache().addAll(getWebBeanDiscovery().discoverEjbs()); + getManager().getEjbDescriptorCache().addAll(getEjbDiscovery().discoverEjbs()); registerBeans(getWebBeanDiscovery().discoverWebBeanClasses()); getManager().fireEvent(getManager(), new InitializedBinding()); List<Bean<?>> beans = getManager().getBeans(); - log.info("Initialization completed. Validing " + beans.size() + " Web Beans"); + log.info("Web Beans initialized. Validating beans."); getManager().getResolver().resolveInjectionPoints(); BeanValidation.validate(getManager().getBeans()); getManager().fireEvent(getManager(), new DeployedBinding()); - log.info("Deploy complete"); } } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java 2009-01-15 15:23:12 UTC (rev 983) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java 2009-01-15 16:22:44 UTC (rev 984) @@ -23,6 +23,7 @@ import org.jboss.webbeans.bootstrap.PropertiesBasedBootstrap; import org.jboss.webbeans.bootstrap.SimpleResourceLoader; +import org.jboss.webbeans.bootstrap.spi.EjbDiscovery; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; import org.jboss.webbeans.context.ApplicationContext; import org.jboss.webbeans.context.DependentContext; @@ -43,39 +44,29 @@ { // The resource loader - private ResourceLoader resourceLoader; + private final ResourceLoader resourceLoader; // The discover implementation - private WebBeanDiscovery webBeanDiscovery; + private final WebBeanDiscovery webBeanDiscovery; + + private final EjbDiscovery ejbDiscovery; + // The deployment properties - private DeploymentProperties deploymentProperties; + private final DeploymentProperties deploymentProperties; public ServletBootstrap(ServletContext servletContext) { // Create a simpple resource loader based for initial loading - this.resourceLoader = new SimpleResourceLoader(); - this.deploymentProperties = new DeploymentProperties(resourceLoader); + ResourceLoader temporaryResourceLoader = new SimpleResourceLoader(); + this.deploymentProperties = new DeploymentProperties(temporaryResourceLoader); - // Attempt to create a plugin resource loader - Constructor<? extends ResourceLoader> resourceLoaderConstructor = getClassConstructor(deploymentProperties, resourceLoader, ResourceLoader.PROPERTY_NAME, ResourceLoader.class, ServletContext.class); - if (resourceLoaderConstructor != null) - { - this.resourceLoader = newInstance(resourceLoaderConstructor, servletContext); - } + this.resourceLoader = createResourceLoader(servletContext, temporaryResourceLoader); // Now safe to initialize the manager initManager(servletContext); - // Attempt to create a plugin web beans discovery - Constructor<? extends WebBeanDiscovery> webBeanDiscoveryConstructor = getClassConstructor(deploymentProperties, resourceLoader, WebBeanDiscovery.PROPERTY_NAME, WebBeanDiscovery.class, ServletContext.class); - if (webBeanDiscoveryConstructor == null) - { - throw new IllegalStateException("Cannot load Web Bean discovery plugin! Check if Web Beans is properly installed into your container"); - } - else - { - this.webBeanDiscovery = newInstance(webBeanDiscoveryConstructor, servletContext); - } + this.webBeanDiscovery = createWebBeanDiscovery(servletContext); + this.ejbDiscovery = createEjbDiscovery(servletContext); // Register the contexts for the Servlet environment getManager().addContext(DependentContext.INSTANCE); @@ -87,10 +78,10 @@ private void initManager(ServletContext servletContext) { - initManager(getNaming(servletContext), getEjbResolver(servletContext), getResourceLoader()); + initManager(createNaming(servletContext), createEjbResolver(servletContext), getResourceLoader()); } - public Naming getNaming(ServletContext servletContext) + protected Naming createNaming(ServletContext servletContext) { Constructor<? extends Naming> namingConstructor = getClassConstructor(getDeploymentProperties(), getResourceLoader(), Naming.PROPERTY_NAME, Naming.class, ServletContext.class); if (namingConstructor != null) @@ -103,7 +94,7 @@ } } - public EjbResolver getEjbResolver(ServletContext servletContext) + protected EjbResolver createEjbResolver(ServletContext servletContext) { Constructor<? extends EjbResolver> constructor = getClassConstructor(getDeploymentProperties(), getResourceLoader(), EjbResolver.PROPERTY_NAME, EjbResolver.class, ServletContext.class); if (constructor != null) @@ -115,6 +106,47 @@ throw new IllegalStateException("Unable to find a EjbResolver, check Web Beans is correctly installed in your container"); } } + + protected EjbDiscovery createEjbDiscovery(ServletContext servletContext) + { + Constructor<? extends EjbDiscovery> constructor = getClassConstructor(getDeploymentProperties(), getResourceLoader(), EjbDiscovery.PROPERTY_NAME, EjbDiscovery.class, ServletContext.class); + if (constructor != null) + { + return newInstance(constructor, servletContext); + } + else + { + throw new IllegalStateException("Unable to find a EjbDiscovery, check Web Beans is correctly installed in your container"); + } + } + + protected WebBeanDiscovery createWebBeanDiscovery(ServletContext servletContext) + { + // Attempt to create a plugin web beans discovery + Constructor<? extends WebBeanDiscovery> webBeanDiscoveryConstructor = getClassConstructor(deploymentProperties, resourceLoader, WebBeanDiscovery.PROPERTY_NAME, WebBeanDiscovery.class, ServletContext.class); + if (webBeanDiscoveryConstructor == null) + { + throw new IllegalStateException("Cannot load Web Bean discovery plugin! Check if Web Beans is properly installed into your container"); + } + else + { + return newInstance(webBeanDiscoveryConstructor, servletContext); + } + } + + protected ResourceLoader createResourceLoader(ServletContext servletContext, ResourceLoader resourceLoader) + { + // Attempt to create a plugin resource loader + Constructor<? extends ResourceLoader> resourceLoaderConstructor = getClassConstructor(deploymentProperties, resourceLoader, ResourceLoader.PROPERTY_NAME, ResourceLoader.class, ServletContext.class); + if (resourceLoaderConstructor != null) + { + return newInstance(resourceLoaderConstructor, servletContext); + } + else + { + return resourceLoader; + } + } @Override protected DeploymentProperties getDeploymentProperties() @@ -133,5 +165,11 @@ { return webBeanDiscovery; } + + @Override + protected EjbDiscovery getEjbDiscovery() + { + return ejbDiscovery; + } } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java 2009-01-15 15:23:12 UTC (rev 983) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java 2009-01-15 16:22:44 UTC (rev 984) @@ -158,7 +158,7 @@ protected <T> void addToEjbCache(Class<T> clazz) { - manager.getEjbDescriptorCache().add(new MockEjbDescriptor<T>(clazz)); + manager.getEjbDescriptorCache().add(MockEjbDescriptor.of(clazz)); } protected byte[] serialize(Object instance) throws IOException Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java 2009-01-15 15:23:12 UTC (rev 983) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java 2009-01-15 16:22:44 UTC (rev 984) @@ -1,8 +1,6 @@ package org.jboss.webbeans.test; -import java.util.Arrays; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; @@ -232,7 +230,7 @@ @Test(groups="bootstrap") public void testDiscover() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(new HashSet<Class<?>>(Arrays.asList(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class)))); + webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class)); webBeansBootstrap.boot(); Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>(); @@ -266,7 +264,7 @@ public void testInitializedEvent() { assert !InitializedObserver.observered; - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(new HashSet<Class<?>>(Arrays.asList(InitializedObserver.class)))); + webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(InitializedObserver.class)); webBeansBootstrap.boot(); assert InitializedObserver.observered; @@ -275,14 +273,14 @@ @Test(groups="bootstrap") public void testRequestContextActiveDuringInitializtionEvent() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(new HashSet<Class<?>>(Arrays.asList(InitializedObserverWhichUsesRequestContext.class, Tuna.class)), null, new HashSet<Class<?>>())); + webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(InitializedObserverWhichUsesRequestContext.class, Tuna.class)); webBeansBootstrap.boot(); } @Test(groups={"bootstrap", "broken"}) public void testApplicationContextActiveDuringInitializtionEvent() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(new HashSet<Class<?>>(Arrays.asList(InitializedObserverWhichUsesApplicationContext.class, LadybirdSpider.class)), null, new HashSet<Class<?>>())); + webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(InitializedObserverWhichUsesApplicationContext.class, LadybirdSpider.class)); webBeansBootstrap.boot(); } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2009-01-15 15:23:12 UTC (rev 983) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2009-01-15 16:22:44 UTC (rev 984) @@ -1,9 +1,7 @@ package org.jboss.webbeans.test; import java.lang.annotation.Annotation; -import java.util.Arrays; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -85,7 +83,7 @@ @Test public void testClassesImplementingServletInterfacesNotDiscoveredAsSimpleBeans() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(new HashSet<Class<?>>(Arrays.asList(FilterBean.class, HttpSessionListenerBean.class, ServletBean.class, ServletContextListenerBean.class, ServletRequestListenerBean.class)), null, new HashSet<Class<?>>())); + webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(FilterBean.class, HttpSessionListenerBean.class, ServletBean.class, ServletContextListenerBean.class, ServletRequestListenerBean.class)); webBeansBootstrap.boot(); assert manager.getBeans().size() == BUILT_IN_BEANS; } @@ -93,7 +91,7 @@ @Test public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(new HashSet<Class<?>>(Arrays.asList(EnterpriseBeanWebBean.class)), null, new HashSet<Class<?>>())); + webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(EnterpriseBeanWebBean.class)); webBeansBootstrap.boot(); assert manager.getBeans().size() == BUILT_IN_BEANS; } @@ -101,7 +99,7 @@ @Test public void testClassExtendingUiComponentNotDiscoveredAsSimpleBean() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(new HashSet<Class<?>>(Arrays.asList(UIComponentBean.class)), null, new HashSet<Class<?>>())); + webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(UIComponentBean.class)); webBeansBootstrap.boot(); assert manager.getBeans().size() == BUILT_IN_BEANS; } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java 2009-01-15 15:23:12 UTC (rev 983) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java 2009-01-15 16:22:44 UTC (rev 984) @@ -16,6 +16,7 @@ import javax.webbeans.InjectionPoint; import org.jboss.webbeans.bootstrap.WebBeansBootstrap; +import org.jboss.webbeans.bootstrap.spi.EjbDiscovery; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; import org.jboss.webbeans.context.ApplicationContext; import org.jboss.webbeans.context.DependentContext; @@ -161,6 +162,7 @@ }; private WebBeanDiscovery webBeanDiscovery; + private EjbDiscovery ejbDiscovery; private ResourceLoader resourceLoader; private MockNaming mockNaming; @@ -189,6 +191,10 @@ public void setWebBeanDiscovery(WebBeanDiscovery webBeanDiscovery) { this.webBeanDiscovery = webBeanDiscovery; + if (webBeanDiscovery != null) + { + this.ejbDiscovery = new MockEjbDiscovery(webBeanDiscovery.discoverWebBeanClasses()); + } } @Override @@ -207,5 +213,11 @@ { return mockNaming; } + + @Override + protected EjbDiscovery getEjbDiscovery() + { + return ejbDiscovery; + } } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java 2009-01-15 15:23:12 UTC (rev 983) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java 2009-01-15 16:22:44 UTC (rev 984) @@ -21,8 +21,13 @@ private final String ejbName; private final List<BusinessInterfaceDescriptor<?>> localInterfaces; private final HashSet<Method> removeMethods; + + public static <T> MockEjbDescriptor<T> of(Class<T> type) + { + return new MockEjbDescriptor<T>(type); + } - public MockEjbDescriptor(final Class<T> type) + private MockEjbDescriptor(final Class<T> type) { this.type = type; this.ejbName = type.getSimpleName(); Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDiscovery.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDiscovery.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDiscovery.java 2009-01-15 16:22:44 UTC (rev 984) @@ -0,0 +1,48 @@ +package org.jboss.webbeans.test.mock; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.ejb.MessageDriven; +import javax.ejb.Stateful; +import javax.ejb.Stateless; + +import org.jboss.webbeans.bootstrap.spi.EjbDiscovery; +import org.jboss.webbeans.ejb.spi.EjbDescriptor; + +public class MockEjbDiscovery implements EjbDiscovery +{ + + private final List<EjbDescriptor<?>> ejbs; + + public MockEjbDiscovery(Iterable<Class<?>> allClasses) + { + + this.ejbs = new ArrayList<EjbDescriptor<?>>(); + for (Class<?> ejbClass : discoverEjbs(allClasses)) + { + this.ejbs.add(MockEjbDescriptor.of(ejbClass)); + } + } + + public Iterable<EjbDescriptor<?>> discoverEjbs() + { + return ejbs; + } + + protected static Iterable<Class<?>> discoverEjbs(Iterable<Class<?>> webBeanClasses) + { + Set<Class<?>> ejbs = new HashSet<Class<?>>(); + for (Class<?> clazz : webBeanClasses) + { + if (clazz.isAnnotationPresent(Stateless.class) || clazz.isAnnotationPresent(Stateful.class) || clazz.isAnnotationPresent(MessageDriven.class)) + { + ejbs.add(clazz); + } + } + return ejbs; + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDiscovery.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java 2009-01-15 15:23:12 UTC (rev 983) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java 2009-01-15 16:22:44 UTC (rev 984) @@ -1,18 +1,10 @@ package org.jboss.webbeans.test.mock; import java.net.URL; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; -import java.util.List; -import java.util.Set; -import javax.ejb.MessageDriven; -import javax.ejb.Stateful; -import javax.ejb.Stateless; - import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; -import org.jboss.webbeans.ejb.spi.EjbDescriptor; public class MockWebBeanDiscovery implements WebBeanDiscovery { @@ -21,33 +13,20 @@ private Iterable<URL> webBeansXmlFiles = new HashSet<URL>(); - private List<EjbDescriptor<?>> ejbs = new ArrayList<EjbDescriptor<?>>(); - /** * Simple constructor that auto discovers EJBs * @param webBeanClasses */ public MockWebBeanDiscovery(Class<?>... webBeanClasses) { - this(Arrays.asList(webBeanClasses)); + this(Arrays.asList(webBeanClasses), null); } - public MockWebBeanDiscovery(Iterable<Class<?>> webBeanClasses) + public MockWebBeanDiscovery(Iterable<Class<?>> webBeanClasses, Iterable<URL> webBeansXmlFiles) { - this(webBeanClasses, null, discoverEjbs(webBeanClasses)); - } - - @SuppressWarnings("unchecked") - public MockWebBeanDiscovery(Iterable<Class<?>> webBeanClasses, Iterable<URL> webBeansXmlFiles, Iterable<Class<?>> ejbs) - { super(); this.webBeanClasses = webBeanClasses; this.webBeansXmlFiles = webBeansXmlFiles; - this.ejbs = new ArrayList<EjbDescriptor<?>>(); - for (Class<?> ejbClass : ejbs) - { - this.ejbs.add(new MockEjbDescriptor(ejbClass)); - } } public Iterable<Class<?>> discoverWebBeanClasses() @@ -55,27 +34,9 @@ return webBeanClasses; } - public Iterable<EjbDescriptor<?>> discoverEjbs() - { - return ejbs; - } - public Iterable<URL> discoverWebBeansXml() { return webBeansXmlFiles; } - - protected static Iterable<Class<?>> discoverEjbs(Iterable<Class<?>> webBeanClasses) - { - Set<Class<?>> ejbs = new HashSet<Class<?>>(); - for (Class<?> clazz : webBeanClasses) - { - if (clazz.isAnnotationPresent(Stateless.class) || clazz.isAnnotationPresent(Stateful.class) || clazz.isAnnotationPresent(MessageDriven.class)) - { - ejbs.add(clazz); - } - } - return ejbs; - } } Added: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/EjbDiscovery.java =================================================================== --- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/EjbDiscovery.java (rev 0) +++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/EjbDiscovery.java 2009-01-15 16:22:44 UTC (rev 984) @@ -0,0 +1,42 @@ +/* + * 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.webbeans.bootstrap.spi; + +import org.jboss.webbeans.ejb.spi.EjbDescriptor; + + + +/** + * A container should implement this interface to allow the Web Beans RI to + * discover the EJBs the application contains + * + * @author Pete Muir + * + */ +public interface EjbDiscovery +{ + public static final String PROPERTY_NAME = EjbDiscovery.class.getName(); + + /** + * Gets a descriptor for each EJB in the application + * + * @return The bean class to descriptor map + */ + public Iterable<EjbDescriptor<?>> discoverEjbs(); + +} Property changes on: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/EjbDiscovery.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/ForwardingEjbDiscovery.java =================================================================== --- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/ForwardingEjbDiscovery.java (rev 0) +++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/ForwardingEjbDiscovery.java 2009-01-15 16:22:44 UTC (rev 984) @@ -0,0 +1,15 @@ +package org.jboss.webbeans.bootstrap.spi; + +import org.jboss.webbeans.ejb.spi.EjbDescriptor; + +public abstract class ForwardingEjbDiscovery implements EjbDiscovery +{ + + protected abstract EjbDiscovery delegate(); + + public Iterable<EjbDescriptor<?>> discoverEjbs() + { + return delegate().discoverEjbs(); + } + +} Property changes on: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/ForwardingEjbDiscovery.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/WebBeanDiscovery.java =================================================================== --- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/WebBeanDiscovery.java 2009-01-15 15:23:12 UTC (rev 983) +++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/WebBeanDiscovery.java 2009-01-15 16:22:44 UTC (rev 984) @@ -19,8 +19,6 @@ import java.net.URL; -import org.jboss.webbeans.ejb.spi.EjbDescriptor; - /** * A container should implement this interface to allow the Web Beans RI to * discover the Web Beans to deploy @@ -46,11 +44,4 @@ */ public Iterable<URL> discoverWebBeansXml(); - /** - * Gets a descriptor for each EJB in the application - * - * @return The bean class to descriptor map - */ - public Iterable<EjbDescriptor<?>> discoverEjbs(); - } Added: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/ForwardingEjbResolver.java =================================================================== --- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/ForwardingEjbResolver.java (rev 0) +++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/ForwardingEjbResolver.java 2009-01-15 16:22:44 UTC (rev 984) @@ -0,0 +1,44 @@ +package org.jboss.webbeans.ejb.spi; + +import java.lang.annotation.Annotation; + +import javax.webbeans.InjectionPoint; + +import org.jboss.webbeans.resources.spi.Naming; + +public abstract class ForwardingEjbResolver implements EjbResolver +{ + + public abstract EjbResolver delegate(); + + public Class<? extends Annotation> getEJBAnnotation() + { + return delegate().getEJBAnnotation(); + } + + public Class<? extends Annotation> getPersistenceContextAnnotation() + { + return delegate().getPersistenceContextAnnotation(); + } + + public Class<? extends Annotation> getResourceAnnotation() + { + return delegate().getResourceAnnotation(); + } + + public Object resolveEjb(InjectionPoint injectionPoint, Naming naming) + { + return delegate().resolveEjb(injectionPoint, naming); + } + + public Object resolvePersistenceContext(InjectionPoint injectionPoint, Naming naming) + { + return delegate().resolvePersistenceContext(injectionPoint, naming); + } + + public Object resolveResource(InjectionPoint injectionPoint, Naming naming) + { + return delegate().resolveResource(injectionPoint, naming); + } + +} Property changes on: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/ForwardingEjbResolver.java ___________________________________________________________________ Name: svn:mime-type + text/plain

17 years, 3 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r983 - ri/trunk/webbeans-ri/src/test/resources.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-15 10:23:12 -0500 (Thu, 15 Jan 2009) New Revision: 983 Modified: ri/trunk/webbeans-ri/src/test/resources/log4j.xml Log: clean up log levels Modified: ri/trunk/webbeans-ri/src/test/resources/log4j.xml =================================================================== --- ri/trunk/webbeans-ri/src/test/resources/log4j.xml 2009-01-15 15:14:49 UTC (rev 982) +++ ri/trunk/webbeans-ri/src/test/resources/log4j.xml 2009-01-15 15:23:12 UTC (rev 983) @@ -13,7 +13,7 @@  <category name="org.jboss"> - <priority value="INFO"/> + <priority value="WARN"/> </category> <category name="com.arjuna"> <priority value="ERROR"/> @@ -45,7 +45,7 @@  <category name="org.jboss.webbeans"> - <priority value="INFO"/> + <priority value="WARN"/> </category> <root>

17 years, 3 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits January 2009