[webbeans-commits] Webbeans SVN: r3096 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/context/passivating and 45 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Mon Jul 20 20:06:40 EDT 2009


Author: shane.bryzak at jboss.com
Date: 2009-07-20 20:06:37 -0400 (Mon, 20 Jul 2009)
New Revision: 3096

Removed:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyDeploymentTypes/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java
Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.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/NonStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DisabledBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/InfertileChicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LameInfertileChicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/InfertileChicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/Tractor_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/Donkey_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/FarmYard_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/ShoeShop_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/FurnitureShop_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Bookshop_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/PictureShop_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java
   tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
removed deployment types

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.context.dependent;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,10 +3,8 @@
 import javax.annotation.PreDestroy;
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class OtherSpiderProducer
 {
-   
    private static boolean destroyed = false;
    
    @Produces @Tame public Tarantula produceTarantula = new Tarantula();

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -7,7 +7,6 @@
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.spi.BeanManager;
 
- at AnotherDeploymentType
 class SpiderProducer
 {
    @Current

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.context.passivating;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class CityProducer
 {
    @Produces @Dependent public Violation reference = new Violation();

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class CityProducer2
 {
    @Produces @Dependent @Big

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -7,7 +7,6 @@
 import javax.enterprise.inject.Produces;
 
 @ApplicationScoped
- at AnotherDeploymentType
 class Generator implements Serializable 
 {
    

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -61,18 +61,6 @@
       assert getBeans(RedSnapper.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }
    
-   @Test(groups = "rewrite")
-   @SpecAssertions({
-      @SpecAssertion(section = "2", id = "d"),
-      @SpecAssertion(section = "3.1.3", id = "bc"),
-      @SpecAssertion(section = "11.1", id = "ba")
-   })
-   public void testHasDeploymentType()
-   {
-      assert getBeans(RedSnapper.class).size() == 1;
-      assert getBeans(RedSnapper.class).iterator().next().getDeploymentType().equals(Production.class);
-   }
-   
    @Test(groups = "producerMethod")
    @SpecAssertions({
       @SpecAssertion(section = "2.2.1", id = "j"),

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.context.RequestScoped;
 
- at AnotherDeploymentType
 @RequestScoped
 class Tuna
 {

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.definition.stereotype;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -13,7 +13,6 @@
 @Stereotype
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)
- at AnotherDeploymentType
 @interface AnotherStereotype
 {
 

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-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -13,7 +13,6 @@
 @Stereotype
 @Target( { TYPE })
 @Retention(RUNTIME)
- at HornedAnimalDeploymentType
 @interface ApplicationScopedHornedMammalStereotype
 {
 

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.definition.stereotype;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface 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-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -11,7 +11,6 @@
 @Stereotype
 @Target( { TYPE })
 @Retention(RUNTIME)
- at HornedAnimalDeploymentType
 @interface HornedMammalStereotype
 {
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/NonStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/NonStereotype.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/NonStereotype.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -8,7 +8,6 @@
 
 @Target( { TYPE })
 @Retention(RUNTIME)
- at HornedAnimalDeploymentType
 @interface NonStereotype
 {
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -26,12 +26,13 @@
 {
    private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {};
 
-   @Test(groups = { "annotationDefinition" })
+   @Test(groups = { "annotationDefinition", "stub" })
    @SpecAssertion(section = "2.7.1", id = "b")
    public void testHasStereotypeAnnotation()
    {
-      Bean<Goat> bean = getBeans(Goat.class).iterator().next();
-      assert !bean.getDeploymentType().equals(HornedAnimalDeploymentType.class);
+	   assert false;
+      //Bean<Goat> bean = getBeans(Goat.class).iterator().next();
+      //assert !bean.getDeploymentType().equals(HornedAnimalDeploymentType.class);
    }
 
    @Test
@@ -67,7 +68,6 @@
       assert highlandCow.getName() == null;
       assert highlandCow.getBindings().contains(TAME_LITERAL);
       assert highlandCow.getScopeType().equals(RequestScoped.class);
-      assert highlandCow.getDeploymentType().equals(HornedAnimalDeploymentType.class);
    }
 
    @Test

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.deployment.lifecycle;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DisabledBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DisabledBean.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DisabledBean.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,6 +1,5 @@
 package org.jboss.jsr299.tck.tests.deployment.lifecycle;
 
- at AnotherDeploymentType
 class DisabledBean
 {
 

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.event;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.event;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface DisabledDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.event.Observes;
 
- at DisabledDeploymentType
 class DisabledStringObserver
 {
    public void disabledObserver(@Observes String event)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,7 @@
 
 import javax.enterprise.inject.Specializes;
 
- at Specializes @AnotherDeploymentType
+ at Specializes
 class FarmShop extends Shop
 {
    

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class SpiderProducer
 {
    private static boolean tameSpiderDestroyed = false;

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,19 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
 import javax.enterprise.inject.Initializer;
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class SpiderProducer_Broken
 {
 

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.multiParams;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class SpiderProducer_Broken
 {
    @Produces

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.observesUnallowed;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/SpiderProducer_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/SpiderProducer_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class SpiderProducer_Broken
 {
 

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class SpiderProducer_Broken
 {
    @Produces

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class SpiderProducer_Broken
 {
 

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.definition;
-
-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.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD, FIELD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -111,20 +111,12 @@
       assert monkeyBean.getName().equals("Monkey");
    }
 
-   @Test(groups = "enterpriseBeans")
-   @SpecAssertion(section = "3.2.3", id = "bc")
-   public void testBeanWithDeploymentType()
-   {
-      Bean<MonkeyLocal> monkeyBean = getBeans(MonkeyLocal.class).iterator().next();
-      assert monkeyBean.getDeploymentType().equals(AnotherDeploymentType.class);
-   }
 
    @Test(groups = "enterpriseBeans")
    @SpecAssertion(section = "3.2.3", id = "bd")
    public void testBeanWithStereotype()
    {
       Bean<PolarBearLocal> polarBearBean = getBeans(PolarBearLocal.class).iterator().next();
-      assert polarBearBean.getDeploymentType().equals(AnotherDeploymentType.class);
       assert polarBearBean.getScopeType().equals(RequestScoped.class);
       assert polarBearBean.getName().equals("polarBear");
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,7 +5,6 @@
 
 @Stateless
 @Named("Monkey")
- at AnotherDeploymentType
 class Monkey implements MonkeyLocal
 {
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -15,7 +15,6 @@
 @Stereotype
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)
- at AnotherDeploymentType
 @RequestScoped
 @Named
 @interface Polar

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
-
-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.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD, FIELD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/InfertileChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/InfertileChicken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/InfertileChicken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,7 +1,5 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
 
-
- at AnotherDeploymentType
 class InfertileChicken extends Chicken
 {
    

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LameInfertileChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LameInfertileChicken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LameInfertileChicken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,6 +1,5 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
 
- at AnotherDeploymentType
 class LameInfertileChicken extends InfertileChicken
 {
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.inject.Named;
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class OtherSpiderProducer
 {
    

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -35,7 +35,6 @@
    {
       Set<Bean<Tarantula>> tarantulaBeans = getBeans(Tarantula.class);
       assert tarantulaBeans.size() == 1;
-      assert tarantulaBeans.iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
    }
 
    @Test(groups = "producerField")
@@ -165,7 +164,6 @@
       Set<Bean<Tarantula>> tarantulaBeans = getBeans(Tarantula.class, TAME_LITERAL, FOO_LITERAL);
       assert !tarantulaBeans.isEmpty();
       Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next();
-      assert tarantulaModel.getDeploymentType().equals(Production.class);
    }
 
    @Test(groups = "producerField")
@@ -209,7 +207,6 @@
       assert !tarantulaBeans.isEmpty();
       Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next();
       assert tarantulaModel.getScopeType().equals(RequestScoped.class);
-      assert tarantulaModel.getDeploymentType().equals(Production.class);
    }
 
    @Test(groups = "producerField")

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,8 +2,6 @@
 
 import javax.enterprise.inject.Produces;
 
-
- at AnotherDeploymentType
 class SpiderAsAnimalProducer
 {
    @Produces @AsAnimal

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -19,8 +19,6 @@
 
 import javax.enterprise.inject.Produces;
 
-
- at AnotherDeploymentType
 class StaticTarantulaProducer
 {
    @Produces @SpiderStereotype @Static public static Tarantula produceTarantula = new Tarantula();

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,8 +4,6 @@
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.deployment.Production;
 
-
- at AnotherDeploymentType
 class TameTarantulaProducer
 {
    @Produces @Foo @Tame @RequestScoped @Production public Tarantula produceTarantula = new DefangedTarantula();

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class TarantulaProducer
 {
    @Produces public Tarantula produceTarantula = new Tarantula();

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.enterprise;
-
-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.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD, FIELD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/InfertileChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/InfertileChicken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/InfertileChicken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,6 +1,5 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.enterprise;
 
- at AnotherDeploymentType
 public class InfertileChicken extends Chicken implements InfertileChickenLocal
 {
    

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
-
-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.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD, FIELD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.inject.Named;
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 public class BlackWidowProducer
 {
    public static BlackWidow blackWidow = new BlackWidow();

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
-
-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.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD, FIELD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface HighestDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -27,7 +27,6 @@
  * @author David Allen
  *
  */
- at AnotherDeploymentType
 public class NullSpiderProducer
 {
    @Produces @Named("blackWidow") @Null @Working public BlackWidow produceBlackWidow = null;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -28,7 +28,6 @@
  * @author David Allen
  *
  */
- at AnotherDeploymentType
 public class NullSpiderProducer_Broken
 {
    @Produces @RequestScoped @Named("blackWidow") @Null @Broken public BlackWidow produceBlackWidow = null;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -28,7 +28,6 @@
  *
  */
 @Specializes
- at HighestDeploymentType
 public class SpecializedTarantulaProducer extends TarantulaProducer
 {
    @Produces public Tarantula produceTarantula = new DefangedTarantula();

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 public class TarantulaProducer
 {
    @Produces public Tarantula produceTarantula = new Tarantula();

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.inject.Specializes;
 
 @Specializes
- at AnotherDeploymentType
 class AndalusianChicken extends Chicken
 {
 

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class OakTree
 {
    @Produces @Dependent public Acorn growAcorn()

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -33,17 +33,6 @@
 
    @Test(groups = "producerMethod")
    @SpecAssertions( { 
-      @SpecAssertion(section = "review", id = "review"),
-      @SpecAssertion(section = "3.3.3", id = "c")
-   } )
-   public void testProducerMethodInheritsDeploymentTypeOfDeclaringWebBean() throws Exception
-   {
-      assert getBeans(Tarantula.class, TAME_LITERAL).size() == 1;
-      assert getBeans(Tarantula.class, TAME_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
-   }
-
-   @Test(groups = "producerMethod")
-   @SpecAssertions( { 
       @SpecAssertion(section = "3.3", id = "b"),
       @SpecAssertion(section = "7.3.4", id = "a")
    } )
@@ -187,7 +176,6 @@
    {
       assert getBeans(LadybirdSpider.class).size() == 1;
       Bean<LadybirdSpider> ladybirdSpider = getBeans(LadybirdSpider.class).iterator().next();
-      assert ladybirdSpider.getDeploymentType().equals(SpiderDeploymentType.class);
    }
 
    @Test(groups = "producerMethod")

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface SpiderDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,7 +5,6 @@
 import javax.enterprise.inject.Named;
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class SpiderProducer
 {
    
@@ -58,7 +57,7 @@
       return new DaddyLongLegs();
    }
 
-   @Produces @Named @SpiderDeploymentType public LadybirdSpider getLadybirdSpider()
+   @Produces @Named public LadybirdSpider getLadybirdSpider()
    {
       return new LadybirdSpider();
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.ejb.Stateful;
 import javax.enterprise.inject.Specializes;
 
- at AnotherDeploymentType
 @Stateful
 @Specializes
 public class AndalusianChicken extends Chicken implements AndalusianChickenLocal

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.inject.Specializes;
 
 @Specializes
- at AnotherDeploymentType
 class AndalusianChicken extends Chicken
 {
    public static Egg egg = new Egg();

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.inject.Produces;
 
- at PoultryFarmDeploymentType
 class Chicken
 {
    private static Egg egg = new Egg();

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class Lays
 {
    @Produces @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class LorryProducer_Broken
 {
    

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface PoultryFarmDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class ShipProducer_Broken
 {
    

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,7 +5,6 @@
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.spi.BeanManager;
 
- at AnotherDeploymentType
 class SpiderProducer
 {
    private static boolean tarantulaCreated;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class SpiderProducer_Broken
 {
 

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.inject.Specializes;
 
 @Specializes
- at AnotherDeploymentType
 class MountainLion extends Lion
 {
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.context.RequestScoped;
 
- at AnotherDeploymentType
 @RequestScoped
 class Tuna
 {

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,7 +5,6 @@
 
 
 @Specializes @Lazy
- at AnotherDeploymentType
 @Stateful
 public class LazyFarmer extends Farmer implements LazyFarmerLocal, FarmerLocal
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,9 +3,6 @@
 import javax.ejb.Stateful;
 import javax.enterprise.inject.Specializes;
 
-
-
- at AnotherDeploymentType
 @Stateful
 @Specializes
 public class Office extends Building implements OfficeLocal

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsSimpleBean;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/Tractor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/Tractor_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/Tractor_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
 import javax.enterprise.inject.Specializes;
 
 @Specializes
- at AnotherDeploymentType
 @Stateful
 class Tractor_Broken extends FarmEquipment implements TractorLocal
 {

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.implementInterfaceAndExtendsNothing;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/Donkey_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/Donkey_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/Donkey_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
 import javax.enterprise.inject.Specializes;
 
 @Specializes
- at AnotherDeploymentType
 @Stateful
 class Donkey_Broken implements Animal
 {

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.sameName;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/FarmYard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/FarmYard_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/FarmYard_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,7 +5,6 @@
 import javax.enterprise.inject.Specializes;
 
 @Specializes
- at AnotherDeploymentType
 @Stateful
 @Named
 class FarmYard_Broken extends Yard

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,19 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
 import javax.enterprise.inject.Specializes;
 
 @Specializes
- at AnotherDeploymentType
 @Stateful
 class FishFarmer_Broken extends Farmer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
 import javax.enterprise.inject.Specializes;
 
 @Specializes
- at AnotherDeploymentType
 @Stateful
 class SheepFarmer_Broken extends Farmer
 {

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,8 +5,7 @@
 
 class JewelryShop extends Shop
 {
-   
-   @Override @Produces @Specializes @Sparkly @AnotherDeploymentType
+   @Override @Produces @Specializes @Sparkly
    public Product getExpensiveGift()
    {
       return new Necklace();

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/ShoeShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/ShoeShop_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/ShoeShop_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,8 +5,7 @@
 
 class ShoeShop_Broken extends MallShop
 {
-   
-   @Override @Produces @Specializes @AnotherDeploymentType
+   @Override @Produces @Specializes
    public Product getExpensiveGift()
    {
       return super.getExpensiveGift();

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializesStaticMethod;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/FurnitureShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/FurnitureShop_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/FurnitureShop_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,11 +3,9 @@
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.Specializes;
 
-
 class FurnitureShop_Broken extends Shop
 {
-   
-   @Specializes @Produces @AnotherDeploymentType
+   @Specializes @Produces 
    public static Product getChair()
    {
       return new Product();

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializingAndSpecializedBeanHaveName;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -6,8 +6,7 @@
 
 class HighSchool_Broken extends School
 {
-   
-   @Override @Produces @Specializes @AnotherDeploymentType @Named
+   @Override @Produces @Specializes at Named
    public Pupil getStarPupil()
    {
       return super.getStarPupil();

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Bookshop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Bookshop_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Bookshop_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,8 +5,7 @@
 
 class Bookshop_Broken extends Shop
 {
-   
-   @Override @Specializes @Produces @AnotherDeploymentType
+   @Override @Specializes @Produces
    public Product getExpensiveGift()
    {
       return new Product();

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/PictureShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/PictureShop_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/PictureShop_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -5,8 +5,7 @@
 
 class PictureShop_Broken extends Shop
 {
-   
-   @Override @Produces @Specializes @AnotherDeploymentType
+   @Override @Produces @Specializes
    public Product getExpensiveGift()
    {
       // TODO Auto-generated method stub

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.simple;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
 
 
 @Specializes @Lazy
- at AnotherDeploymentType
 class LazyFarmer extends Farmer
 {
    

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,9 +2,7 @@
 
 import javax.enterprise.inject.Specializes;
 
-
-
- at AnotherDeploymentType @Specializes
+ at Specializes
 class Office extends Building
 {
    

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.inject.Specializes;
 
 @Specializes
- at AnotherDeploymentType
 class Tractor_Broken extends FarmEquipment
 {
 

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -4,7 +4,6 @@
 import javax.enterprise.inject.Specializes;
 
 @Specializes
- at AnotherDeploymentType
 @Named
 class FarmYard_Broken extends Yard
 {

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.inject.Specializes;
 
 @Specializes
- at AnotherDeploymentType
 class Donkey_Broken implements Animal
 {
 

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.inject.Specializes;
 
 @Specializes
- at AnotherDeploymentType
 class Cow_Broken
 {
 

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.inject.Specializes;
 
 @Specializes
- at AnotherDeploymentType
 class Cow_Broken extends Mammal
 {
    public Cow_Broken()

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -3,7 +3,6 @@
 import javax.enterprise.inject.Specializes;
 
 @Specializes
- at AnotherDeploymentType
 class FishFarmer_Broken extends Farmer
 {
    

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,7 @@
 
 import javax.enterprise.inject.Specializes;
 
- at Specializes @AnotherDeploymentType
+ at Specializes
 class SheepFarmer_Broken extends Farmer
 {
    

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.byname;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.inject.Named;
 
- at AnotherDeploymentType
 @Whitefish
 @Named("whitefish")
 final class Plaice implements Animal

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.context.RequestScoped;
 
- at AnotherDeploymentType
 @RequestScoped
 class Tuna
 {

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.clientProxy.finalmethod;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}
-

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.context.RequestScoped;
 
- at AnotherDeploymentType
 @RequestScoped
 class Tuna_Broken
 {

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.clientProxy.privateconstructor;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.context.RequestScoped;
 
- at AnotherDeploymentType
 @RequestScoped
 class Unproxyable_Broken
 {

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.injection;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class SpiderProducer
 {
    

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.context.RequestScoped;
 
- at AnotherDeploymentType
 @RequestScoped
 class Tuna
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -195,26 +195,6 @@
       }.run();
    }
 
-   @Test(groups = { "injectionPoint", "deployment" })
-   @SpecAssertions({
-      @SpecAssertion(section = "5.6.9", id = "e"),
-      @SpecAssertion(section = "2.5.1", id="review") // deployment types removed from spec
-   })
-   public void testStandardDeployment() throws Exception
-   {
-      new RunInDependentContext()
-      {
-         
-         @Override
-         protected void execute() throws Exception
-         {
-            assert getBeans(InjectionPoint.class).size() == 1;
-            assert getBeans(InjectionPoint.class).iterator().next().getDeploymentType().equals(Standard.class);
-         }
-         
-      }.run();
-   }
-
    @Test(groups = { "injectionPoint" })
    @SpecAssertion(section = "5.6.9", id = "e")
    public void testDependentScope() throws Exception

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
-
-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.enterprise.inject.deployment.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -1,8 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
-
-import javax.enterprise.inject.AnnotationLiteral;
-
-class AnotherDeploymentTypeLiteral extends AnnotationLiteral<AnotherDeploymentType> implements AnotherDeploymentType
-{
-   
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.inject.Named;
 
- at AnotherDeploymentType
 @Whitefish
 @Named("whitefish")
 final class Plaice implements Animal

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -51,13 +51,6 @@
       getBeans(Tuna.class, new CurrentLiteral(), new CurrentLiteral());
    }
 
-   @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
-   @SpecAssertion(section="5.3", id = "review") // seems to be removed from spec - double check
-   public void testNonBindingTypeUsed()
-   {
-      getBeans(Tuna.class, new AnotherDeploymentTypeLiteral());
-   }
-
    @Test(groups="resolution")
    @SpecAssertions({
       @SpecAssertion(section = "5.3", id ="review") // removed from spec?

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.inject.Produces;
 
- at AnotherDeploymentType
 class SpiderProducer
 {
    

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java	2009-07-21 00:06:37 UTC (rev 3096)
@@ -2,7 +2,6 @@
 
 import javax.enterprise.context.RequestScoped;
 
- at AnotherDeploymentType
 @RequestScoped
 class Tuna
 {

Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml	2009-07-20 11:29:42 UTC (rev 3095)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml	2009-07-21 00:06:37 UTC (rev 3096)
@@ -578,23 +578,19 @@
     </assertion>
 
     <assertion id="ba">
-      <text>A bean class may also specify a scope~, name, deployment type, stereotypes and/or bindings~</text>
+      <text>A bean class may also specify a scope~, name, stereotypes and/or bindings~</text>
     </assertion>
 
     <assertion id="bb">
-      <text>A bean class may also specify a ~scope, ~name~, deployment type, stereotypes and/or bindings~</text>
+      <text>A bean class may also specify a ~scope, ~name~, stereotypes and/or bindings~</text>
     </assertion>
 
-    <assertion id="bc">
-      <text>A bean class may also specify a ~scope, name, ~deployment type~, stereotypes and/or bindings~</text>
-    </assertion>
-
     <assertion id="bd">
-      <text>A bean class may also specify ~a scope, name, deployment type, ~stereotypes~ and/or bindings~</text>
+      <text>A bean class may also specify ~a scope, name, ~stereotypes~ and/or bindings~</text>
     </assertion>
 
     <assertion id="be">
-      <text>A bean class may also specify ~a scope, name, deployment type, stereotypes and/or ~bindings</text>
+      <text>A bean class may also specify ~a scope, name, stereotypes and/or ~bindings</text>
     </assertion>
 
     <assertion id="c">
@@ -743,23 +739,19 @@
     </assertion>
 
     <assertion id="ba">
-      <text>A bean class may also specify a scope~, name, deployment type, stereotypes and/or bindings~</text>
+      <text>A bean class may also specify a scope~, name, stereotypes and/or bindings~</text>
     </assertion>
 
     <assertion id="bb">
-      <text>A bean class may also specify a ~scope, ~name~, deployment type, stereotypes and/or bindings~</text>
+      <text>A bean class may also specify a ~scope, ~name~, stereotypes and/or bindings~</text>
     </assertion>
 
-    <assertion id="bc">
-      <text>A bean class may also specify a ~scope, name, ~deployment type~, stereotypes and/or bindings~</text>
-    </assertion>
-
     <assertion id="bd">
-      <text>A bean class may also specify ~a scope, name, deployment type, ~stereotypes~ and/or bindings~</text>
+      <text>A bean class may also specify ~a scope, name, ~stereotypes~ and/or bindings~</text>
     </assertion>
 
     <assertion id="be">
-      <text>A bean class may also specify ~a scope, name, deployment type, stereotypes and/or ~bindings</text>
+      <text>A bean class may also specify ~a scope, name, stereotypes and/or ~bindings</text>
     </assertion>
 
     <assertion id="c">
@@ -1135,7 +1127,7 @@
     </assertion>
 
     <assertion id="hh">
-      <text>The bean type, bindings and deployment type of the resource are determined by the producer field declaration.</text>
+      <text>The bean type and bindings of the resource are determined by the producer field declaration.</text>
     </assertion>
 
   </section>
@@ -1583,10 +1575,6 @@
       <text>If two beans both support a certain bean type, and share at least one binding, then they are both eligible for injection to any injection point with that declared type and binding.</text>
     </assertion>
 
-    <assertion id="b">
-      <text>If the bean with the lower priority deployment type declares a binding that is not declared by the bean with the higher priority deployment type, then the bean with the higher priority deployment type will not be eligible for injection to an injection point with that binding.</text>
-    </assertion>
-
     <assertion id="ca">
       <text>The only way one bean can completely override a lower-priority bean at all injection points is if it implements all the bean types and declares all the bindings of the lower-priority bean. However, if the lower-priority bean declares a producer method or observer method, then even this is not enough to ensure that the lower-priority bean is never called.</text>
     </assertion>
@@ -2071,7 +2059,7 @@
     </assertion>
 
     <assertion id="e">
-      <text>The container must provide a bean with deployment type |@Standard|, scope |@Dependent|, bean type |InjectionPoint| and binding |@Current|, allowing dependent objects, as defined in Section 6.4.2, "Dependent objects", to obtain information about the injection point to which they belong. The built-in implementation must be a passivation capable dependency, as defined in Section 6.6.2, "Passivation capable dependencies".</text>
+      <text>The container must provide a bean with scope |@Dependent|, bean type |InjectionPoint| and binding |@Current|, allowing dependent objects, as defined in Section 6.4.2, "Dependent objects", to obtain information about the injection point to which they belong. The built-in implementation must be a passivation capable dependency, as defined in Section 6.6.2, "Passivation capable dependencies".</text>
     </assertion>
 
     <assertion id="f">




More information about the weld-commits mailing list