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

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-01-26 10:05:01 -0500 (Mon, 26 Jan 2009)
New Revision: 1234

Modified:
   tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java
   tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java
   tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Contexts.java
   tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java
   tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/NewLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityBinding.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer2.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer3.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Espoo_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Forssa_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hamina_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Helsinki.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hyvinkaa.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jamsa_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Joensuu.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jyvaskyla.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kaarina_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kotka_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kuopio_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Loviisa_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Maarianhamina_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Mikkeli_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Nokia_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Peraseinajoki.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Pietarsaari_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Porvoo_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Raisio_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Salo_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Turku.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Uusikaupunki_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vaasa.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vantaa_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation2.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Pomeranian.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/TibetanTerrier.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Fox.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/FoxRun.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/OtherSpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityBinding.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer2.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Espoo_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Forssa_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hamina_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Helsinki.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hyvinkaa.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jamsa_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Joensuu.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jyvaskyla.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kaarina_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kotka_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kuopio_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Loviisa_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Maarianhamina_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Mikkeli_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Nokia_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Peraseinajoki.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Porvoo_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Raisio_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Salo_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Uusikaupunki_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vaasa.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vantaa_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation2.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/FishStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/RedSnapper.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cat.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Chunky.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cod.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Hairy.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Order.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Species.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Synchronous.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Whitefish.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DisabledDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/FishStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Gazelle_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedAnimalDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/InheritedDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/MammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/NotInheritedDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/RedSnapper.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Reindeer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/FishStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Haddock.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/MammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Minnow.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Moose.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RedSnapper.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RiverFishStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/SeaBass.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScope.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScopeType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/BeanWithTooManyScopeTypes.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Dog.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/FishStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Minnow.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/NotInheritedScope.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Order.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Pollock.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RedSnapper.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Retriever.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RiverFishStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/SeaBass.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Asynchronous.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Bovine.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Goldfish.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HighlandCow.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedAnimalDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/RequestScopedAnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Springbok.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithBindingTypes_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithNonEmptyNamed_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyDeploymentTypes_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyScopeTypes_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/Haddock.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotypeAnnotationLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AuroraFinch.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AustralianTerrier.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BananaSpider.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BirdCage.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlackRumpedWaxbill_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlueFacedParrotFinch.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BorderTerrier.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BostonTerrier.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Boxer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BullTerrier.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CommonWaxbill_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FarmShop.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FinchKeeper.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FiresBinding.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FoxTerrier.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/GoldbreastWaxbill_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/JavaSparrow_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OrangeCheekedWaxbill.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OwlFinch_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Pomeranian.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RecluseSpider.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Role.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RoleBinding.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Shop.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/StarFinch.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/SweeWaxbill_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TameAnnotationLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TeaCupPomeranian.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedField.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Beagle_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Boxer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Bullmastiff_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Dachshund_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanLifecycleTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GreaterDane.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Greyhound_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Hound.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/HoundOfBaskerville.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Husky_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/IrishTerrier_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Koirus.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Labrador.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Laika.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Leopard.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewAndOtherBindingType_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Order.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pekingese_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pug_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pumi_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Saluki.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Spitz.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Toller.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WelshCorgie.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Capercaillie.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Chicken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/ChickenHutch.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/DangerCall.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Dottrel.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Fox.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Grouse.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Pheasant.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowConsumer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Chicken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderConsumer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/HighestDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/LadybirdSpider.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderConsumer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpecializedTarantulaProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderAsAnimalProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderProducerWildCardType_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/StaticTarantulaProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameAnnotationLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameTarantulaProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpider.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpiderImpl_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/BeanWithStaticProducerMethod.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Chicken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/LadybirdSpider.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedConstructorParameter.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedField.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedInitializerParameter.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedProducerParameter.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Cow_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Donkey.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Duck.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Farm.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishPond.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goldfish.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goose_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/HeavyDuty.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Leopard_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Modern.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Motorized.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewAndOtherBindingType_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Order.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/OuterBean_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RedSnapper.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RequestScopedAnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Sheep.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Synchronous.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SynchronousAnnotationLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tiger.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/TunaFarm.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Turkey.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/WrappedSimpleBean.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractCow.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractFarmHouse.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractHorse.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractKennel.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractStable.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cow.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cuddly.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmAnimalDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmHouse.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Horse.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/LabradorKennel.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Smelly.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Stable.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameCow.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameHorse.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Building.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Farmer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Landowner.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Lazy.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Yard.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Expensive.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/JewelryShop.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/School.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Shop.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Sparkly.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Building.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Cow_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Donkey_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmEquipment.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Farmer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Landowner.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Lazy.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/LazyFarmer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Office.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Tractor_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Yard.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Chunky.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Cod.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Haddock.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Plaice.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Salmon.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/SeaBass.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Sole.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Whitefish.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/FinalTuna_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Fox.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/TunedTuna.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouseProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouse_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Fox.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FoxRun.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/HenHouse.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderNest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/TunaFarm.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/BeanWithInjectionPointMetadata.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/ConstructorInjectionPointBean.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/FieldInjectionPointBean.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/MethodInjectionPointBean.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/FishFarmOffice.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Chunky.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ChunkyLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Cod.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Expensive.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ExpensiveLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Farmer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/FinalTuna_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Haddock.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/LadybirdSpider.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Plaice.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Salmon.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ScottishFishFarmer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SeaBass.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Sole.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Whitefish.java
