[webbeans-commits] Webbeans SVN: r2920 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: definition/deployment and 11 other directories.

Author: pete.muir(a)jboss.org Date: 2009-06-28 13:38:18 -0400 (Sun, 28 Jun 2009) New Revision: 2920 Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java Log: Cleanup stereotype tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -11,7 +11,7 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -10,7 +10,7 @@ import javax.enterprise.inject.Named; import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE }) @Retention(RUNTIME) @ApplicationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -10,7 +10,7 @@ import javax.enterprise.inject.Named; import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE }) @Retention(RUNTIME) @ApplicationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -8,7 +8,7 @@ import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE }) @Retention(RUNTIME) @HornedAnimalDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -8,7 +8,7 @@ import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE }) @Retention(RUNTIME) @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -8,7 +8,7 @@ import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE }) @Retention(RUNTIME) @HornedAnimalDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -10,7 +10,7 @@ import javax.enterprise.inject.Named; import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE }) @Retention(RUNTIME) @ApplicationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -11,7 +11,7 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -10,7 +10,7 @@ import javax.enterprise.inject.Named; import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE }) @Retention(RUNTIME) @ApplicationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -9,7 +9,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE }) @Retention(RUNTIME) @ApplicationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -12,7 +12,7 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -10,7 +10,7 @@ import javax.enterprise.inject.stereotype.Stereotype; @ApplicationScoped -(a)Stereotype(supportedScopes=ApplicationScoped.class) +@Stereotype @Target( { TYPE }) @Retention(RUNTIME) @HornedAnimalDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -8,7 +8,7 @@ import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE }) @Retention(RUNTIME) @HornedAnimalDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -12,7 +12,7 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -37,7 +37,7 @@ * @author David Allen * */ -(a)Stereotype(requiredTypes=Spider.class) +@Stereotype @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -37,7 +37,7 @@ * @author David Allen * */ -(a)Stereotype(requiredTypes=Spider.class) +@Stereotype @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -11,7 +11,7 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -10,7 +10,7 @@ import javax.enterprise.inject.Named; import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE }) @Retention(RUNTIME) @ApplicationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -6,10 +6,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class) +@Stereotype @Target( { TYPE }) @Retention(RUNTIME) @interface RequestScopedAnimalStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920) @@ -11,7 +11,7 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.stereotype.Stereotype; -(a)Stereotype(requiredTypes=Animal.class) +@Stereotype @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @RequestScoped