Log:
WBRI-117, update to packaging to PRD2

Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -3,7 +3,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-import javax.webbeans.manager.Bean;
+import javax.inject.manager.Bean;
 
 /**
  * Provides Bean related operations.

Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -3,7 +3,7 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.webbeans.manager.Manager;
+import javax.inject.manager.Manager;
 
 /**
  * Container related operations

Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Contexts.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Contexts.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Contexts.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,8 @@
 package org.jboss.webbeans.tck.api;
 
-import javax.webbeans.manager.Context;
+import javax.context.Context;
 
+
 /**
  * Context related operations
  * 

Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -3,7 +3,7 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.webbeans.manager.Manager;
+import javax.inject.manager.Manager;
 
 /**
  * This interface provides operations relating to a Web Beans Manager.

Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,8 @@
 package org.jboss.webbeans.tck.api;
 
-import javax.webbeans.manager.Context;
+import javax.context.Context;
 
+
 public class TCKConfiguration
 {
    

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -15,10 +15,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.webbeans.Production;
-import javax.webbeans.Standard;
-import javax.webbeans.manager.Bean;
-import javax.webbeans.manager.Manager;
+import javax.inject.Production;
+import javax.inject.Standard;
+import javax.inject.manager.Bean;
+import javax.inject.manager.Manager;
 
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.impl.literals;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.Current;
+import javax.inject.AnnotationLiteral;
+import javax.inject.Current;
 
 /**
  * Annotation literal for @Current

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/NewLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/NewLiteral.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/NewLiteral.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.impl.literals;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.New;
+import javax.inject.AnnotationLiteral;
+import javax.inject.New;
 
 public class NewLiteral extends AnnotationLiteral<New> implements New
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.impl.util;
 
-import javax.webbeans.ExecutionException;
+import javax.inject.ExecutionException;
 
 /**
  * Exception thrown when errors occur while loading resource

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityBinding.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityBinding.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -7,8 +7,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.Dependent;
-import javax.webbeans.InterceptorBindingType;
+import javax.context.Dependent;
+import javax.interceptor.InterceptorBindingType;
 
 @InterceptorBindingType
 @Dependent

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.integration.context.passivating;
 
-import javax.webbeans.Dependent;
-import javax.webbeans.Produces;
+import javax.context.Dependent;
+import javax.inject.Produces;
 
 class CityProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer2.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer2.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer2.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.integration.context.passivating;
 
-import javax.webbeans.Dependent;
-import javax.webbeans.Produces;
+import javax.context.Dependent;
+import javax.inject.Produces;
 
 class CityProducer2
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer3.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer3.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/CityProducer3.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.integration.context.passivating;
 
-import javax.webbeans.Current;
-import javax.webbeans.Dependent;
-import javax.webbeans.Produces;
+import javax.context.Dependent;
+import javax.inject.Current;
+import javax.inject.Produces;
 
 
 class CityProducer3

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Espoo_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Espoo_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Espoo_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,9 +1,9 @@
 package org.jboss.webbeans.tck.integration.context.passivating;
 
+import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.inject.Current;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Forssa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Forssa_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Forssa_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.Initializer;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
+import javax.inject.Initializer;
 
 @SessionScoped
 class Forssa_Broken implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hamina_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hamina_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hamina_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.integration.context.passivating;
 
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
 
 @SessionScoped
 class Hamina_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Helsinki.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Helsinki.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Helsinki.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.integration.context.passivating;
 
+import javax.context.Dependent;
 import javax.ejb.Stateful;
-import javax.webbeans.Dependent;
 
 @Dependent
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hyvinkaa.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hyvinkaa.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Hyvinkaa.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
 
 @SuppressWarnings("serial")
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jamsa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jamsa_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jamsa_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.Produces;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
+import javax.inject.Produces;
 
 @SessionScoped
 class Jamsa_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Joensuu.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Joensuu.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Joensuu.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
 
 @SuppressWarnings("serial")
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jyvaskyla.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jyvaskyla.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Jyvaskyla.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
 
 @SuppressWarnings("serial")
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kaarina_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kaarina_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kaarina_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.integration.context.passivating;
 
+import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.SessionScoped;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kotka_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kotka_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kotka_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
 
 @SessionScoped
 class Kotka_Broken implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kuopio_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kuopio_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Kuopio_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.Initializer;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
+import javax.inject.Initializer;
 
 @SessionScoped
 class Kuopio_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Loviisa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Loviisa_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Loviisa_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.Initializer;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
+import javax.inject.Initializer;
 
 @SessionScoped
 class Loviisa_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Maarianhamina_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Maarianhamina_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Maarianhamina_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,9 +1,9 @@
 package org.jboss.webbeans.tck.integration.context.passivating;
 
+import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.inject.Current;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Mikkeli_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Mikkeli_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Mikkeli_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.Initializer;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
+import javax.inject.Initializer;
 
 @SessionScoped
 class Mikkeli_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Nokia_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Nokia_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Nokia_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
 
 @SessionScoped
 class Nokia_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Peraseinajoki.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Peraseinajoki.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Peraseinajoki.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.integration.context.passivating;
 
-import javax.webbeans.Current;
-import javax.webbeans.Produces;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
+import javax.inject.Produces;
 
 class Peraseinajoki extends City
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Pietarsaari_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Pietarsaari_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Pietarsaari_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,10 +2,10 @@
 
 import java.io.Serializable;
 
+import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.inject.Current;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Porvoo_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Porvoo_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Porvoo_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.integration.context.passivating;
 
+import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.SessionScoped;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Raisio_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Raisio_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Raisio_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
 
 @SessionScoped
 class Raisio_Broken implements CityInterface, Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Salo_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Salo_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Salo_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
 
 @SessionScoped
 class Salo_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Turku.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Turku.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Turku.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.integration.context.passivating;
 
+import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.SessionScoped;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Uusikaupunki_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Uusikaupunki_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Uusikaupunki_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
 
 @SessionScoped
 class Uusikaupunki_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vaasa.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vaasa.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vaasa.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
 
 @SuppressWarnings("serial")
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vantaa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vantaa_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Vantaa_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
 
 @SessionScoped
 class Vantaa_Broken implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.integration.context.passivating;
 
-import javax.webbeans.Dependent;
+import javax.context.Dependent;
 
 @Dependent
 class Violation

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation2.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation2.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/Violation2.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.integration.context.passivating;
 
-import javax.webbeans.Dependent;
+import javax.context.Dependent;
 
 @Dependent
 class Violation2

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -19,9 +19,9 @@
 
 import java.util.Set;
 
-import javax.webbeans.DefinitionException;
-import javax.webbeans.Observer;
-import javax.webbeans.manager.Bean;
+import javax.event.Observer;
+import javax.inject.DefinitionException;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Pomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Pomeranian.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Pomeranian.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.integration.event;
 
+import javax.annotation.Named;
 import javax.ejb.Stateful;
-import javax.webbeans.Named;
-import javax.webbeans.Observes;
+import javax.event.Observes;
 
 @Stateful
 @Tame

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Tame.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Tame.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/TibetanTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/TibetanTerrier.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/TibetanTerrier.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.integration.event;
 
 import javax.ejb.Stateless;
-import javax.webbeans.Observes;
+import javax.event.Observes;
 
 @Stateless
 class TibetanTerrier implements Terrier

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -4,10 +4,10 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.webbeans.ContextNotActiveException;
-import javax.webbeans.RequestScoped;
-import javax.webbeans.manager.Context;
-import javax.webbeans.manager.Contextual;
+import javax.context.Context;
+import javax.context.ContextNotActiveException;
+import javax.context.Contextual;
+import javax.context.RequestScoped;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -4,9 +4,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import javax.webbeans.ScopeType;
-import javax.webbeans.manager.Context;
-import javax.webbeans.manager.Contextual;
+import javax.context.Context;
+import javax.context.Contextual;
+import javax.context.ScopeType;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,10 +6,10 @@
 import java.lang.reflect.Method;
 import java.util.Set;
 
-import javax.webbeans.ContextNotActiveException;
-import javax.webbeans.Dependent;
-import javax.webbeans.manager.Bean;
-import javax.webbeans.manager.Context;
+import javax.context.Context;
+import javax.context.ContextNotActiveException;
+import javax.context.Dependent;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Fox.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Fox.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.context.dependent;
 
-import javax.webbeans.Dependent;
-import javax.webbeans.Named;
+import javax.annotation.Named;
+import javax.context.Dependent;
 
 @Dependent @Named
 class Fox

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/FoxRun.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/FoxRun.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/FoxRun.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.context.dependent;
 
-import javax.webbeans.Current;
+import javax.inject.Current;
 
 class FoxRun
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/OtherSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/OtherSpiderProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/OtherSpiderProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.context.dependent;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 @AnotherDeploymentType
 public class OtherSpiderProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/SpiderProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/SpiderProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.context.dependent;
 
-import javax.webbeans.Disposes;
-import javax.webbeans.Produces;
+import javax.inject.Disposes;
+import javax.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityBinding.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityBinding.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -7,8 +7,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.Dependent;
-import javax.webbeans.InterceptorBindingType;
+import javax.context.Dependent;
+import javax.interceptor.InterceptorBindingType;
 
 @InterceptorBindingType
 @Dependent

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.context.passivating;
 
-import javax.webbeans.Dependent;
-import javax.webbeans.Produces;
+import javax.context.Dependent;
+import javax.inject.Produces;
 
 class CityProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer2.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer2.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/CityProducer2.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.context.passivating;
 
-import javax.webbeans.Dependent;
-import javax.webbeans.Produces;
+import javax.context.Dependent;
+import javax.inject.Produces;
 
 class CityProducer2
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Espoo_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Espoo_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Espoo_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,9 +1,9 @@
 package org.jboss.webbeans.tck.unit.context.passivating;
 
+import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.inject.Current;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Forssa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Forssa_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Forssa_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.Initializer;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
+import javax.inject.Initializer;
 
 @SessionScoped
 class Forssa_Broken implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hamina_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hamina_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hamina_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.context.passivating;
 
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
 
 @SessionScoped
 class Hamina_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Helsinki.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Helsinki.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Helsinki.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.context.passivating;
 
+import javax.context.Dependent;
 import javax.ejb.Stateful;
-import javax.webbeans.Dependent;
 
 @Dependent
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hyvinkaa.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hyvinkaa.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Hyvinkaa.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
 
 @SuppressWarnings("serial")
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jamsa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jamsa_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jamsa_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.Produces;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
+import javax.inject.Produces;
 
 @SessionScoped
 class Jamsa_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Joensuu.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Joensuu.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Joensuu.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
 
 @SuppressWarnings("serial")
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jyvaskyla.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jyvaskyla.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Jyvaskyla.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
 
 @SuppressWarnings("serial")
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kaarina_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kaarina_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kaarina_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.context.passivating;
 
+import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.SessionScoped;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kotka_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kotka_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kotka_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
 
 @SessionScoped
 class Kotka_Broken implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kuopio_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kuopio_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Kuopio_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.Initializer;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
+import javax.inject.Initializer;
 
 @SessionScoped
 class Kuopio_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Loviisa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Loviisa_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Loviisa_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.Initializer;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
+import javax.inject.Initializer;
 
 @SessionScoped
 class Loviisa_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Maarianhamina_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Maarianhamina_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Maarianhamina_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,9 +1,9 @@
 package org.jboss.webbeans.tck.unit.context.passivating;
 
+import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.inject.Current;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Mikkeli_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Mikkeli_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Mikkeli_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.Initializer;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
+import javax.inject.Initializer;
 
 @SessionScoped
 class Mikkeli_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Nokia_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Nokia_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Nokia_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
 
 @SessionScoped
 class Nokia_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -3,40 +3,14 @@
 import java.io.IOException;
 import java.util.Set;
 
-import javax.webbeans.DefinitionException;
-import javax.webbeans.IllegalProductException;
-import javax.webbeans.UnserializableDependencyException;
-import javax.webbeans.manager.Bean;
+import javax.inject.DefinitionException;
+import javax.inject.IllegalProductException;
+import javax.inject.UnserializableDependencyException;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;
 import org.jboss.webbeans.tck.impl.SpecVersion;
-import org.jboss.webbeans.tck.unit.context.passivating.CityProducer;
-import org.jboss.webbeans.tck.unit.context.passivating.CityProducer2;
-import org.jboss.webbeans.tck.unit.context.passivating.Espoo_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Forssa_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Hamina_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Helsinki;
-import org.jboss.webbeans.tck.unit.context.passivating.Hyvinkaa;
-import org.jboss.webbeans.tck.unit.context.passivating.Jamsa_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Joensuu;
-import org.jboss.webbeans.tck.unit.context.passivating.Jyvaskyla;
-import org.jboss.webbeans.tck.unit.context.passivating.Kaarina_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Kotka_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Kuopio_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Loviisa_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Maarianhamina_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Mikkeli_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Nokia_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Peraseinajoki;
-import org.jboss.webbeans.tck.unit.context.passivating.Porvoo_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Raisio_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Salo_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Uusikaupunki_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Vaasa;
-import org.jboss.webbeans.tck.unit.context.passivating.Vantaa_Broken;
-import org.jboss.webbeans.tck.unit.context.passivating.Violation;
-import org.jboss.webbeans.tck.unit.context.passivating.Violation2;
 import org.testng.annotations.Test;
 
 /**

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Peraseinajoki.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Peraseinajoki.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Peraseinajoki.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.context.passivating;
 
-import javax.webbeans.Current;
-import javax.webbeans.Produces;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
+import javax.inject.Produces;
 
 class Peraseinajoki extends City
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Porvoo_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Porvoo_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Porvoo_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.context.passivating;
 
+import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.SessionScoped;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Raisio_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Raisio_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Raisio_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
 
 @SessionScoped
 class Raisio_Broken implements CityInterface, Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Salo_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Salo_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Salo_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
 
 @SessionScoped
 class Salo_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Uusikaupunki_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Uusikaupunki_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Uusikaupunki_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
 
 @SessionScoped
 class Uusikaupunki_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vaasa.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vaasa.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vaasa.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
 
 @SuppressWarnings("serial")
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vantaa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vantaa_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Vantaa_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Current;
 
 @SessionScoped
 class Vantaa_Broken implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.context.passivating;
 
-import javax.webbeans.Dependent;
+import javax.context.Dependent;
 
 @Dependent
 class Violation

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation2.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation2.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/Violation2.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.context.passivating;
 
-import javax.webbeans.Dependent;
+import javax.context.Dependent;
 
 @Dependent
 class Violation2

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnimalStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnimalStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.RequestScoped;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.context.RequestScoped;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,9 +2,9 @@
 
 import java.lang.reflect.Method;
 
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
-import javax.webbeans.manager.Bean;
+import javax.context.RequestScoped;
+import javax.inject.Production;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/FishStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/FishStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,9 +6,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.Named;
-import javax.webbeans.Stereotype;
+import javax.annotation.Named;
+import javax.annotation.Stereotype;
+import javax.context.ApplicationScoped;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/RedSnapper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/RedSnapper.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/RedSnapper.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.bean;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @FishStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/SpiderProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/SpiderProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.bean;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,9 +6,9 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.webbeans.Current;
-import javax.webbeans.Production;
-import javax.webbeans.manager.Bean;
+import javax.inject.Current;
+import javax.inject.Production;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cat.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cat.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.binding;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 
 @Production

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Chunky.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Chunky.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Chunky.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cod.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Cod.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.definition.binding;
 
-import javax.webbeans.Named;
-import javax.webbeans.Production;
+import javax.annotation.Named;
+import javax.inject.Production;
 
 @Production
 @Whitefish

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Hairy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Hairy.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Hairy.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -11,7 +11,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Order.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Order.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.binding;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 class Order

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Species.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Species.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Species.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/SpiderProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/SpiderProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.binding;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 
 

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Synchronous.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Synchronous.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Synchronous.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tame.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tame.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tuna.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tuna.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.binding;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Whitefish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Whitefish.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Whitefish.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.deployment;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -4,7 +4,7 @@
 
 import java.util.Arrays;
 
-import javax.webbeans.DeploymentException;
+import javax.inject.DeploymentException;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,7 +6,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.webbeans.Standard;
+import javax.inject.Standard;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
 
-import javax.webbeans.Production;
-import javax.webbeans.Standard;
+import javax.inject.Production;
+import javax.inject.Standard;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -4,11 +4,11 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
-import javax.webbeans.DefinitionException;
-import javax.webbeans.DeploymentException;
-import javax.webbeans.Production;
-import javax.webbeans.UnsatisfiedDependencyException;
-import javax.webbeans.manager.Bean;
+import javax.inject.DefinitionException;
+import javax.inject.DeploymentException;
+import javax.inject.Production;
+import javax.inject.UnsatisfiedDependencyException;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DisabledDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DisabledDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DisabledDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/FishStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/FishStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,9 +6,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.Named;
-import javax.webbeans.Stereotype;
+import javax.annotation.Named;
+import javax.annotation.Stereotype;
+import javax.context.ApplicationScoped;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Gazelle_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Gazelle_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Gazelle_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.deployment;
 
-import javax.webbeans.Standard;
+import javax.inject.Standard;
 
 @Standard
 class Gazelle_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedAnimalDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedAnimalDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedAnimalDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedMammalStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/HornedMammalStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/InheritedDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/InheritedDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/InheritedDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/MammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/MammalStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/MammalStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/NotInheritedDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/NotInheritedDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/NotInheritedDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/RedSnapper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/RedSnapper.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/RedSnapper.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.deployment;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @FishStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Reindeer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Reindeer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/Reindeer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.deployment;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @HornedMammalStereotype
 @Production

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/SpiderProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/SpiderProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.definition.deployment;
 
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
+import javax.annotation.Named;
+import javax.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/FishStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/FishStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,9 +6,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.Named;
-import javax.webbeans.Stereotype;
+import javax.annotation.Named;
+import javax.annotation.Stereotype;
+import javax.context.ApplicationScoped;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Haddock.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Haddock.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Haddock.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.definition.name;
 
-import javax.webbeans.Named;
-import javax.webbeans.Production;
+import javax.annotation.Named;
+import javax.inject.Production;
 
 @Production
 @Named

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/MammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/MammalStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/MammalStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Minnow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Minnow.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Minnow.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.name;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @RiverFishStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Moose.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Moose.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/Moose.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.name;
 
-import javax.webbeans.Named;
+import javax.annotation.Named;
 
 @MammalStereotype
 @Named("aMoose")

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -3,8 +3,8 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.webbeans.DefinitionException;
-import javax.webbeans.manager.Bean;
+import javax.inject.DefinitionException;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RedSnapper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RedSnapper.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RedSnapper.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.name;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @FishStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RiverFishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RiverFishStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/RiverFishStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.context.ApplicationScoped;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/SeaBass.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/SeaBass.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/SeaBass.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.definition.name;
 
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.Production;
 
 @Production
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnimalStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnimalStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.RequestScoped;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.context.RequestScoped;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScope.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScope.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScope.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.ScopeType;
+import javax.context.ScopeType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScopeType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScopeType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/AnotherScopeType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.ScopeType;
+import javax.context.ScopeType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/BeanWithTooManyScopeTypes.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/BeanWithTooManyScopeTypes.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/BeanWithTooManyScopeTypes.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.definition.scope;
 
-import javax.webbeans.ConversationScoped;
-import javax.webbeans.RequestScoped;
+import javax.context.ConversationScoped;
+import javax.context.RequestScoped;
 
 @RequestScoped
 @ConversationScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Dog.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Dog.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Dog.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.scope;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @RequestScoped
 class Dog

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/FishStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/FishStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,9 +6,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.Named;
-import javax.webbeans.Stereotype;
+import javax.annotation.Named;
+import javax.annotation.Stereotype;
+import javax.context.ApplicationScoped;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Minnow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Minnow.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Minnow.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.scope;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @RiverFishStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/NotInheritedScope.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/NotInheritedScope.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/NotInheritedScope.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.ScopeType;
+import javax.context.ScopeType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Order.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Order.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.scope;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 class Order

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Pollock.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Pollock.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Pollock.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.scope;
 
-import javax.webbeans.Dependent;
+import javax.context.Dependent;
 
 @AnimalStereotype
 @FishStereotype

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RedSnapper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RedSnapper.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RedSnapper.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.scope;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @FishStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Retriever.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Retriever.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/Retriever.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.scope;
 
-import javax.webbeans.ApplicationScoped;
+import javax.context.ApplicationScoped;
 
 @ApplicationScoped
 class Retriever extends Dog

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RiverFishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RiverFishStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/RiverFishStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.context.ApplicationScoped;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,10 +1,10 @@
 package org.jboss.webbeans.tck.unit.definition.scope;
 
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.DefinitionException;
-import javax.webbeans.Dependent;
-import javax.webbeans.RequestScoped;
-import javax.webbeans.manager.Bean;
+import javax.context.ApplicationScoped;
+import javax.context.Dependent;
+import javax.context.RequestScoped;
+import javax.inject.DefinitionException;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/SeaBass.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/SeaBass.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/SeaBass.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.definition.scope;
 
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.Production;
 
 @Production
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnimalStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnimalStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -9,8 +9,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.RequestScoped;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.context.RequestScoped;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/AnotherStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
 
 @Stereotype
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.context.ApplicationScoped;
 
 @Stereotype(supportedScopes=ApplicationScoped.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Asynchronous.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Asynchronous.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Asynchronous.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Bovine.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Bovine.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Bovine.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
 
 @Stereotype(requiredTypes=Mammal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Goldfish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Goldfish.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Goldfish.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.definition.stereotype;
 
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.Production;
 
 @RequestScopedAnimalStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HighlandCow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HighlandCow.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HighlandCow.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.stereotype;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @HornedMammalStereotype
 @RequestScopedAnimalStereotype

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedAnimalDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedAnimalDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedAnimalDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedMammalStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/HornedMammalStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/RequestScopedAnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/RequestScopedAnimalStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/RequestScopedAnimalStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.RequestScoped;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.context.RequestScoped;
 
 @Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Springbok.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Springbok.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Springbok.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.stereotype;
 
-import javax.webbeans.ApplicationScoped;
+import javax.context.ApplicationScoped;
 
 @ApplicationScopedHornedMammalStereotype
 @RequestScopedAnimalStereotype

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -3,12 +3,12 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.DefinitionException;
-import javax.webbeans.Dependent;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
-import javax.webbeans.manager.Bean;
+import javax.context.ApplicationScoped;
+import javax.context.Dependent;
+import javax.context.RequestScoped;
+import javax.inject.DefinitionException;
+import javax.inject.Production;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithBindingTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithBindingTypes_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithBindingTypes_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
 
 @Stereotype
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithNonEmptyNamed_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithNonEmptyNamed_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithNonEmptyNamed_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.Named;
-import javax.webbeans.Stereotype;
+import javax.annotation.Named;
+import javax.annotation.Stereotype;
 
 @Stereotype
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyDeploymentTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyDeploymentTypes_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyDeploymentTypes_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.Production;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.inject.Production;
 
 @Stereotype
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyScopeTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyScopeTypes_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeWithTooManyScopeTypes_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,9 +6,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.RequestScoped;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.context.ApplicationScoped;
+import javax.context.RequestScoped;
 
 @Stereotype
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Tame.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Tame.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.definition.type;
 
-import javax.webbeans.manager.Bean;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/Haddock.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/Haddock.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/Haddock.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.definition.type;
 
-import javax.webbeans.Named;
-import javax.webbeans.Production;
+import javax.annotation.Named;
+import javax.inject.Production;
 
 @Production
 @Named

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.RequestScoped;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.context.RequestScoped;
 
 @Stereotype()
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotypeAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotypeAnnotationLiteral.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnimalStereotypeAnnotationLiteral.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.AnnotationLiteral;
+import javax.inject.AnnotationLiteral;
 
 class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AuroraFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AuroraFinch.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AuroraFinch.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Initializer;
+import javax.event.Event;
+import javax.event.Fires;
+import javax.inject.Initializer;
 
 import org.jboss.webbeans.tck.unit.event.StarFinch.Mess;
 

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AustralianTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AustralianTerrier.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/AustralianTerrier.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,10 +1,10 @@
 package org.jboss.webbeans.tck.unit.event;
 
 import javax.ejb.Stateless;
-import javax.webbeans.Initializer;
-import javax.webbeans.Observes;
-import javax.webbeans.manager.Initialized;
-import javax.webbeans.manager.Manager;
+import javax.event.Observes;
+import javax.inject.Initializer;
+import javax.inject.manager.Initialized;
+import javax.inject.manager.Manager;
 
 @Stateless
 class AustralianTerrier

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BananaSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BananaSpider.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BananaSpider.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,10 +2,10 @@
 
 import java.util.Set;
 
-import javax.webbeans.Current;
-import javax.webbeans.Observer;
-import javax.webbeans.Observes;
-import javax.webbeans.manager.Manager;
+import javax.event.Observer;
+import javax.event.Observes;
+import javax.inject.Current;
+import javax.inject.manager.Manager;
 
 /**
  * Simple bean with observer method and another injectable parameter.

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BirdCage.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BirdCage.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BirdCage.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Current;
-import javax.webbeans.Named;
-import javax.webbeans.RequestScoped;
+import javax.annotation.Named;
+import javax.context.RequestScoped;
+import javax.inject.Current;
 
 import org.jboss.webbeans.tck.unit.event.StarFinch.Mess;
 

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlackRumpedWaxbill_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlackRumpedWaxbill_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlackRumpedWaxbill_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
+import javax.event.Event;
+import javax.event.Fires;
 
 class BlackRumpedWaxbill_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlueFacedParrotFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlueFacedParrotFinch.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BlueFacedParrotFinch.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Observer;
+import javax.event.Event;
+import javax.event.Fires;
+import javax.event.Observer;
 
 class BlueFacedParrotFinch
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BorderTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BorderTerrier.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BorderTerrier.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,10 +1,10 @@
 package org.jboss.webbeans.tck.unit.event;
 
 import javax.ejb.Stateless;
-import javax.webbeans.Observes;
-import javax.webbeans.Produces;
-import javax.webbeans.manager.Initialized;
-import javax.webbeans.manager.Manager;
+import javax.event.Observes;
+import javax.inject.Produces;
+import javax.inject.manager.Initialized;
+import javax.inject.manager.Manager;
 
 @Stateless
 class BorderTerrier

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BostonTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BostonTerrier.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BostonTerrier.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -3,7 +3,7 @@
 import java.util.List;
 
 import javax.ejb.Stateless;
-import javax.webbeans.Observes;
+import javax.event.Observes;
 
 @Stateless
 class BostonTerrier

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Boxer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Boxer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Boxer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.event;
 
+import javax.context.ConversationScoped;
 import javax.ejb.Stateless;
-import javax.webbeans.ConversationScoped;
 
 @Stateless
 @ConversationScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BullTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BullTerrier.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/BullTerrier.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.event;
 
 import javax.ejb.Stateless;
-import javax.webbeans.Observes;
+import javax.event.Observes;
 
 @Stateless
 class BullTerrier

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CommonWaxbill_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CommonWaxbill_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CommonWaxbill_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,7 +2,7 @@
 
 import java.util.ArrayList;
 
-import javax.webbeans.Fires;
+import javax.event.Fires;
 
 class CommonWaxbill_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -5,15 +5,15 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.webbeans.DefinitionException;
-import javax.webbeans.Dependent;
-import javax.webbeans.DuplicateBindingTypeException;
-import javax.webbeans.Event;
-import javax.webbeans.Observer;
-import javax.webbeans.ObserverException;
-import javax.webbeans.Standard;
-import javax.webbeans.TypeLiteral;
-import javax.webbeans.manager.Bean;
+import javax.context.Dependent;
+import javax.event.Event;
+import javax.event.Observer;
+import javax.event.ObserverException;
+import javax.inject.DefinitionException;
+import javax.inject.DuplicateBindingTypeException;
+import javax.inject.Standard;
+import javax.inject.TypeLiteral;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FarmShop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FarmShop.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FarmShop.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes @AnotherDeploymentType
 class FarmShop extends Shop

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Observes;
+import javax.event.Observes;
 
 class Farmer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FinchKeeper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FinchKeeper.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FinchKeeper.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Named;
-import javax.webbeans.Observes;
-import javax.webbeans.RequestScoped;
+import javax.annotation.Named;
+import javax.context.RequestScoped;
+import javax.event.Observes;
 
 import org.jboss.webbeans.tck.unit.event.StarFinch.Mess;
 

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FiresBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FiresBinding.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FiresBinding.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.Fires;
+import javax.event.Fires;
+import javax.inject.AnnotationLiteral;
 
 public class FiresBinding extends AnnotationLiteral<Fires> implements Fires
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FoxTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FoxTerrier.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/FoxTerrier.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,10 +1,10 @@
 package org.jboss.webbeans.tck.unit.event;
 
 import javax.ejb.Stateless;
-import javax.webbeans.Disposes;
-import javax.webbeans.Observes;
-import javax.webbeans.manager.Initialized;
-import javax.webbeans.manager.Manager;
+import javax.event.Observes;
+import javax.inject.Disposes;
+import javax.inject.manager.Initialized;
+import javax.inject.manager.Manager;
 
 @Stateless
 class FoxTerrier

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/GoldbreastWaxbill_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/GoldbreastWaxbill_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/GoldbreastWaxbill_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
+import javax.event.Event;
+import javax.event.Fires;
 
 class GoldbreastWaxbill_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/JavaSparrow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/JavaSparrow_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/JavaSparrow_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.util.ArrayList;
 
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
+import javax.event.Event;
+import javax.event.Fires;
 
 class JavaSparrow_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OrangeCheekedWaxbill.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OrangeCheekedWaxbill.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OrangeCheekedWaxbill.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Initializer;
+import javax.event.Event;
+import javax.event.Fires;
+import javax.inject.Initializer;
 
 import org.jboss.webbeans.tck.unit.event.StarFinch.Mess;
 

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OwlFinch_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OwlFinch_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/OwlFinch_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Observer;
+import javax.event.Event;
+import javax.event.Fires;
+import javax.event.Observer;
 
 
 class OwlFinch_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Pomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Pomeranian.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Pomeranian.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Named;
-import javax.webbeans.Observes;
+import javax.annotation.Named;
+import javax.event.Observes;
 
 @Named("Teddy")
 class Pomeranian

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RecluseSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RecluseSpider.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RecluseSpider.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.IfExists;
-import javax.webbeans.Observes;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.event.IfExists;
+import javax.event.Observes;
 
 /**
  * Simple web bean that conditionally listens to events.

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Role.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Role.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Role.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -4,7 +4,7 @@
 
 import java.lang.annotation.Retention;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @BindingType
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RoleBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RoleBinding.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/RoleBinding.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.AnnotationLiteral;
+import javax.inject.AnnotationLiteral;
 
 
 class RoleBinding extends AnnotationLiteral<Role> implements Role

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Shop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Shop.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Shop.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Observes;
+import javax.event.Observes;
 
 class Shop
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/StarFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/StarFinch.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/StarFinch.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,10 +1,10 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
-import javax.webbeans.RequestScoped;
+import javax.annotation.Named;
+import javax.context.RequestScoped;
+import javax.event.Event;
+import javax.event.Fires;
+import javax.inject.Produces;
 
 @RequestScoped
 @Named("StarFinch")

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/SweeWaxbill_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/SweeWaxbill_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/SweeWaxbill_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Observer;
+import javax.event.Event;
+import javax.event.Fires;
+import javax.event.Observer;
 
 
 class SweeWaxbill_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Tame.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Tame.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TameAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TameAnnotationLiteral.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TameAnnotationLiteral.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.AnnotationLiteral;
+import javax.inject.AnnotationLiteral;
 
 class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TeaCupPomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TeaCupPomeranian.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TeaCupPomeranian.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Named;
-import javax.webbeans.Observes;
+import javax.annotation.Named;
+import javax.event.Observes;
 
 @Tame
 @Named("Teddy")

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.webbeans.Observes;
-import javax.webbeans.manager.Initialized;
-import javax.webbeans.manager.Manager;
+import javax.event.Observes;
+import javax.inject.manager.Initialized;
+import javax.inject.manager.Manager;
 
 class YorkshireTerrier_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.New;
+import javax.inject.Initializer;
+import javax.inject.New;
 
 
 class AnnotatedConstructorParameter

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedField.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedField.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedField.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
-import javax.webbeans.New;
+import javax.inject.New;
 
 
 class AnnotatedField

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.New;
+import javax.inject.Initializer;
+import javax.inject.New;
 
 
 class AnnotatedInitializerParameter

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
-import javax.webbeans.New;
-import javax.webbeans.Produces;
+import javax.inject.New;
+import javax.inject.Produces;
 
 
 class AnnotatedProducerParameter

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Beagle_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Beagle_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Beagle_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.RequestScoped;
 import javax.ejb.Stateless;
-import javax.webbeans.RequestScoped;
 
 @Stateless
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Boxer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Boxer_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Boxer_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.ConversationScoped;
 import javax.ejb.Stateless;
-import javax.webbeans.ConversationScoped;
 
 @Stateless
 @ConversationScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Bullmastiff_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Bullmastiff_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Bullmastiff_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.SessionScoped;
 import javax.ejb.Stateless;
-import javax.webbeans.SessionScoped;
 
 @Stateless
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Dachshund_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Dachshund_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Dachshund_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.ApplicationScoped;
 import javax.ejb.Stateless;
-import javax.webbeans.ApplicationScoped;
 
 @Stateless
 @ApplicationScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
-import javax.webbeans.DefinitionException;
+import javax.inject.DefinitionException;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanLifecycleTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanLifecycleTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,7 @@
 
 import java.util.Set;
 
-import javax.webbeans.UnremovedException;
-import javax.webbeans.manager.Bean;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;
@@ -75,17 +74,6 @@
    }
 
    /**
-    * If the enterprise Web Bean has no Web Bean remove method, the Web Bean
-    * manager throws an UnremovedException.
-    */
-   @Test(groups = { "enterpriseBeans", "lifecycle", "removeMethod", "stub" }, expectedExceptions = UnremovedException.class)
-   @SpecAssertion(section = "6.4")
-   public void testNoRemoveMethodFails()
-   {
-      assert false;
-   }
-
-   /**
     * If the underlying EJB was already destroyed by direct invocation of a
     * remove method by the application, the Web Bean manager ignores the
     * instance, and is not required to call any remove method

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,9 +1,9 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.RequestScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.Disposes;
-import javax.webbeans.RequestScoped;
+import javax.inject.Disposes;
 
 @Stateful
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GreaterDane.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GreaterDane.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GreaterDane.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
 import javax.ejb.Stateless;
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes
 @Stateless

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Greyhound_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Greyhound_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Greyhound_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.RequestScoped;
 import javax.ejb.Singleton;
-import javax.webbeans.RequestScoped;
 
 @Singleton
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Hound.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Hound.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Hound.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.annotation.Named;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.Named;
 
 @Stateful
 @Tame

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/HoundOfBaskerville.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/HoundOfBaskerville.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/HoundOfBaskerville.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
 import javax.ejb.Stateful;
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Husky_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Husky_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Husky_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
-import javax.webbeans.ConversationScoped;
+import javax.context.ConversationScoped;
 
 
 //@Singleton

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/IrishTerrier_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/IrishTerrier_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/IrishTerrier_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
 
 //@Singleton
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,9 +1,9 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.RequestScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.Observes;
-import javax.webbeans.RequestScoped;
+import javax.event.Observes;
 
 @Stateful
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Koirus.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Koirus.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Koirus.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.Dependent;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.Dependent;
 
 @Stateful
 @Dependent

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Labrador.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Labrador.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Labrador.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.Dependent;
 import javax.ejb.Singleton;
-import javax.webbeans.Dependent;
 
 @Singleton
 @Dependent

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Laika.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Laika.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Laika.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.ApplicationScoped;
 import javax.ejb.Remove;
-import javax.webbeans.ApplicationScoped;
 
 //@Singleton
 @ApplicationScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Leopard.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Leopard.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Leopard.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
 import javax.ejb.MessageDriven;
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 @MessageDriven

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewAndOtherBindingType_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewAndOtherBindingType_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewAndOtherBindingType_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
-import javax.webbeans.Current;
-import javax.webbeans.New;
+import javax.inject.Current;
+import javax.inject.New;
 
 class NewAndOtherBindingType_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -3,13 +3,13 @@
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.Current;
-import javax.webbeans.DefinitionException;
-import javax.webbeans.Dependent;
-import javax.webbeans.New;
-import javax.webbeans.Standard;
-import javax.webbeans.manager.Bean;
+import javax.context.Dependent;
+import javax.inject.AnnotationLiteral;
+import javax.inject.Current;
+import javax.inject.DefinitionException;
+import javax.inject.New;
+import javax.inject.Standard;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Order.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Order.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
 import javax.ejb.Stateful;
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pekingese_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pekingese_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pekingese_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.decorator.Decorator;
 import javax.ejb.Stateless;
-import javax.webbeans.Decorator;
 
 @Stateless
 @Decorator

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,9 +1,9 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.annotation.Named;
+import javax.context.ApplicationScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.Named;
 
 @Stateful
 @ApplicationScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pug_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pug_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pug_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
 import javax.ejb.Stateless;
-import javax.webbeans.Interceptor;
+import javax.interceptor.Interceptor;
 
 @Stateless
 @Interceptor

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pumi_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pumi_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pumi_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.RequestScoped;
 import javax.ejb.Stateful;
-import javax.webbeans.RequestScoped;
 
 @Stateful
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.RequestScoped;
 import javax.ejb.Stateful;
-import javax.webbeans.RequestScoped;
 
 @Stateful
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.RequestScoped;
 import javax.ejb.Stateful;
-import javax.webbeans.RequestScoped;
 
 @Stateful
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Saluki.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Saluki.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Saluki.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,9 +1,9 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.RequestScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.Initializer;
-import javax.webbeans.RequestScoped;
+import javax.inject.Initializer;
 
 @Stateful
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Spitz.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Spitz.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Spitz.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,9 +1,9 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.RequestScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.Produces;
-import javax.webbeans.RequestScoped;
+import javax.inject.Produces;
 
 @Stateful
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Tame.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Tame.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Toller.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Toller.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Toller.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.RequestScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.RequestScoped;
 
 @Stateful
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WelshCorgie.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WelshCorgie.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WelshCorgie.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.context.Dependent;
 import javax.ejb.Stateful;
-import javax.webbeans.Dependent;
 
 @Stateful
 @Dependent

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,9 +1,9 @@
 package org.jboss.webbeans.tck.unit.implementation.enterprise;
 
+import javax.annotation.Named;
+import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.webbeans.Named;
-import javax.webbeans.SessionScoped;
 
 @SessionScoped
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Capercaillie.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Capercaillie.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Capercaillie.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.initializer;
 
-import javax.webbeans.Disposes;
-import javax.webbeans.Initializer;
+import javax.inject.Disposes;
+import javax.inject.Initializer;
 
 class Capercaillie
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Chicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Chicken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Chicken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.initializer;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 class Chicken

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/ChickenHutch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/ChickenHutch.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/ChickenHutch.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.initializer;
 
-import javax.webbeans.Initializer;
+import javax.inject.Initializer;
 
 class ChickenHutch
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/DangerCall.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/DangerCall.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/DangerCall.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.initializer;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 class DangerCall

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Dottrel.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Dottrel.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Dottrel.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.initializer;
 
-import javax.webbeans.Initializer;
+import javax.inject.Initializer;
 
 class Dottrel
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Fox.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Fox.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.initializer;
 
-import javax.webbeans.Dependent;
+import javax.context.Dependent;
 
 @Dependent
 class Fox

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Grouse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Grouse.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Grouse.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.initializer;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.Observes;
+import javax.event.Observes;
+import javax.inject.Initializer;
 
 class Grouse
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.initializer;
 
-import javax.webbeans.DefinitionException;
-import javax.webbeans.NonexistentMethodException;
-import javax.webbeans.manager.Bean;
+import javax.inject.DefinitionException;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;
@@ -97,7 +96,7 @@
       assert false;
    }
    
-   @Test(groups={"stub", "initializerMethod", "webbeansxml"}, expectedExceptions=NonexistentMethodException.class) @SpecAssertion(section="3.8.2")
+   @Test(groups={"stub", "initializerMethod", "webbeansxml"}, expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.8.2")
    public void testInitializerMethodDeclaredInXmlDoesNotExist()
    {
       assert false;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Pheasant.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Pheasant.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Pheasant.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.initializer;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.Produces;
+import javax.inject.Initializer;
+import javax.inject.Produces;
 
 class Pheasant
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.initializer;
 
-import javax.webbeans.Initializer;
+import javax.inject.Initializer;
 
 class Shrike
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.jms;
 
-import javax.webbeans.DefinitionException;
+import javax.inject.DefinitionException;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnimalStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnimalStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.RequestScoped;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.context.RequestScoped;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowConsumer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowConsumer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -17,7 +17,7 @@
 
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.Current;
+import javax.inject.Current;
 
 /**
  * This simple bean contains an injection point to receive the value of a

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidowProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
+import javax.annotation.Named;
+import javax.inject.Produces;
 
 public class BlackWidowProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Chicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Chicken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Chicken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 class Chicken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderConsumer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderConsumer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.Current;
+import javax.inject.Current;
 
 public class FunnelWeaverSpiderConsumer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/FunnelWeaverSpiderProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 public class FunnelWeaverSpiderProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/HighestDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/HighestDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/HighestDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/LadybirdSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/LadybirdSpider.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/LadybirdSpider.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.ApplicationScoped;
+import javax.context.ApplicationScoped;
 
 @ApplicationScoped
 class LadybirdSpider extends Spider

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderConsumer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderConsumer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -19,7 +19,7 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Current;
+import javax.inject.Current;
 
 /**
  * Simple bean that has an injection point for a spider

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -17,8 +17,8 @@
 
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
+import javax.annotation.Named;
+import javax.inject.Produces;
 
 /**
  * Contains producer for Spider which always is a null value and

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/NullSpiderProducer_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -17,9 +17,9 @@
 
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
-import javax.webbeans.RequestScoped;
+import javax.annotation.Named;
+import javax.context.RequestScoped;
+import javax.inject.Produces;
 
 /**
  * Bean with a producer field that always returns null and is not

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
+import javax.annotation.Named;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,11 +6,11 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.webbeans.DefinitionException;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
-import javax.webbeans.Standard;
-import javax.webbeans.manager.Bean;
+import javax.context.RequestScoped;
+import javax.inject.DefinitionException;
+import javax.inject.Production;
+import javax.inject.Standard;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -5,9 +5,9 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.webbeans.IllegalProductException;
-import javax.webbeans.Production;
-import javax.webbeans.Standard;
+import javax.inject.IllegalProductException;
+import javax.inject.Production;
+import javax.inject.Standard;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpecializedTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpecializedTarantulaProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpecializedTarantulaProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -17,8 +17,8 @@
 
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.Produces;
-import javax.webbeans.Specializes;
+import javax.inject.Produces;
+import javax.inject.Specializes;
 
 /**
  * This bean contains a producer field and specializes another bean

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderAsAnimalProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderAsAnimalProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderAsAnimalProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 public class SpiderAsAnimalProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderProducerWildCardType_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderProducerWildCardType_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderProducerWildCardType_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 public class SpiderProducerWildCardType_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpiderStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -25,10 +25,10 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.Named;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
-import javax.webbeans.Stereotype;
+import javax.annotation.Named;
+import javax.annotation.Stereotype;
+import javax.context.RequestScoped;
+import javax.inject.Production;
 
 /**
  * Test stereotype used to change the scope type and deployment type

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/StaticTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/StaticTarantulaProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/StaticTarantulaProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -17,7 +17,7 @@
 
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 public class StaticTarantulaProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Tame.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/Tame.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameAnnotationLiteral.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameAnnotationLiteral.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.AnnotationLiteral;
+import javax.inject.AnnotationLiteral;
 
 class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameTarantulaProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TameTarantulaProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 public class TameTarantulaProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -17,7 +17,7 @@
 
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.Current;
+import javax.inject.Current;
 
 /**
  * This bean contains an injection point for a Tarantula that must be provided

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 @AnotherDeploymentType
 public class TarantulaProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpider.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpider.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
 import javax.ejb.Local;
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 @Local
 public interface VibratingSpider

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpiderImpl_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpiderImpl_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/VibratingSpiderImpl_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.field;
 
 import javax.ejb.Stateless;
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 @Stateless
 public class VibratingSpiderImpl_Broken implements VibratingSpider

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnimalStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnimalStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.RequestScoped;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.context.RequestScoped;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/BeanWithStaticProducerMethod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/BeanWithStaticProducerMethod.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/BeanWithStaticProducerMethod.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.method;
 
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 @Production
 class BeanWithStaticProducerMethod

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Chicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Chicken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Chicken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.method;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 class Chicken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/LadybirdSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/LadybirdSpider.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/LadybirdSpider.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.method;
 
-import javax.webbeans.ApplicationScoped;
+import javax.context.ApplicationScoped;
 
 @ApplicationScoped
 class LadybirdSpider extends Spider

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,11 +2,11 @@
 
 import java.lang.reflect.Method;
 
-import javax.webbeans.Current;
-import javax.webbeans.DefinitionException;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
-import javax.webbeans.manager.Bean;
+import javax.context.RequestScoped;
+import javax.inject.Current;
+import javax.inject.DefinitionException;
+import javax.inject.Production;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.lang.reflect.Method;
 
-import javax.webbeans.IllegalProductException;
-import javax.webbeans.manager.Bean;
+import javax.inject.IllegalProductException;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,9 +1,9 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.method;
 
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.annotation.Named;
+import javax.context.RequestScoped;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 @AnotherDeploymentType
 class SpiderProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,10 +1,10 @@
 package org.jboss.webbeans.tck.unit.implementation.producer.method;
 
-import javax.webbeans.Disposes;
-import javax.webbeans.Observes;
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.event.Observes;
+import javax.inject.Disposes;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 @Production
 class SpiderProducer_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Tame.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/Tame.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedConstructorParameter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedConstructorParameter.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedConstructorParameter.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.New;
+import javax.inject.Initializer;
+import javax.inject.New;
 
 
 class AnnotatedConstructorParameter

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedField.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedField.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedField.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.New;
+import javax.inject.New;
 
 
 class AnnotatedField

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedInitializerParameter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedInitializerParameter.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedInitializerParameter.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.New;
+import javax.inject.Initializer;
+import javax.inject.New;
 
 
 class AnnotatedInitializerParameter

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedProducerParameter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedProducerParameter.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnnotatedProducerParameter.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.New;
-import javax.webbeans.Produces;
+import javax.inject.New;
+import javax.inject.Produces;
 
 
 class AnnotatedProducerParameter

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Cow_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Cow_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 abstract class Cow_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Donkey.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Donkey.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Donkey.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 class Donkey

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Duck.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Duck.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Duck.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
+import javax.inject.Initializer;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 
 @Production

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Farm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Farm.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Farm.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -4,7 +4,7 @@
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import javax.webbeans.Current;
+import javax.inject.Current;
 
 class Farm
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishPond.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishPond.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishPond.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.Initializer;
+import javax.inject.Initializer;
 
 class FishPond
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/FishStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,9 +6,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.Named;
-import javax.webbeans.Stereotype;
+import javax.annotation.Named;
+import javax.annotation.Stereotype;
+import javax.context.ApplicationScoped;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goldfish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goldfish.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goldfish.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.Production;
 
 @RequestScopedAnimalStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goose_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goose_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Goose_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.Production;
+import javax.inject.Initializer;
+import javax.inject.Production;
 
 @Production
 class Goose_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/HeavyDuty.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/HeavyDuty.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/HeavyDuty.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Leopard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Leopard_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Leopard_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @RequestScoped
 class Leopard_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Modern.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Modern.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Modern.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Motorized.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Motorized.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Motorized.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewAndOtherBindingType_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewAndOtherBindingType_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewAndOtherBindingType_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.Current;
-import javax.webbeans.New;
+import javax.inject.Current;
+import javax.inject.New;
 
 class NewAndOtherBindingType_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -3,13 +3,13 @@
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.Current;
-import javax.webbeans.DefinitionException;
-import javax.webbeans.Dependent;
-import javax.webbeans.New;
-import javax.webbeans.Standard;
-import javax.webbeans.manager.Bean;
+import javax.context.Dependent;
+import javax.inject.AnnotationLiteral;
+import javax.inject.Current;
+import javax.inject.DefinitionException;
+import javax.inject.New;
+import javax.inject.Standard;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Order.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Order.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 class Order

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/OuterBean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/OuterBean_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/OuterBean_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 class OuterBean_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RedSnapper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RedSnapper.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RedSnapper.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @FishStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RequestScopedAnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RequestScopedAnimalStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/RequestScopedAnimalStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.RequestScoped;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.context.RequestScoped;
 
 @Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Sheep.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Sheep.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Sheep.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
+import javax.inject.Initializer;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 @Production
 class Sheep

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -3,9 +3,8 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.webbeans.DefinitionException;
-import javax.webbeans.NonexistentConstructorException;
-import javax.webbeans.manager.Bean;
+import javax.inject.DefinitionException;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;
@@ -226,7 +225,7 @@
       assert false;
    }
    
-   @Test(expectedExceptions=NonexistentConstructorException.class, groups={"stub", "webbeansxml"}) @SpecAssertion(section="3.2.5.2")
+   @Test(expectedExceptions=DefinitionException.class, groups={"stub", "webbeansxml"}) @SpecAssertion(section="3.2.5.2")
    public void testConstructorDeclaredInXmlDoesNotExist()
    {
       assert false;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -3,7 +3,7 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.webbeans.manager.Bean;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Synchronous.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Synchronous.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Synchronous.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SynchronousAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SynchronousAnnotationLiteral.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SynchronousAnnotationLiteral.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.AnnotationLiteral;
+import javax.inject.AnnotationLiteral;
 
 class SynchronousAnnotationLiteral extends AnnotationLiteral<Synchronous> implements Synchronous
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tame.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tame.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tiger.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tiger.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tiger.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.Dependent;
+import javax.context.Dependent;
 
 @Dependent
 class Tiger

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tuna.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tuna.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/TunaFarm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/TunaFarm.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/TunaFarm.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.Current;
-import javax.webbeans.Production;
+import javax.inject.Current;
+import javax.inject.Production;
 
 @Production
 class TunaFarm

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Turkey.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Turkey.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Turkey.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.implementation.simple;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
+import javax.inject.Initializer;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 @Production
 class Turkey

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/WrappedSimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/WrappedSimpleBean.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/WrappedSimpleBean.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.webbeans.Named;
-import javax.webbeans.SessionScoped;
+import javax.annotation.Named;
+import javax.context.SessionScoped;
 
 @SessionScoped
 @Named("Fred")

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractCow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractCow.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractCow.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.realization;
 
-import javax.webbeans.Produces;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.Produces;
 
 abstract class AbstractCow
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractFarmHouse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractFarmHouse.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractFarmHouse.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.realization;
 
-import javax.webbeans.Observes;
+import javax.event.Observes;
 
 abstract class AbstractFarmHouse
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractHorse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractHorse.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractHorse.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.realization;
 
-import javax.webbeans.Produces;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.Produces;
 
 abstract class AbstractHorse
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractKennel.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractKennel.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractKennel.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.realization;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 class AbstractKennel
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractStable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractStable.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AbstractStable.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.realization;
 
-import javax.webbeans.Produces;
-import javax.webbeans.RequestScoped;
+import javax.inject.Produces;
 
 abstract class AbstractStable
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cow.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cow.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.realization;
 
-import javax.webbeans.Realizes;
+import javax.inject.Realizes;
 
 @Realizes @AnotherDeploymentType
 class Cow extends AbstractCow

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cuddly.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cuddly.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Cuddly.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.RequestScoped;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.context.RequestScoped;
 
 @Stereotype
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmAnimalDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmAnimalDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmAnimalDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmHouse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmHouse.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/FarmHouse.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.realization;
 
-import javax.webbeans.Realizes;
+import javax.inject.Realizes;
 
 @Smelly @Realizes
 class FarmHouse extends AbstractFarmHouse

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Horse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Horse.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Horse.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.realization;
 
-import javax.webbeans.Realizes;
+import javax.inject.Realizes;
 
 @AnotherDeploymentType @Realizes
 class Horse extends AbstractHorse

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/LabradorKennel.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/LabradorKennel.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/LabradorKennel.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.realization;
 
-import javax.webbeans.Realizes;
+import javax.inject.Realizes;
 
 @Realizes
 class LabradorKennel extends AbstractKennel

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,8 +6,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.AnnotationLiteral;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Smelly.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Smelly.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Smelly.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Stable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Stable.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Stable.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.realization;
 
-import javax.webbeans.Realizes;
+import javax.inject.Realizes;
 
 @Realizes
 class Stable extends AbstractStable

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Tame.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/Tame.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameCow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameCow.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameCow.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.realization;
 
-import javax.webbeans.Realizes;
+import javax.inject.Realizes;
 
 @Realizes @Tame
 class TameCow extends AbstractCow

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameHorse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameHorse.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/TameHorse.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.realization;
 
-import javax.webbeans.Realizes;
+import javax.inject.Realizes;
 
 @Realizes @Tame
 class TameHorse extends AbstractHorse

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Building.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Building.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Building.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
 
 import javax.ejb.Stateful;
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 @Stateful
 class Building implements BuildingInterface

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
 
 import javax.ejb.Stateful;
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
 
 import javax.ejb.Stateful;
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,9 +6,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.DefinitionException;
-import javax.webbeans.InconsistentSpecializationException;
+import javax.inject.AnnotationLiteral;
+import javax.inject.DefinitionException;
+import javax.inject.InconsistentSpecializationException;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
 
-import javax.webbeans.Named;
+import javax.annotation.Named;
 
 
 @Named("plough")

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
 
+import javax.annotation.Named;
 import javax.ejb.Stateful;
-import javax.webbeans.Named;
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Farmer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Farmer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
 
+import javax.annotation.Named;
 import javax.ejb.Stateful;
-import javax.webbeans.Named;
 
 
 @Landowner

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
 
 import javax.ejb.Stateful;
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Landowner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Landowner.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Landowner.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Lazy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Lazy.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Lazy.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
 
 import javax.ejb.Stateful;
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 
 @Specializes @Lazy

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
 
 import javax.ejb.Stateful;
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
 
 import javax.ejb.Stateful;
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes @AnotherDeploymentType
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
 
 import javax.ejb.Stateful;
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Yard.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Yard.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/Yard.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.enterprise;
 
+import javax.annotation.Named;
 import javax.ejb.Stateful;
-import javax.webbeans.Named;
 
 @Named("backyard")
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
 
-import javax.webbeans.Produces;
-import javax.webbeans.Specializes;
+import javax.inject.Produces;
+import javax.inject.Specializes;
 
 class Bookshop_Broken extends Shop
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
 
-import javax.webbeans.Produces;
-import javax.webbeans.Specializes;
+import javax.inject.Produces;
+import javax.inject.Specializes;
 
 class ClothesShop_Broken extends Shop
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Expensive.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Expensive.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Expensive.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
 
-import javax.webbeans.Produces;
-import javax.webbeans.Specializes;
+import javax.inject.Produces;
+import javax.inject.Specializes;
 
 class FurnitureShop_Broken extends Shop
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
 
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
-import javax.webbeans.Specializes;
+import javax.annotation.Named;
+import javax.inject.Produces;
+import javax.inject.Specializes;
 
 class HighSchool_Broken extends School
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/JewelryShop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/JewelryShop.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/JewelryShop.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
 
-import javax.webbeans.Produces;
-import javax.webbeans.Specializes;
+import javax.inject.Produces;
+import javax.inject.Specializes;
 
 class JewelryShop extends Shop
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
 
-import javax.webbeans.Produces;
-import javax.webbeans.Specializes;
+import javax.inject.Produces;
+import javax.inject.Specializes;
 
 class PictureShop_Broken extends Shop
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,9 +6,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.DefinitionException;
-import javax.webbeans.InconsistentSpecializationException;
+import javax.inject.AnnotationLiteral;
+import javax.inject.DefinitionException;
+import javax.inject.InconsistentSpecializationException;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/School.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/School.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/School.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
 
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
+import javax.annotation.Named;
+import javax.inject.Produces;
 
 class School
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
 
-import javax.webbeans.Produces;
-import javax.webbeans.Specializes;
+import javax.inject.Produces;
+import javax.inject.Specializes;
 
 class ShoeShop_Broken extends MallShop
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Shop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Shop.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Shop.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.producer.method;
 
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
+import javax.annotation.Named;
+import javax.inject.Produces;
 
 
 class Shop

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Sparkly.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Sparkly.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/Sparkly.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Building.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Building.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Building.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 class Building
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Cow_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Cow_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
 
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Donkey_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Donkey_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Donkey_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
 
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmEquipment.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmEquipment.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmEquipment.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
 
+import javax.annotation.Named;
 import javax.ejb.Stateful;
-import javax.webbeans.Named;
 
 
 @Named("plough")

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
 
-import javax.webbeans.Named;
-import javax.webbeans.Specializes;
+import javax.annotation.Named;
+import javax.inject.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Farmer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Farmer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
 
-import javax.webbeans.Named;
+import javax.annotation.Named;
 
 
 @Landowner

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
 
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Landowner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Landowner.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Landowner.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Lazy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Lazy.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Lazy.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/LazyFarmer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/LazyFarmer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
 
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 
 @Specializes @Lazy

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Office.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Office.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Office.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
 
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 
 

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
 
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes
 class OrganicFarmer_Broken extends Farmer

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
 
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes @AnotherDeploymentType
 class SheepFarmer_Broken extends Farmer

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,9 +6,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.DefinitionException;
-import javax.webbeans.InconsistentSpecializationException;
+import javax.inject.AnnotationLiteral;
+import javax.inject.DefinitionException;
+import javax.inject.InconsistentSpecializationException;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Tractor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Tractor_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Tractor_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
 
-import javax.webbeans.Specializes;
+import javax.inject.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Yard.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Yard.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/Yard.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization.simple;
 
-import javax.webbeans.Named;
+import javax.annotation.Named;
 
 @Named("backyard")
 class Yard

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Chunky.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Chunky.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Chunky.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Cod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Cod.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Cod.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.lookup.byname;
 
-import javax.webbeans.Named;
-import javax.webbeans.Production;
+import javax.annotation.Named;
+import javax.inject.Production;
 
 @Production
 @Whitefish

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Haddock.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Haddock.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Haddock.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.lookup.byname;
 
-import javax.webbeans.Named;
-import javax.webbeans.Production;
+import javax.annotation.Named;
+import javax.inject.Production;
 
 @Production
 @Named

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.lookup.byname;
 
-import javax.webbeans.AmbiguousDependencyException;
-import javax.webbeans.manager.Bean;
+import javax.inject.AmbiguousDependencyException;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Plaice.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Plaice.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Plaice.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.byname;
 
-import javax.webbeans.Named;
+import javax.annotation.Named;
 
 @AnotherDeploymentType
 @Whitefish

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -3,8 +3,8 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.webbeans.AmbiguousDependencyException;
-import javax.webbeans.manager.Bean;
+import javax.inject.AmbiguousDependencyException;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Salmon.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Salmon.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Salmon.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.lookup.byname;
 
-import javax.webbeans.Named;
-import javax.webbeans.Production;
+import javax.annotation.Named;
+import javax.inject.Production;
 
 @Production
 @Named

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/SeaBass.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/SeaBass.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/SeaBass.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.lookup.byname;
 
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.Production;
 
 @Production
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Sole.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Sole.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Sole.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.lookup.byname;
 
-import javax.webbeans.Named;
-import javax.webbeans.Production;
+import javax.annotation.Named;
+import javax.inject.Production;
 
 @Production
 @Whitefish

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Tuna.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Tuna.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.byname;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Whitefish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Whitefish.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/Whitefish.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -6,9 +6,9 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.webbeans.DefinitionException;
-import javax.webbeans.UnproxyableDependencyException;
-import javax.webbeans.manager.Bean;
+import javax.inject.DefinitionException;
+import javax.inject.UnproxyableDependencyException;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/FinalTuna_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/FinalTuna_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/FinalTuna_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.clientProxy;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Fox.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Fox.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.clientProxy;
 
-import javax.webbeans.Dependent;
+import javax.context.Dependent;
 
 @Dependent
 class Fox

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Tuna.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/Tuna.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.clientProxy;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/TunedTuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/TunedTuna.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/TunedTuna.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.clientProxy;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.injection;
 
-import javax.webbeans.Current;
+import javax.inject.Current;
 
 class BeanWithFinalBoundField_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.injection;
 
-import javax.webbeans.Current;
+import javax.inject.Current;
 
 class BeanWithStaticBoundField_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouseProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouseProducer_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouseProducer_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.injection;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 class FarmHouseProducer_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouse_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouse_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FarmHouse_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.injection;
 
-import javax.webbeans.Current;
+import javax.inject.Current;
 
 class FarmHouse_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Fox.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Fox.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.injection;
 
-import javax.webbeans.Dependent;
+import javax.context.Dependent;
 
 @Dependent
 class Fox

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FoxRun.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FoxRun.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/FoxRun.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.injection;
 
-import javax.webbeans.Current;
+import javax.inject.Current;
 
 class FoxRun
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/HenHouse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/HenHouse.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/HenHouse.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.injection;
 
-import javax.webbeans.Current;
+import javax.inject.Current;
 
 public class HenHouse
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -5,11 +5,10 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.webbeans.ContextNotActiveException;
-import javax.webbeans.DefinitionException;
-import javax.webbeans.NonexistentFieldException;
-import javax.webbeans.NullableDependencyException;
-import javax.webbeans.manager.Bean;
+import javax.context.ContextNotActiveException;
+import javax.inject.DefinitionException;
+import javax.inject.NullableDependencyException;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;
@@ -130,7 +129,7 @@
       assert false;
    }
 
-   @Test(groups = { "stub", "injection", "webbeansxml" }, expectedExceptions = NonexistentFieldException.class)
+   @Test(groups = { "stub", "injection", "webbeansxml" }, expectedExceptions = DefinitionException.class)
    @SpecAssertion(section = "3.7.2")
    public void testNonexistentFieldDefinedInXml()
    {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderNest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderNest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderNest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.injection;
 
-import javax.webbeans.Initializer;
+import javax.inject.Initializer;
 
 class SpiderNest
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/SpiderProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.injection;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Tuna.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/Tuna.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.injection;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/TunaFarm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/TunaFarm.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/TunaFarm.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.lookup.injection;
 
-import javax.webbeans.Current;
-import javax.webbeans.Production;
+import javax.inject.Current;
+import javax.inject.Production;
 
 @Production
 class TunaFarm

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotype.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotype.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.RequestScoped;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.context.RequestScoped;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.injectionpoint;
 
-import javax.webbeans.AnnotationLiteral;
+import javax.inject.AnnotationLiteral;
 
 class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/BeanWithInjectionPointMetadata.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/BeanWithInjectionPointMetadata.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/BeanWithInjectionPointMetadata.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -16,8 +16,8 @@
  */
 package org.jboss.webbeans.tck.unit.lookup.injectionpoint;
 
-import javax.webbeans.Current;
-import javax.webbeans.InjectionPoint;
+import javax.inject.Current;
+import javax.inject.manager.InjectionPoint;
 
 /**
  * Test bean with injection point on the constructor of the bean

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/ConstructorInjectionPointBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/ConstructorInjectionPointBean.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/ConstructorInjectionPointBean.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -16,8 +16,8 @@
  */
 package org.jboss.webbeans.tck.unit.lookup.injectionpoint;
 
-import javax.webbeans.Current;
-import javax.webbeans.Initializer;
+import javax.inject.Current;
+import javax.inject.Initializer;
 
 /**
  * Test bean to inject a bean using injection point metadata into a constructor

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/FieldInjectionPointBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/FieldInjectionPointBean.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/FieldInjectionPointBean.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -17,8 +17,8 @@
 
 package org.jboss.webbeans.tck.unit.lookup.injectionpoint;
 
-import javax.webbeans.Current;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.Current;
 
 /**
  * Test bean to inject another bean which uses injection point metadata in a

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -24,11 +24,11 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.webbeans.Current;
-import javax.webbeans.Dependent;
-import javax.webbeans.InjectionPoint;
-import javax.webbeans.Standard;
-import javax.webbeans.manager.Bean;
+import javax.context.Dependent;
+import javax.inject.Current;
+import javax.inject.Standard;
+import javax.inject.manager.Bean;
+import javax.inject.manager.InjectionPoint;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/MethodInjectionPointBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/MethodInjectionPointBean.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/MethodInjectionPointBean.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -17,8 +17,8 @@
 
 package org.jboss.webbeans.tck.unit.lookup.injectionpoint;
 
-import javax.webbeans.Current;
-import javax.webbeans.Initializer;
+import javax.inject.Current;
+import javax.inject.Initializer;
 
 /**
  * Test bean to inject a bean using injection point metadata into a constructor

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/FishFarmOffice.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/FishFarmOffice.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/FishFarmOffice.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.lookup.manager;
 
-import javax.webbeans.Current;
-import javax.webbeans.manager.Manager;
+import javax.inject.Current;
+import javax.inject.manager.Manager;
 
 class FishFarmOffice
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentType.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentType.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.DeploymentType;
+import javax.inject.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.AnnotationLiteral;
+import javax.inject.AnnotationLiteral;
 
 class AnotherDeploymentTypeLiteral extends AnnotationLiteral<AnotherDeploymentType> implements AnotherDeploymentType
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.AnnotationLiteral;
+import javax.inject.AnnotationLiteral;
 
 abstract class BindingTypeWithBindingAnnotationMemberLiteral_Broken extends AnnotationLiteral<BindingTypeWithBindingAnnotationMember_Broken> implements BindingTypeWithBindingAnnotationMember_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.AnnotationLiteral;
+import javax.inject.AnnotationLiteral;
 
 abstract class BindingTypeWithBindingArrayTypeMemberLiteral_Broken extends AnnotationLiteral<BindingTypeWithBindingArrayTypeMember_Broken> implements BindingTypeWithBindingArrayTypeMember_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Chunky.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Chunky.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Chunky.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ChunkyLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ChunkyLiteral.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ChunkyLiteral.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.AnnotationLiteral;
+import javax.inject.AnnotationLiteral;
 
 abstract class ChunkyLiteral extends AnnotationLiteral<Chunky> implements Chunky
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Cod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Cod.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Cod.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.Named;
-import javax.webbeans.Production;
+import javax.annotation.Named;
+import javax.inject.Production;
 
 @Production
 @Whitefish

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Expensive.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Expensive.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Expensive.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,8 +10,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
-import javax.webbeans.NonBinding;
+import javax.annotation.NonBinding;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ExpensiveLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ExpensiveLiteral.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ExpensiveLiteral.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.AnnotationLiteral;
+import javax.inject.AnnotationLiteral;
 
 abstract class ExpensiveLiteral extends AnnotationLiteral<Expensive> implements Expensive
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Farmer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Farmer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 class Farmer<T>

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/FinalTuna_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/FinalTuna_Broken.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/FinalTuna_Broken.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Haddock.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Haddock.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Haddock.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.Named;
-import javax.webbeans.Production;
+import javax.annotation.Named;
+import javax.inject.Production;
 
 @Production
 @Named

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -3,13 +3,13 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.webbeans.AmbiguousDependencyException;
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.DuplicateBindingTypeException;
-import javax.webbeans.TypeLiteral;
-import javax.webbeans.UnproxyableDependencyException;
-import javax.webbeans.UnsatisfiedDependencyException;
-import javax.webbeans.manager.Bean;
+import javax.inject.AmbiguousDependencyException;
+import javax.inject.AnnotationLiteral;
+import javax.inject.DuplicateBindingTypeException;
+import javax.inject.TypeLiteral;
+import javax.inject.UnproxyableDependencyException;
+import javax.inject.UnsatisfiedDependencyException;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/LadybirdSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/LadybirdSpider.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/LadybirdSpider.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.ApplicationScoped;
+import javax.context.ApplicationScoped;
 
 @ApplicationScoped
 class LadybirdSpider extends Spider

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Plaice.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Plaice.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Plaice.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.Named;
+import javax.annotation.Named;
 
 @AnotherDeploymentType
 @Whitefish

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -5,11 +5,11 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.DefinitionException;
-import javax.webbeans.DuplicateBindingTypeException;
-import javax.webbeans.TypeLiteral;
-import javax.webbeans.manager.Bean;
+import javax.inject.AnnotationLiteral;
+import javax.inject.DefinitionException;
+import javax.inject.DuplicateBindingTypeException;
+import javax.inject.TypeLiteral;
+import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Salmon.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Salmon.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Salmon.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.Named;
-import javax.webbeans.Production;
+import javax.annotation.Named;
+import javax.inject.Production;
 
 @Production
 @Named

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ScottishFishFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ScottishFishFarmer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ScottishFishFarmer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 class ScottishFishFarmer extends Farmer<ScottishFish>

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SeaBass.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SeaBass.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SeaBass.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.Production;
 
 @Production
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Sole.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Sole.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Sole.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.Named;
-import javax.webbeans.Production;
+import javax.annotation.Named;
+import javax.inject.Production;
 
 @Production
 @Whitefish

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SpiderProducer.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/SpiderProducer.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Tuna.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Tuna.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.tck.unit.lookup.typesafe;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Whitefish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Whitefish.java	2009-01-26 15:01:48 UTC (rev 1233)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/Whitefish.java	2009-01-26 15:05:01 UTC (rev 1234)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)