[webbeans-commits] Webbeans SVN: r2712 - in tck/trunk: api/src/main/java/org/jboss/jsr299/tck/api and 191 other directories.

[webbeans-commits at lists.jboss.org]

Author: dallen6
Date: 2009-05-26 08:53:17 -0400 (Tue, 26 May 2009)
New Revision: 2712

Modified:
   tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java
   tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Contexts.java
   tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299PropertiesBasedConfigurationBuilder.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Dummy.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Field.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SpecialBindingType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Donkey.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dummy.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dusk.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/ELCurrentActivityTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/EventCurrentActivityTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Field.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Horse.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InactiveScopeTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InjectedManagerCurrentActivityTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InstanceCurrentActivityTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/JndiManagerCurrentActivityTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScope.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScopeTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyApplicationBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyContextual.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MySessionBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanA.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanB.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanZ.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/FilterTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/SimpleApplicationBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/BirdFeederService.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/FMSModelIII.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/SimpleApplicationBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/SimpleApplicationBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/CloudController.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Storm.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Farm.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Fox.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxRun.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MockCreationalContext.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Stable.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Farm.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Fox.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/FoxRun.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Room.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Stable.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Big.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/FooConsumer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Helsinki.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Hyvinkaa.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jamsa_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Joensuu.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jyvaskyla.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kajaani.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kuopio_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/London_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Loviisa_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Mikkeli_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Nokia_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/NumberConsumer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Salo_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Turku.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Uusikaupunki_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Vaasa.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation2.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/CityBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/Kaarina_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/Hamina_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/Porvoo_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/CityBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/Kotka_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/Raisio_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Vantaa_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Violation.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Loviisa_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Violation.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Forssa_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Violation.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Peraseinajoki.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation2.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/British.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/CowProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/FilterTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/SimpleRequestBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/FMSModelIII.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/SimpleRequestBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/SimpleRequestBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/FilterTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/ComplicatedTuna.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cat.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Chunky.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ChunkyBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cod.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Hairy.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/HairyBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MockCreationalContext.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Order.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/OrderProcessor.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Produced.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Species.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Synchronous.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SynchronousBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/TameBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Whitefish.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/WhitefishBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairy.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairyBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DisabledDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedAnimalDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/InheritedDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/NotInheritedDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/RedSnapper.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Reindeer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/BeanWithInjectedField_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/Farmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/BeanWithInjectedField_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/Farmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/HornedAnimalDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedAnimalDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Woof.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/WoofBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/Gazelle_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Haddock.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Moose.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RedSnapper.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/SeaBass.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScope.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Dog.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Minnow.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/NotInheritedScope.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Order.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Pollock.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RedSnapper.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Retriever.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/SeaBass.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Dog.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/FishStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Bovine.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessAuthorizationDecorator.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BrokenInitializerBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/ManagerObserver.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanWithInjection.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/ManagerObserver.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ManagerObserver.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ManagerObserver.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotypeAnnotationLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingNotRuntime.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FiresBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Role.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TeaCupPomeranian.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/JavaSparrow_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TameAnnotationLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TeaCupPomeranian.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/TeaCupPomeranian.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/Boxer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/YorkshireTerrier_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/BorderTerrier.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/AustralianTerrier.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/FoxTerrier.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AuroraFinch.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BirdCage.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/FinchKeeper.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyed.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyedLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OrangeCheekedWaxbill.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/StarFinch.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotypeAnnotationLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Role.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/RoleBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/TameAnnotationLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotypeAnnotationLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Role.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/RoleBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/TameAnnotationLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeA.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeB.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeC.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogAgent.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Deadliest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Lion.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetriever.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/InitializerSimpleBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Order.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/AndalusianChicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Chicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenHutch.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Fox.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Preferred.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PremiumChickenHutch.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChickenHutch.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardVariety.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/DangerCall.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/Dottrel_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AsAnimal.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Chicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LadybirdSpider.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Static.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameAnnotationLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Chicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Foo.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BrownRecluseProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Null.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaConsumer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Working.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AppleTree.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/BeanWithStaticProducerMethod.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Chicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Deadliest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/LadybirdSpider.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Yummy.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AppleTree.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Chicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Yummy.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/FooProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Bakery.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/BrownRecluse.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/MockCreationalContext.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Null.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Request.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducerNotUsed.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/TProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Animal.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ClovenHoved.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Cow_NotBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Donkey.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEntity.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/OuterClass.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Sheep.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Tiger.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Turkey.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Cod.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Duck.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/EggProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Farm.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishPond.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Goldfish.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MyCreationalContext.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RedSnapper.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Synchronous.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/ExplicitContructorSimpleBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/InitializerSimpleBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/Another.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/SimpleBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractCow.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractHorse.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractKennel.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractStable.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Cuddly.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/FarmAnimalDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/RealizationTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Smelly.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Building.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Farmer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Landowner.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Lazy.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Yard.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/Yard.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Farmer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Landowner.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Expensive.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Shop.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Sparkly.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Expensive.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Shop.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Expensive.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Shop.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Building.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Farmer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Landowner.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Lazy.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/Yard.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Farmer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Landowner.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Farmer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Landowner.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Chunky.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Cod.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Haddock.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Salmon.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/SeaBass.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Sole.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Whitefish.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Cod.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Sole.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Fox.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/TunedTuna.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/InjectionPointBean_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/FinalMethodTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/InjectionPointBean_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/PrivateConstructorTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FinalTuna_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FishFarm.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/BrokenInjectedBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/InjectedBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/Other.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/OtherLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayBy.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParamBean_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableBean_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/WildcardBean_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/TunaFarm.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Fox.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/FoxRun.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/HenHouse.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderNest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/TunaFarm.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/EnterpriseBeanInjectionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/HenHouse.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoor.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouseProducer_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouse_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/FishFarmOffice.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Farm.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/TestServlet.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Chunky.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Cod.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/FakeFish.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/InstantiationByTypeTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Salmon.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Sole.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Whitefish.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Chunky.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cod.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FakeFish.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FishILike.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Haddock.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/LadybirdSpider.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Salmon.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SeaBass.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Sole.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Whitefish.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestBindingType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestNamed.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestScopeType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/TestDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/NamespaceAggregationTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/TestDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/copy/AnotherDeploymentType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/multipleTypes/MultipleTypesInAggregatedNamespacesTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/Order.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/TestBindingType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerAddress.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerName.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PrimitiveTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PurchaseOrder.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/beans.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml
   tck/trunk/impl/src/main/resources/tck-audit.xml
   tck/trunk/interceptor/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java
   tck/trunk/pom.xml
   tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java
   tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
Log:
Updated TCK to latest JSR-299 API

Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.api;
 
-import javax.context.Context;
+import javax.enterprise.context.spi.Context;
 
 import org.jboss.jsr299.tck.spi.Beans;
 import org.jboss.jsr299.tck.spi.Contexts;

Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Contexts.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Contexts.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Contexts.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.spi;
 
-import javax.context.Context;
+import javax.enterprise.context.spi.Context;
 
 
 /**

Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -3,7 +3,7 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.spi.BeanManager;
 
 /**
  * This interface provides operations relating to a Manager.
@@ -23,7 +23,7 @@
     * 
     * @return the Manager 
     */
-   public Manager getManager();
+   public BeanManager getManager();
    
    /**
     * Returns a list of the enabled deployment types for the current manager

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -11,8 +11,8 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.context.Context;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.inject.spi.BeanManager;
 
 import org.jboss.jsr299.tck.api.JSR299Configuration;
 import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl;
@@ -55,15 +55,15 @@
    
    }
    
-   private Manager currentManager;
+   private BeanManager currentManager;
    
-   protected void setCurrentManager(Manager currentManager)
+   protected void setCurrentManager(BeanManager currentManager)
    {
       this.currentManager = currentManager;
    }
    
 
-   protected Manager getCurrentManager()
+   protected BeanManager getCurrentManager()
    {
       return currentManager;
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -4,64 +4,56 @@
 import java.lang.reflect.Type;
 import java.util.Set;
 
-import javax.context.CreationalContext;
-import javax.inject.manager.Bean;
-import javax.inject.manager.InjectionPoint;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.Bean;
 
-public abstract class ForwardingBean<T> extends Bean<T>
+public abstract class ForwardingBean<T> implements Bean<T>
 {
    
-   protected ForwardingBean(Manager manager)
+   protected ForwardingBean(BeanManager beanManager)
    {
-      super(manager);
    }
 
    protected abstract Bean<T> delegate();
 
-   @Override
    public Set<Annotation> getBindings()
    {
       return delegate().getBindings();
    }
 
-   @Override
    public Class<? extends Annotation> getDeploymentType()
    {
       return delegate().getDeploymentType();
    }
 
-   @Override
-   public Set<? extends InjectionPoint> getInjectionPoints()
+   public Set<InjectionPoint> getInjectionPoints()
    {
       return delegate().getInjectionPoints();
    }
 
-   @Override
    public String getName()
    {
       return delegate().getName();
    }
 
-   @Override
    public Class<? extends Annotation> getScopeType()
    {
       return delegate().getScopeType();
    }
 
-   @Override
-   public Set<? extends Type> getTypes()
+   public Set<Type> getTypes()
    {
       return delegate().getTypes();
    }
 
-   @Override
    public boolean isNullable()
    {
       return delegate().isNullable();
    }
 
-   @Override
    public boolean isSerializable()
    {
       return delegate().isSerializable();

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.impl;
 
-import javax.context.Context;
+import javax.enterprise.context.spi.Context;
 
 import org.jboss.jsr299.tck.api.JSR299Configuration;
 import org.jboss.jsr299.tck.spi.Beans;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299PropertiesBasedConfigurationBuilder.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299PropertiesBasedConfigurationBuilder.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299PropertiesBasedConfigurationBuilder.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 
-import javax.context.Context;
+import javax.enterprise.context.spi.Context;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.jsr299.tck.api.JSR299Configuration;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.literals;
 
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Current;
 
 /**
  * Annotation literal for @Current

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.literals;
 
-import javax.inject.AnnotationLiteral;
-import javax.inject.New;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.New;
 
 public class NewLiteral extends AnnotationLiteral<New> implements New
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,17 +6,18 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.context.Context;
-import javax.context.Contextual;
-import javax.context.CreationalContext;
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
+import javax.enterprise.inject.deployment.Production;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
 import javax.event.Observer;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Production;
-import javax.inject.UnsatisfiedDependencyException;
-import javax.inject.manager.Bean;
-import javax.inject.manager.InjectionPoint;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -37,59 +38,51 @@
       DEFAULT_BINDINGS.add(new CurrentLiteral());
    }
    
-   private Bean<?> createDummyBean(Manager manager, final Type injectionPointType)
+   private Bean<?> createDummyBean(BeanManager beanManager, final Type injectionPointType)
    {
       final Set<InjectionPoint> injectionPoints = new HashSet<InjectionPoint>();
       final Set<Type> types = new HashSet<Type>();
       final Set<Annotation> bindings = new HashSet<Annotation>();
       bindings.add(new AnnotationLiteral<Tame>() {});
       types.add(Object.class);
-      final Bean<?> bean = new Bean<Object>(manager)
+      final Bean<?> bean = new Bean<Object>()
       {
 
-         @Override
          public Set<Annotation> getBindings()
          {
             return bindings;
          }
 
-         @Override
          public Class<? extends Annotation> getDeploymentType()
          {
             return Production.class;
          }
 
-         @Override
-         public Set<? extends InjectionPoint> getInjectionPoints()
+         public Set<InjectionPoint> getInjectionPoints()
          {
             return injectionPoints;
          }
 
-         @Override
          public String getName()
          {
             return null;
          }
 
-         @Override
          public Class<? extends Annotation> getScopeType()
          {
             return Dependent.class;
          }
 
-         @Override
          public Set<Type> getTypes()
          {
             return types;
          }
 
-         @Override
          public boolean isNullable()
          {
             return false;
          }
 
-         @Override
          public boolean isSerializable()
          {
             return false;
@@ -182,23 +175,23 @@
    })
    public void testBeanBelongingToParentActivityBelongsToChildActivity()
    {
-      assert getCurrentManager().resolveByType(Cow.class).size() == 1;
-      Bean<?> bean = getCurrentManager().resolveByType(Cow.class).iterator().next();
-      Manager childActivity = getCurrentManager().createActivity();
-      assert childActivity.resolveByType(Cow.class).size() == 1;
-      assert childActivity.resolveByType(Cow.class).iterator().next().equals(bean);
+      assert getCurrentManager().getBeans(Cow.class).size() == 1;
+      Bean<?> bean = getCurrentManager().getBeans(Cow.class).iterator().next();
+      BeanManager childActivity = getCurrentManager().createActivity();
+      assert childActivity.getBeans(Cow.class).size() == 1;
+      assert childActivity.getBeans(Cow.class).iterator().next().equals(bean);
    }
    
    @Test
    @SpecAssertion(section="11.6", id="c")
    public void testBeanBelongingToParentActivityCanBeInjectedIntoChildActivityBean()
    {
-      assert getCurrentManager().resolveByType(Cow.class).size() == 1;
-      Bean<?> bean = getCurrentManager().resolveByType(Cow.class).iterator().next();
-      Manager childActivity = getCurrentManager().createActivity();
+      assert getCurrentManager().getBeans(Cow.class).size() == 1;
+      Bean<?> bean = getCurrentManager().getBeans(Cow.class).iterator().next();
+      BeanManager childActivity = getCurrentManager().createActivity();
       Bean<?> dummyBean = createDummyBean(childActivity, Cow.class);
       childActivity.addBean(dummyBean);
-      assert childActivity.getInstanceToInject(dummyBean.getInjectionPoints().iterator().next()) != null;
+      assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), null) != null;
    }
    
    @Test
@@ -210,7 +203,7 @@
    {
       assert getCurrentManager().resolveObservers(new NightTime()).size() == 1;
       Observer<?> observer = getCurrentManager().resolveObservers(new NightTime()).iterator().next();
-      Manager childActivity = getCurrentManager().createActivity();
+      BeanManager childActivity = getCurrentManager().createActivity();
       assert childActivity.resolveObservers(new NightTime()).size() == 1;
       assert childActivity.resolveObservers(new NightTime()).iterator().next().equals(observer);
    }
@@ -220,7 +213,7 @@
    public void testObserverBelongingToParentFiresForChildActivity()
    {
       Fox.setObserved(false);
-      Manager childActivity = getCurrentManager().createActivity();
+      BeanManager childActivity = getCurrentManager().createActivity();
       childActivity.fireEvent(new NightTime());
       assert Fox.isObserved();
    }
@@ -240,7 +233,7 @@
          
       };
       getCurrentManager().addContext(context);
-      Manager childActivity = getCurrentManager().createActivity();
+      BeanManager childActivity = getCurrentManager().createActivity();
       assert childActivity.getContext(Dummy.class) != null;
    }
    
@@ -248,22 +241,22 @@
    @SpecAssertion(section="11.6", id="o")
    public void testBeanBelongingToChildActivityCannotBeInjectedIntoParentActivityBean()
    {
-      assert getCurrentManager().resolveByType(Cow.class).size() == 1;
-      Manager childActivity = getCurrentManager().createActivity();
+      assert getCurrentManager().getBeans(Cow.class).size() == 1;
+      BeanManager childActivity = getCurrentManager().createActivity();
       Bean<?> dummyBean = createDummyBean(childActivity, Cow.class);
       childActivity.addBean(dummyBean);
-      assert getCurrentManager().resolveByType(Object.class, new AnnotationLiteral<Tame>() {}).size() == 0;
+      assert getCurrentManager().getBeans(Object.class, new AnnotationLiteral<Tame>() {}).size() == 0;
    }
    
-   @Test(expectedExceptions=UnsatisfiedDependencyException.class)
+   @Test(expectedExceptions=UnsatisfiedResolutionException.class)
    @SpecAssertion(section="11.6", id="r")
    public void testInstanceProcessedByParentActivity()
    {
       Context dummyContext = new DummyContext();
       getCurrentManager().addContext(dummyContext);
-      assert getCurrentManager().resolveByType(Cow.class).size() == 1;
-      final Bean<Cow> bean = getCurrentManager().resolveByType(Cow.class).iterator().next();
-      Manager childActivity = getCurrentManager().createActivity();
+      assert getCurrentManager().getBeans(Cow.class).size() == 1;
+      final Bean<Cow> bean = getCurrentManager().getBeans(Cow.class).iterator().next();
+      BeanManager childActivity = getCurrentManager().createActivity();
       final Set<Annotation> bindingTypes = new HashSet<Annotation>();
       bindingTypes.add(new AnnotationLiteral<Tame>() {});
       childActivity.addBean(new ForwardingBean<Cow>(childActivity)
@@ -289,7 +282,7 @@
    @SpecAssertion(section="11.6", id="s")
    public void testObserverBelongingToChildDoesNotFireForParentActivity()
    {
-      Manager childActivity = getCurrentManager().createActivity();
+      BeanManager childActivity = getCurrentManager().createActivity();
       Observer<NightTime> observer = new Observer<NightTime>()
       {
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Dummy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Dummy.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Dummy.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -13,7 +13,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.context.ScopeType;
+import javax.enterprise.context.ScopeType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Field.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Field.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Field.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.activities;
 
-import javax.inject.Instance;
+import javax.enterprise.inject.Instance;
 import javax.inject.Obtains;
 
 class Field

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -5,14 +5,14 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.context.CreationalContext;
-import javax.context.Dependent;
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.deployment.Production;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
 import javax.inject.DeploymentException;
-import javax.inject.Production;
-import javax.inject.manager.Bean;
-import javax.inject.manager.InjectionPoint;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -30,59 +30,51 @@
       DEFAULT_BINDINGS.add(new CurrentLiteral());
    }
    
-   private Bean<?> createDummyBean(Manager manager)
+   private Bean<?> createDummyBean(BeanManager beanManager)
    {
       final Set<InjectionPoint> injectionPoints = new HashSet<InjectionPoint>();
       final Set<Type> types = new HashSet<Type>();
       final Set<Annotation> bindings = new HashSet<Annotation>();
       bindings.add(new AnnotationLiteral<SpecialBindingType>() {});
       types.add(Object.class);
-      final Bean<?> bean = new Bean<MyBean>(manager)
+      final Bean<?> bean = new Bean<MyBean>()
       {
 
-         @Override
          public Set<Annotation> getBindings()
          {
             return bindings;
          }
 
-         @Override
          public Class<? extends Annotation> getDeploymentType()
          {
             return Production.class;
          }
 
-         @Override
-         public Set<? extends InjectionPoint> getInjectionPoints()
+         public Set<InjectionPoint> getInjectionPoints()
          {
             return injectionPoints;
          }
 
-         @Override
          public String getName()
          {
             return null;
          }
 
-         @Override
          public Class<? extends Annotation> getScopeType()
          {
             return Dependent.class;
          }
 
-         @Override
          public Set<Type> getTypes()
          {
             return types;
          }
 
-         @Override
          public boolean isNullable()
          {
             return false;
          }
 
-         @Override
          public boolean isSerializable()
          {
             return false;
@@ -106,7 +98,7 @@
    @SpecAssertion(section="11.6", id="t")
    public void testSameBeanTypeInChildAsParentInjection()
    {
-      Manager childActivity = getCurrentManager().createActivity();
+      BeanManager childActivity = getCurrentManager().createActivity();
       Bean<?> anotherMyBean = createDummyBean(childActivity);
       childActivity.addBean(anotherMyBean);
    }
@@ -115,8 +107,8 @@
    @SpecAssertion(section="11.6", id="u")
    public void testSameBeanTypeInChildAsIndirectParentInjection()
    {
-      Manager childActivity = getCurrentManager().createActivity();
-      Manager grandChildActivity = childActivity.createActivity();
+      BeanManager childActivity = getCurrentManager().createActivity();
+      BeanManager grandChildActivity = childActivity.createActivity();
       Bean<?> anotherMyBean = createDummyBean(grandChildActivity);
       grandChildActivity.addBean(anotherMyBean);
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SpecialBindingType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SpecialBindingType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SpecialBindingType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Retention(RUNTIME)
 @Target({TYPE, METHOD, FIELD, PARAMETER})

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Donkey.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Donkey.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Donkey.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,22 +1,22 @@
 package org.jboss.jsr299.tck.tests.activities.current;
 
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
 class Donkey
 {
    
-   Manager manager;
+   BeanManager beanManager;
    
    public Donkey() throws NamingException
    {
-      manager = (Manager) new InitialContext().lookup("java:app/Manager");
+      beanManager = (BeanManager) new InitialContext().lookup("java:app/Manager");
    }
    
-   public Manager getManager()
+   public BeanManager getManager()
    {
-      return manager;
+      return beanManager;
    }
    
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dummy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dummy.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dummy.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -13,7 +13,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.context.ScopeType;
+import javax.enterprise.context.ScopeType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dusk.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dusk.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dusk.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.activities.current;
 
+import javax.enterprise.inject.Initializer;
 import javax.event.Event;
 import javax.event.Fires;
-import javax.inject.Initializer;
 
 class Dusk
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/ELCurrentActivityTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/ELCurrentActivityTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/ELCurrentActivityTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,16 +6,16 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.context.Context;
-import javax.context.Contextual;
-import javax.context.CreationalContext;
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.deployment.Production;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
 import javax.event.Observer;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Production;
-import javax.inject.manager.Bean;
-import javax.inject.manager.InjectionPoint;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -66,7 +66,7 @@
       
    }
    
-   private static class Daisy extends Bean<Cow>
+   private static class Daisy implements Bean<Cow>
    {
       
       private static final Set<Type> TYPES = new HashSet<Type>();
@@ -81,54 +81,45 @@
          BINDING_TYPES.add(new AnnotationLiteral<Tame>() {});
       }
       
-      public Daisy(Manager manager)
+      public Daisy(BeanManager beanManager)
       {
-         super(manager);
       }
 
-      @Override
       public Set<Annotation> getBindings()
       {
          return BINDING_TYPES;
       }
 
-      @Override
       public Class<? extends Annotation> getDeploymentType()
       {
          return Production.class;
       }
 
-      @Override
-      public Set<? extends InjectionPoint> getInjectionPoints()
+      public Set<InjectionPoint> getInjectionPoints()
       {
          return Collections.emptySet();
       }
 
-      @Override
       public String getName()
       {
          return "daisy";
       }
 
-      @Override
       public Class<? extends Annotation> getScopeType()
       {
          return Dependent.class;
       }
 
-      @Override
       public Set<Type> getTypes()
       {
          return TYPES;
       }
 
-      @Override
       public boolean isNullable()
       {
          return true;
       }
 
-      @Override
       public boolean isSerializable()
       {
          return false;
@@ -163,8 +154,8 @@
    {
       Context dummyContext = new DummyContext();
       getCurrentManager().addContext(dummyContext);
-      assert getCurrentManager().resolveByType(Cow.class).size() == 1;
-      Manager childActivity = getCurrentManager().createActivity();
+      assert getCurrentManager().getBeans(Cow.class).size() == 1;
+      BeanManager childActivity = getCurrentManager().createActivity();
       childActivity.addBean(new Daisy(childActivity));
       childActivity.setCurrent(dummyContext.getScopeType());
       assert getCurrentConfiguration().getEl().evaluateValueExpression("#{daisy}", Cow.class) != null;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/EventCurrentActivityTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/EventCurrentActivityTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/EventCurrentActivityTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,11 +2,11 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.context.Context;
-import javax.context.Contextual;
-import javax.context.CreationalContext;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Observer;
-import javax.inject.manager.Manager;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -66,7 +66,7 @@
    {
       Context dummyContext = new DummyContext();
       getCurrentManager().addContext(dummyContext);
-      Manager childActivity = getCurrentManager().createActivity();
+      BeanManager childActivity = getCurrentManager().createActivity();
       TestableObserver<NightTime> observer = new TestableObserver<NightTime>()
       {
          

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Field.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Field.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Field.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.activities.current;
 
-import javax.inject.Instance;
+import javax.enterprise.inject.Instance;
 import javax.inject.Obtains;
 
 class Field

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Horse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Horse.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Horse.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,16 +1,16 @@
 package org.jboss.jsr299.tck.tests.activities.current;
 
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 
 class Horse
 {
    
-   @Current Manager manager;
+   @Current BeanManager beanManager;
    
-   public Manager getManager()
+   public BeanManager getManager()
    {
-      return manager;
+      return beanManager;
    }
    
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InactiveScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InactiveScopeTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InactiveScopeTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,12 +2,12 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.context.Context;
-import javax.context.ContextNotActiveException;
-import javax.context.Contextual;
-import javax.context.CreationalContext;
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Observer;
-import javax.inject.manager.Manager;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -65,7 +65,7 @@
       DummyContext dummyContext = new DummyContext();
       dummyContext.setActive(false);
       getCurrentManager().addContext(dummyContext);
-      Manager childActivity = getCurrentManager().createActivity();
+      BeanManager childActivity = getCurrentManager().createActivity();
       childActivity.setCurrent(dummyContext.getScopeType());
    }
    

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InjectedManagerCurrentActivityTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InjectedManagerCurrentActivityTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InjectedManagerCurrentActivityTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,11 +2,11 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.context.Context;
-import javax.context.Contextual;
-import javax.context.CreationalContext;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Observer;
-import javax.inject.manager.Manager;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -62,8 +62,8 @@
    {
       Context dummyContext = new DummyContext();
       getCurrentManager().addContext(dummyContext);
-      assert getCurrentManager().resolveByType(Cow.class).size() == 1;
-      Manager childActivity = getCurrentManager().createActivity();
+      assert getCurrentManager().getBeans(Cow.class).size() == 1;
+      BeanManager childActivity = getCurrentManager().createActivity();
       childActivity.setCurrent(dummyContext.getScopeType());
       assert getCurrentManager().getInstanceByType(Horse.class).getManager().equals(childActivity);
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InstanceCurrentActivityTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InstanceCurrentActivityTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InstanceCurrentActivityTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,16 +6,16 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.context.Context;
-import javax.context.Contextual;
-import javax.context.CreationalContext;
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.deployment.Production;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
 import javax.event.Observer;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Production;
-import javax.inject.manager.Bean;
-import javax.inject.manager.InjectionPoint;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -79,7 +79,7 @@
       
    }
    
-   private static class Daisy extends Bean<Cow>
+   private static class Daisy implements Bean<Cow>
    {
       
       private static final Set<Type> TYPES = new HashSet<Type>();
@@ -94,54 +94,45 @@
          BINDING_TYPES.add(new TameLiteral());
       }
       
-      public Daisy(Manager manager)
+      public Daisy(BeanManager beanManager)
       {
-         super(manager);
       }
 
-      @Override
       public Set<Annotation> getBindings()
       {
          return BINDING_TYPES;
       }
 
-      @Override
       public Class<? extends Annotation> getDeploymentType()
       {
          return Production.class;
       }
 
-      @Override
-      public Set<? extends InjectionPoint> getInjectionPoints()
+      public Set<InjectionPoint> getInjectionPoints()
       {
          return Collections.emptySet();
       }
 
-      @Override
       public String getName()
       {
          return "daisy";
       }
 
-      @Override
       public Class<? extends Annotation> getScopeType()
       {
          return Dependent.class;
       }
 
-      @Override
       public Set<Type> getTypes()
       {
          return TYPES;
       }
 
-      @Override
       public boolean isNullable()
       {
          return true;
       }
 
-      @Override
       public boolean isSerializable()
       {
          return false;
@@ -176,8 +167,8 @@
    {
       Context dummyContext = new DummyContext();
       getCurrentManager().addContext(dummyContext);
-      assert getCurrentManager().resolveByType(Cow.class).size() == 1;
-      Manager childActivity = getCurrentManager().createActivity();
+      assert getCurrentManager().getBeans(Cow.class).size() == 1;
+      BeanManager childActivity = getCurrentManager().createActivity();
       childActivity.addBean(new Daisy(childActivity));
       childActivity.setCurrent(dummyContext.getScopeType());
       assert getCurrentManager().getInstanceByType(Field.class).get() != null;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/JndiManagerCurrentActivityTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/JndiManagerCurrentActivityTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/JndiManagerCurrentActivityTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,11 +2,11 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.context.Context;
-import javax.context.Contextual;
-import javax.context.CreationalContext;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Observer;
-import javax.inject.manager.Manager;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -65,8 +65,8 @@
    {
       Context dummyContext = new DummyContext();
       getCurrentManager().addContext(dummyContext);
-      assert getCurrentManager().resolveByType(Cow.class).size() == 1;
-      Manager childActivity = getCurrentManager().createActivity();
+      assert getCurrentManager().getBeans(Cow.class).size() == 1;
+      BeanManager childActivity = getCurrentManager().createActivity();
       childActivity.setCurrent(dummyContext.getScopeType());
       assert getCurrentManager().getInstanceByType(Donkey.class).getManager().equals(childActivity);
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScope.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScope.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScope.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -13,7 +13,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.context.ScopeType;
+import javax.enterprise.context.ScopeType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScopeTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScopeTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,11 +2,11 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.context.Context;
-import javax.context.Contextual;
-import javax.context.CreationalContext;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Observer;
-import javax.inject.manager.Manager;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -74,7 +74,7 @@
    {
       Context dummyContext = new NonNormalContext();
       getCurrentManager().addContext(dummyContext);
-      Manager childActivity = getCurrentManager().createActivity();
+      BeanManager childActivity = getCurrentManager().createActivity();
       childActivity.setCurrent(dummyContext.getScopeType());
    }
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,14 +2,14 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.context.ApplicationScoped;
-import javax.context.Context;
-import javax.context.ContextNotActiveException;
-import javax.context.Contextual;
-import javax.context.CreationalContext;
-import javax.context.Dependent;
-import javax.context.RequestScoped;
-import javax.context.SessionScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.context;
 
-import javax.context.ApplicationScoped;
-import javax.context.SessionScoped;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -16,7 +16,7 @@
    @SpecAssertion(section = "8.1", id = "g")
    public void testDestroyedInstanceMustNotBeReturnedByGet()
    {
-      Bean<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next();
+      Bean<MySessionBean> mySessionBean = getCurrentManager().getBeans(MySessionBean.class).iterator().next();
       MyCreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>();
       MySessionBean beanInstance = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext);
       assert beanInstance != null;
@@ -25,7 +25,7 @@
       beanInstance = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean);
       assert beanInstance == null;
       
-      Bean<MyApplicationBean> myApplicationBean = getCurrentManager().resolveByType(MyApplicationBean.class).iterator().next();
+      Bean<MyApplicationBean> myApplicationBean = getCurrentManager().getBeans(MyApplicationBean.class).iterator().next();
       MyCreationalContext<MyApplicationBean> myCreationalContextForApplication = new MyCreationalContext<MyApplicationBean>();
       MyApplicationBean myApplicationBeanInstance = getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean, myCreationalContextForApplication);
       assert myApplicationBeanInstance != null;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.context;
 
-import javax.context.Context;
-import javax.context.ContextNotActiveException;
-import javax.context.Contextual;
-import javax.context.SessionScoped;
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -21,7 +21,7 @@
       assert sessionContext.isActive();
       setContextInactive(sessionContext);
 
-      Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next();
+      Contextual<MySessionBean> mySessionBean = getCurrentManager().getBeans(MySessionBean.class).iterator().next();
       sessionContext.get(mySessionBean);
    }
    

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.context;
 
-import javax.context.ApplicationScoped;
-import javax.context.Contextual;
-import javax.context.CreationalContext;
-import javax.context.SessionScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -17,10 +17,10 @@
    @SpecAssertion(section = "8.1", id = "e")
    public void testGetMayNotCreateNewInstanceUnlessCreationalContextGiven()
    {
-      Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next();
+      Contextual<MySessionBean> mySessionBean = getCurrentManager().getBeans(MySessionBean.class).iterator().next();
       assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean) == null;
 
-      Contextual<MyApplicationBean> myApplicationBean = getCurrentManager().resolveByType(MyApplicationBean.class).iterator().next();
+      Contextual<MyApplicationBean> myApplicationBean = getCurrentManager().getBeans(MyApplicationBean.class).iterator().next();
       assert getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean) == null;
 
       // Now try same operation with a CreationalContext

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.context;
 
-import javax.context.Contextual;
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.spi.Contextual;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -15,7 +15,7 @@
    @SpecAssertion(section = "8.1", id = "b")
    public void testGetWithoutCreationalContextReturnsNull()
    {
-      Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next();
+      Contextual<MySessionBean> mySessionBean = getCurrentManager().getBeans(MySessionBean.class).iterator().next();
       assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean) == null;
    }
    

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.context;
 
-import javax.context.ContextNotActiveException;
-import javax.context.RequestScoped;
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.RequestScoped;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyApplicationBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyApplicationBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyApplicationBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 class MyApplicationBean implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyContextual.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyContextual.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyContextual.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,68 +8,59 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.context.CreationalContext;
-import javax.context.SessionScoped;
-import javax.inject.Standard;
-import javax.inject.manager.Bean;
-import javax.inject.manager.InjectionPoint;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.deployment.Standard;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.Bean;
 
-class MyContextual extends Bean<MySessionBean>
+class MyContextual implements Bean<MySessionBean>
 {
    private boolean createCalled = false;
    private boolean destroyCalled = false;
    private boolean shouldReturnNullInstances = false;
 
-   protected MyContextual(Manager manager)
+   protected MyContextual(BeanManager beanManager)
    {
-      super(manager);
    }
 
-   @Override
    public Set<Annotation> getBindings()
    {
       return Collections.emptySet();
    }
 
-   @Override
    public Class<? extends Annotation> getDeploymentType()
    {
       return Standard.class;
    }
 
-   @Override
-   public Set<? extends InjectionPoint> getInjectionPoints()
+   public Set<InjectionPoint> getInjectionPoints()
    {
       return Collections.emptySet();
    }
 
-   @Override
    public String getName()
    {
       return "my-session-bean";
    }
 
-   @Override
    public Class<? extends Annotation> getScopeType()
    {
       return SessionScoped.class;
    }
 
    @SuppressWarnings("unchecked")
-   @Override
    public Set<Type> getTypes()
    {
       return new HashSet<Type>(Arrays.asList(Object.class, MySessionBean.class, Serializable.class));
    }
 
-   @Override
    public boolean isNullable()
    {
       return false;
    }
 
-   @Override
    public boolean isSerializable()
    {
       return true;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context;
 
-import javax.context.CreationalContext;
+import javax.enterprise.context.spi.CreationalContext;
 
 class MyCreationalContext<T> implements CreationalContext<T>
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MySessionBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MySessionBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MySessionBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
 
 @SessionScoped
 class MySessionBean implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.context;
 
-import javax.context.Context;
-import javax.context.Contextual;
-import javax.context.CreationalContext;
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -31,7 +31,7 @@
    } )
    public void testGetReturnsExistingInstance()
    {
-      Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next();
+      Contextual<MySessionBean> mySessionBean = getCurrentManager().getBeans(MySessionBean.class).iterator().next();
       MyCreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>();
       MySessionBean beanInstance = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext);
       assert beanInstance != null;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanA.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanA.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanA.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
 
 @SessionScoped
 public class SimpleBeanA implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanB.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanB.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanB.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
 
 @SessionScoped
 public class SimpleBeanB implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanZ.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanZ.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanZ.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
 
 @SessionScoped
 public class SimpleBeanZ implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/FilterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/FilterTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/FilterTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,9 +2,9 @@
 
 import java.io.IOException;
 
-import javax.context.ApplicationScoped;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
@@ -16,7 +16,7 @@
 public class FilterTest implements Filter
 {
    @Current
-   private Manager jsr299Manager;
+   private BeanManager jsr299Manager;
 
    public void destroy()
    {
@@ -43,7 +43,7 @@
          if (jsr299Manager == null)
          {
             InitialContext ic = new InitialContext();
-            jsr299Manager = (Manager) ic.lookup("java:app/Manager");
+            jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
          }
       }
       catch (Exception e)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.servlet.ServletConfig;
@@ -17,7 +17,7 @@
    private static final long serialVersionUID = 1L;
 
    @Current
-   private Manager jsr299Manager;
+   private BeanManager jsr299Manager;
 
    @Override
    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
@@ -34,7 +34,7 @@
       try
       {
          InitialContext ic = new InitialContext();
-         jsr299Manager = (Manager) ic.lookup("java:app/Manager");
+         jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
       }
       catch (NamingException e)
       {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -19,9 +19,9 @@
 
 import java.io.IOException;
 
-import javax.context.ApplicationScoped;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.servlet.ServletConfig;
@@ -42,7 +42,7 @@
    private static final long serialVersionUID = 1L;
    
    @Current
-   private Manager jsr299Manager;
+   private BeanManager jsr299Manager;
 
    @Override
    protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
@@ -71,7 +71,7 @@
       try
       {
          InitialContext ic = new InitialContext();
-         jsr299Manager = (Manager) ic.lookup("java:app/Manager");
+         jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
       }
       catch (NamingException e)
       {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/SimpleApplicationBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/SimpleApplicationBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/SimpleApplicationBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.application;
 
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 class SimpleApplicationBean

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/BirdFeederService.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/BirdFeederService.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/BirdFeederService.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.context.application.ejb;
 
-import javax.context.ApplicationScoped;
 import javax.ejb.Stateless;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.jws.WebMethod;
 import javax.jws.WebService;
 
@@ -12,7 +12,7 @@
 public class BirdFeederService implements FeederService
 {
    @Current
-   private Manager jsr299Manager;
+   private BeanManager jsr299Manager;
 
    private static boolean applicationScopeActive = false;
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/FMSModelIII.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/FMSModelIII.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/FMSModelIII.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,13 +1,13 @@
 package org.jboss.jsr299.tck.tests.context.application.ejb;
 
 import javax.annotation.Resource;
-import javax.context.ApplicationScoped;
 import javax.ejb.Stateless;
 import javax.ejb.Timeout;
 import javax.ejb.Timer;
 import javax.ejb.TimerService;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 
 @Stateless
 public class FMSModelIII implements FMS
@@ -18,7 +18,7 @@
    private TimerService timerService;
    
    @Current
-   private Manager manager;
+   private BeanManager beanManager;
 
    private static boolean applicationScopeActive = false;
    private static double beanId = 0.0d;
@@ -47,19 +47,19 @@
    @Timeout
    public void timeout(Timer timer)
    {
-      if (manager.getContext(ApplicationScoped.class).isActive())
+      if (beanManager.getContext(ApplicationScoped.class).isActive())
       {
          applicationScopeActive = true;
          if (beanId > 0.0)
          {
-            if (beanId == manager.getInstanceByType(SimpleApplicationBean.class).getId())
+            if (beanId == beanManager.getInstanceByType(SimpleApplicationBean.class).getId())
             {
                sameBean = true;
             }
          }
          else
          {
-            beanId = manager.getInstanceByType(SimpleApplicationBean.class).getId();
+            beanId = beanManager.getInstanceByType(SimpleApplicationBean.class).getId();
          }
       }
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/SimpleApplicationBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/SimpleApplicationBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/SimpleApplicationBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.application.ejb;
 
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 class SimpleApplicationBean

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/SimpleApplicationBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/SimpleApplicationBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/SimpleApplicationBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.application.standalone;
 
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 class SimpleApplicationBean

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,21 +1,21 @@
 package org.jboss.jsr299.tck.tests.context.application.standalone;
 
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Asynchronously;
 import javax.event.Observes;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
 
 class TcasDisplay
 {
    @Current
-   private Manager manager;
+   private BeanManager beanManager;
    
    private static boolean applicationScopeActive = false;
    
    public void drawTarget(@Observes @Asynchronously TargetEvent targetEvent)
    {
-      if (manager.getContext(ApplicationScoped.class).isActive())
+      if (beanManager.getContext(ApplicationScoped.class).isActive())
       {
          applicationScopeActive = true;
       }
@@ -27,7 +27,7 @@
 
    public void drawNearMiss(@Observes @Asynchronously NearMiss event)
    {
-      event.setBean(manager.getInstanceByType(SimpleApplicationBean.class));
+      event.setBean(beanManager.getInstanceByType(SimpleApplicationBean.class));
    }
 
    public static boolean isApplicationScopeActive()

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,18 +1,18 @@
 package org.jboss.jsr299.tck.tests.context.application.standalone;
 
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Asynchronously;
 import javax.event.Observes;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
 
 class TcasToFmsLink
 {
    @Current
-   private Manager manager;
+   private BeanManager beanManager;
    
    public void avoidanceAction(@Observes @Asynchronously NearMiss event)
    {
-      event.setBean(manager.getInstanceByType(SimpleApplicationBean.class));
+      event.setBean(beanManager.getInstanceByType(SimpleApplicationBean.class));
    }
 
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.conversation;
 
-import javax.context.Conversation;
+import javax.enterprise.context.Conversation;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,10 +2,10 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.context.Conversation;
-import javax.context.RequestScoped;
-import javax.inject.Current;
-import javax.inject.Standard;
+import javax.enterprise.context.Conversation;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.deployment.Standard;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -34,21 +34,21 @@
    @SpecAssertion(section = "8.5.4", id = "ia")
    public void testBeanWithTypeConversation()
    {
-      assert getCurrentManager().resolveByType(Conversation.class).size() == 1;
+      assert getCurrentManager().getBeans(Conversation.class).size() == 1;
    }
    
    @Test(groups = { "contexts" })
    @SpecAssertion(section = "8.5.4", id = "ib")
    public void testBeanWithRequestScope()
    {
-      assert getCurrentManager().resolveByType(Conversation.class).iterator().next().getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().getBeans(Conversation.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }
    
    @Test(groups = { "contexts" })
    @SpecAssertion(section = "8.5.4", id = "ic")
    public void testBeanWithDeploymentTypeStandard()
    {
-      assert getCurrentManager().resolveByType(Conversation.class).iterator().next().getDeploymentType().equals(Standard.class);
+      assert getCurrentManager().getBeans(Conversation.class).iterator().next().getDeploymentType().equals(Standard.class);
    }
    
    @Test(groups = { "contexts" })
@@ -56,7 +56,7 @@
    public void testBeanWithBindingCurrent()
    {
       boolean found = false;
-      for (Annotation binding : getCurrentManager().resolveByType(Conversation.class).iterator().next().getBindings())
+      for (Annotation binding : getCurrentManager().getBeans(Conversation.class).iterator().next().getBindings())
       {
          if (binding.annotationType().equals(Current.class))
          {
@@ -70,7 +70,7 @@
    @SpecAssertion(section = "8.5.4", id = "ie")
    public void testBeanWithNameJavaxContextConversation()
    {
-      assert getCurrentManager().resolveByType(Conversation.class).iterator().next().getName().equals("javax.context.conversation");
+      assert getCurrentManager().getBeans(Conversation.class).iterator().next().getName().equals("javax.context.conversation");
    }
 
 }
\ No newline at end of file

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.conversation;
 
-import javax.context.Conversation;
+import javax.enterprise.context.Conversation;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.conversation;
 
-import javax.context.Conversation;
+import javax.enterprise.context.Conversation;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.conversation;
 
-import javax.context.Conversation;
+import javax.enterprise.context.Conversation;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
 import javax.annotation.PreDestroy;
-import javax.context.ConversationScoped;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.inject.Named;
 
 @ConversationScoped
 @Named

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/CloudController.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/CloudController.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/CloudController.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.context.conversation.client;
 
-import javax.annotation.Named;
-import javax.context.Conversation;
-import javax.inject.Current;
+import javax.enterprise.context.Conversation;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
 
 @Named
 public class CloudController

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 
-import javax.context.Conversation;
+import javax.enterprise.context.Conversation;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.context.conversation.client;
 
-import javax.context.ContextNotActiveException;
-import javax.context.Conversation;
-import javax.context.ConversationScoped;
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.Conversation;
+import javax.enterprise.context.ConversationScoped;
 import javax.faces.event.PhaseEvent;
 import javax.faces.event.PhaseId;
 import javax.faces.event.PhaseListener;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Storm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Storm.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Storm.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,10 +2,10 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
-import javax.context.Conversation;
-import javax.context.ConversationScoped;
-import javax.inject.Current;
+import javax.enterprise.context.Conversation;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
 
 @Named
 @ConversationScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,21 +1,21 @@
 package org.jboss.jsr299.tck.tests.context.dependent;
 
-import javax.context.ApplicationScoped;
-import javax.context.Dependent;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Observes;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
 
 @ApplicationScoped
 class ApplicationHorseStable
 {
    @Current
-   private Manager manager;
+   private BeanManager beanManager;
    private static boolean dependentContextActive = false;
    
    public void horseEntered(@Observes HorseInStableEvent horseEvent)
    {
-      if (manager.getContext(Dependent.class).isActive())
+      if (beanManager.getContext(Dependent.class).isActive())
       {
          dependentContextActive = true;
       }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -3,12 +3,12 @@
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
-import javax.context.Context;
-import javax.context.ContextNotActiveException;
-import javax.context.CreationalContext;
-import javax.context.Dependent;
-import javax.inject.AnnotationLiteral;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -31,9 +31,9 @@
    @SpecAssertion(section = "8.3", id = "a")
    public void testInstanceNotSharedBetweenInjectionPoints()
    {
-      Set<Bean<Fox>> foxBeans = getCurrentManager().resolveByType(Fox.class);
+      Set<Bean<Fox>> foxBeans = getCurrentManager().getBeans(Fox.class);
       assert foxBeans.size() == 1;
-      Set<Bean<FoxRun>> foxRunBeans = getCurrentManager().resolveByType(FoxRun.class);
+      Set<Bean<FoxRun>> foxRunBeans = getCurrentManager().getBeans(FoxRun.class);
       assert foxRunBeans.size() == 1;
       Bean<FoxRun> foxRunBean = foxRunBeans.iterator().next();
       FoxRun foxRun = foxRunBean.create(new MockCreationalContext<FoxRun>());
@@ -49,7 +49,7 @@
          @Override
          protected void execute() throws Exception
          {
-            Set<Bean<Fox>> foxBeans = getCurrentManager().resolveByType(Fox.class);
+            Set<Bean<Fox>> foxBeans = getCurrentManager().getBeans(Fox.class);
             assert foxBeans.size() == 1;
 
             Fox fox1 = getCurrentConfiguration().getEl().evaluateValueExpression("#{fox}", Fox.class);
@@ -63,7 +63,7 @@
    @SpecAssertion(section = "8.3", id = "d")
    public void testInstanceUsedForProducerMethodNotShared() throws Exception
    {
-      Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
+      Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class).iterator().next();
       Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>());
       Tarantula tarantula2 = tarantulaBean.create(new MockCreationalContext<Tarantula>());
       assert tarantula != null;
@@ -75,7 +75,7 @@
    @SpecAssertion(section = "8.3", id = "d")
    public void testInstanceUsedForProducerFieldNotShared() throws Exception
    {
-      Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).iterator().next();
+      Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL).iterator().next();
       Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>());
       Tarantula tarantula2 = tarantulaBean.create(new MockCreationalContext<Tarantula>());
       assert tarantula != null;
@@ -94,7 +94,7 @@
          protected void execute() throws Exception
          {
             SpiderProducer spiderProducer = getCurrentManager().getInstanceByType(SpiderProducer.class);
-            Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
+            Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class).iterator().next();
             Tarantula tarantula = getCurrentManager().getInstanceByType(Tarantula.class);
             assert tarantula != null;
             tarantulaBean.destroy(tarantula);
@@ -134,7 +134,7 @@
          @Override
          protected void execute() throws Exception
          {
-            Set<Bean<Fox>> foxBeans = getCurrentManager().resolveByType(Fox.class);
+            Set<Bean<Fox>> foxBeans = getCurrentManager().getBeans(Fox.class);
             assert foxBeans.size() == 1;
             Bean<Fox> foxBean = foxBeans.iterator().next();
             Context context = getCurrentManager().getContext(Dependent.class);
@@ -155,7 +155,7 @@
          @Override
          protected void execute() throws Exception
          {
-            Set<Bean<Fox>> foxBeans = getCurrentManager().resolveByType(Fox.class);
+            Set<Bean<Fox>> foxBeans = getCurrentManager().getBeans(Fox.class);
             assert foxBeans.size() == 1;
             Bean<Fox> foxBean = foxBeans.iterator().next();
             Context context = getCurrentManager().getContext(Dependent.class);
@@ -177,7 +177,7 @@
    @SpecAssertion(section = "8.3", id = "g")
    public void testContextIsActiveWhenInvokingProducerMethod()
    {
-      Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
+      Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class).iterator().next();
       Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>());
       assert tarantula != null;
       assert SpiderProducer.isDependentContextActive();
@@ -200,7 +200,7 @@
    })
    public void testContextIsActiveWhenInvokingDisposalMethod()
    {
-      Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
+      Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class).iterator().next();
       Tarantula tarantula = tarantulaBean.create(new CreationalContext<Tarantula>()
       {
 
@@ -273,7 +273,7 @@
    @SpecAssertion(section = "8.3", id = "j")
    public void testContextIsActiveDuringInjection()
    {
-      Bean<FoxRun> foxRunBean = getCurrentManager().resolveByType(FoxRun.class).iterator().next();
+      Bean<FoxRun> foxRunBean = getCurrentManager().getBeans(FoxRun.class).iterator().next();
       FoxRun foxRun = foxRunBean.create(new MockCreationalContext<FoxRun>());
       assert foxRun.fox != null;
    }
@@ -291,8 +291,8 @@
          @Override
          protected void execute() throws Exception
          {
-            assert getCurrentManager().resolveByType(Farm.class).size() == 1;
-            Bean<Farm> farmBean = getCurrentManager().resolveByType(Farm.class).iterator().next();
+            assert getCurrentManager().getBeans(Farm.class).size() == 1;
+            Bean<Farm> farmBean = getCurrentManager().getBeans(Farm.class).iterator().next();
             Farm farm = getCurrentManager().getInstanceByType(Farm.class);
             farm.open();
             Stable.destroyed = false;
@@ -322,8 +322,8 @@
             Fox.setDestroyed(false);
             Fox.setDestroyCount(0);
             
-            assert getCurrentManager().resolveByType(FoxRun.class).size() == 1;
-            Bean<FoxRun> bean = getCurrentManager().resolveByType(FoxRun.class).iterator().next();
+            assert getCurrentManager().getBeans(FoxRun.class).size() == 1;
+            Bean<FoxRun> bean = getCurrentManager().getBeans(FoxRun.class).iterator().next();
             FoxRun instance = getCurrentManager().getInstanceByType(FoxRun.class);
             assert instance.fox != instance.anotherFox;
             bean.destroy(instance);
@@ -406,7 +406,7 @@
          @Override
          protected void execute() throws Exception
          {
-            Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
+            Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class).iterator().next();
             Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>());
             assert tarantula != null;
             

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Farm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Farm.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Farm.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.context.dependent;
 
-import javax.context.RequestScoped;
-import javax.inject.Current;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Current;
 
 @RequestScoped
 class Farm

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Fox.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Fox.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.context.dependent;
 
-import javax.annotation.Named;
 import javax.annotation.PreDestroy;
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Named;
 
 @Dependent @Named
 class Fox

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxRun.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxRun.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxRun.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.context.dependent;
 
-import javax.annotation.Named;
 import javax.annotation.PreDestroy;
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
 
 @Named("foxRun")
 class FoxRun

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,11 +1,11 @@
 package org.jboss.jsr299.tck.tests.context.dependent;
 
 import javax.annotation.PreDestroy;
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Observes;
-import javax.inject.Current;
-import javax.inject.Initializer;
-import javax.inject.manager.Manager;
 
 @Dependent
 class HorseStable
@@ -15,9 +15,9 @@
    private static boolean destroyed = false;
 
    @Initializer
-   public HorseStable(@Current Manager manager)
+   public HorseStable(@Current BeanManager beanManager)
    {
-      if (manager.getContext(Dependent.class).isActive())
+      if (beanManager.getContext(Dependent.class).isActive())
       {
          dependentContextActive = true;
       }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MockCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MockCreationalContext.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MockCreationalContext.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.dependent;
 
-import javax.context.CreationalContext;
+import javax.enterprise.context.spi.CreationalContext;
 
 public class MockCreationalContext<T> implements CreationalContext<T>
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.context.dependent;
 
 import javax.annotation.PreDestroy;
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class OtherSpiderProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,14 +1,14 @@
 package org.jboss.jsr299.tck.tests.context.dependent;
 
-import javax.annotation.Named;
-import javax.context.Dependent;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.spi.BeanManager;
 
 @Dependent
 @Named
 public class SensitiveFox
 {
-   private static Manager manager;
+   private static BeanManager beanManager;
 
    private boolean dependentContextActiveDuringCreate = false;
    
@@ -16,7 +16,7 @@
 
    public SensitiveFox()
    {
-      if (manager.getContext(Dependent.class).isActive())
+      if (beanManager.getContext(Dependent.class).isActive())
       {
          dependentContextActiveDuringCreate = true;
       }
@@ -24,7 +24,7 @@
 
    public String getName()
    {
-      if (manager.getContext(Dependent.class).isActive())
+      if (beanManager.getContext(Dependent.class).isActive())
       {
          dependentContextActiveDuringEval = true;
       }
@@ -41,9 +41,9 @@
       return dependentContextActiveDuringEval;
    }
 
-   public static void setManager(Manager manager)
+   public static void setManager(BeanManager beanManager)
    {
-      SensitiveFox.manager = manager;
+      SensitiveFox.beanManager = beanManager;
    }
 
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,17 +1,17 @@
 package org.jboss.jsr299.tck.tests.context.dependent;
 
 import javax.annotation.PreDestroy;
-import javax.context.Dependent;
-import javax.inject.Current;
-import javax.inject.Disposes;
-import javax.inject.Produces;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.BeanManager;
 
 @AnotherDeploymentType
 class SpiderProducer
 {
    @Current
-   private Manager manager;
+   private BeanManager beanManager;
    
    private static boolean dependentContextActive = false;
    private static boolean destroyed = false;
@@ -20,7 +20,7 @@
    
    @Produces public Tarantula produceTarantula()
    {
-      if (manager.getContext(Dependent.class).isActive())
+      if (beanManager.getContext(Dependent.class).isActive())
       {
          dependentContextActive = true;
       }
@@ -29,7 +29,7 @@
 
    public void disposeTarantula(@Disposes Tarantula tarantula)
    {
-      if (manager.getContext(Dependent.class).isActive())
+      if (beanManager.getContext(Dependent.class).isActive())
       {
          dependentContextActive = true;
       }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Stable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Stable.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Stable.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.context.dependent;
 
 import javax.annotation.PreDestroy;
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 class Stable
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -17,9 +17,9 @@
 
 package org.jboss.jsr299.tck.tests.context.dependent.ejb;
 
-import javax.context.CreationalContext;
-import javax.context.RequestScoped;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -41,7 +41,7 @@
    @SpecAssertion(section = "8.3", id = "k")
    public void testContextIsActiveDuringEJBDependencyInjection()
    {
-      Bean<FoxRunLocal> foxRunBean = getCurrentManager().resolveByType(FoxRunLocal.class).iterator().next();
+      Bean<FoxRunLocal> foxRunBean = getCurrentManager().getBeans(FoxRunLocal.class).iterator().next();
       FoxRunLocal foxRun = foxRunBean.create(new CreationalContext<FoxRunLocal>(){
 
          public void push(FoxRunLocal incompleteInstance) {}
@@ -69,8 +69,8 @@
          @Override
          protected void execute() throws Exception
          {
-            assert getCurrentManager().resolveByType(HouseLocal.class).size() == 1;
-            Bean<HouseLocal> bean = getCurrentManager().resolveByType(HouseLocal.class).iterator().next();
+            assert getCurrentManager().getBeans(HouseLocal.class).size() == 1;
+            Bean<HouseLocal> bean = getCurrentManager().getBeans(HouseLocal.class).iterator().next();
             HouseLocal instance = getCurrentManager().getContext(RequestScoped.class).get(bean, new CreationalContext<HouseLocal>(){
 
                public void push(HouseLocal incompleteInstance) {}
@@ -96,8 +96,8 @@
          @Override
          protected void execute() throws Exception
          {
-            assert getCurrentManager().resolveByType(FarmLocal.class).size() == 1;
-            Bean<FarmLocal> farmBean = getCurrentManager().resolveByType(FarmLocal.class).iterator().next();
+            assert getCurrentManager().getBeans(FarmLocal.class).size() == 1;
+            Bean<FarmLocal> farmBean = getCurrentManager().getBeans(FarmLocal.class).iterator().next();
             FarmLocal farm = getCurrentManager().getContext(RequestScoped.class).get(farmBean, new CreationalContext<FarmLocal>(){
 
                public void push(FarmLocal incompleteInstance) {}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Farm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Farm.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Farm.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.context.dependent.ejb;
 
-import javax.context.RequestScoped;
 import javax.ejb.Stateful;
-import javax.inject.Current;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Current;
 
 
 @RequestScoped @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Fox.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Fox.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,14 +1,14 @@
 package org.jboss.jsr299.tck.tests.context.dependent.ejb;
 
-import javax.annotation.Named;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import javax.context.ContextNotActiveException;
-import javax.context.Dependent;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.spi.BeanManager;
 
 @Dependent @Named @Stateful
 public class Fox implements FoxLocal
@@ -19,14 +19,14 @@
    private static boolean dependentContextActiveDuringPostConstruct = false;
    
    @Current
-   private Manager manager;
+   private BeanManager beanManager;
    
    @PostConstruct
    public void construct()
    {
       try
       {
-         dependentContextActiveDuringPostConstruct = manager.getContext(Dependent.class).isActive();
+         dependentContextActiveDuringPostConstruct = beanManager.getContext(Dependent.class).isActive();
       }
       catch (ContextNotActiveException e) 
       {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/FoxRun.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/FoxRun.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/FoxRun.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,10 +1,10 @@
 package org.jboss.jsr299.tck.tests.context.dependent.ejb;
 
-import javax.annotation.Named;
 import javax.annotation.PreDestroy;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
 
 @Named("foxRun") @Stateful
 public class FoxRun implements FoxRunLocal

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.context.dependent.ejb;
 
-import javax.context.RequestScoped;
 import javax.ejb.Stateful;
-import javax.inject.Current;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Current;
 
 @RequestScoped @Stateful
 class House implements HouseLocal

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Room.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Room.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Room.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import javax.annotation.PreDestroy;
 import javax.ejb.Stateful;
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 @Stateful
 class Room implements RoomLocal

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Stable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Stable.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Stable.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -3,7 +3,7 @@
 import java.io.Serializable;
 
 import javax.annotation.PreDestroy;
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 class Stable implements Serializable
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Big.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Big.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Big.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -7,7 +7,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 import javax.interceptor.InterceptorBindingType;
 
 @InterceptorBindingType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.context.passivating;
 
-import javax.context.Dependent;
-import javax.context.SessionScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class CityProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.context.passivating;
 
-import javax.context.Dependent;
-import javax.inject.Produces;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class CityProducer2

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/FooConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/FooConsumer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/FooConsumer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.context.passivating;
 
-import javax.context.RequestScoped;
-import javax.inject.Current;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Current;
 
 @RequestScoped
 class FooConsumer

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -3,8 +3,8 @@
 
 import java.io.Serializable;
 
-import javax.context.ApplicationScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
 
 @ApplicationScoped
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Helsinki.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Helsinki.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Helsinki.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.context.passivating;
 
-import javax.context.Dependent;
 import javax.ejb.Stateful;
+import javax.enterprise.context.Dependent;
 
 @Dependent
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Hyvinkaa.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Hyvinkaa.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Hyvinkaa.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
 
 @SuppressWarnings("serial")
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jamsa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jamsa_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jamsa_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
-import javax.inject.Produces;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Produces;
 
 @SessionScoped
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Joensuu.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Joensuu.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Joensuu.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
 
 @SuppressWarnings("serial")
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jyvaskyla.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jyvaskyla.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jyvaskyla.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
 
 @SuppressWarnings("serial")
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kajaani.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kajaani.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kajaani.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
 
 @SessionScoped
 public class Kajaani implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kuopio_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kuopio_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kuopio_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Initializer;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Initializer;
 
 @SessionScoped
 class Kuopio_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/London_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/London_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/London_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Produces;
 
 @SessionScoped
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Loviisa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Loviisa_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Loviisa_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Initializer;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Initializer;
 
 @SessionScoped
 class Loviisa_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Mikkeli_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Mikkeli_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Mikkeli_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
-import javax.inject.Initializer;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Initializer;
 
 @SessionScoped
 class Mikkeli_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Nokia_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Nokia_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Nokia_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
 
 @SessionScoped
 class Nokia_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/NumberConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/NumberConsumer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/NumberConsumer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.context.passivating;
 
-import javax.context.RequestScoped;
-import javax.inject.Current;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Current;
 
 @RequestScoped
 class NumberConsumer

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -4,11 +4,11 @@
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
-import javax.context.Context;
-import javax.context.SessionScoped;
-import javax.inject.AnnotationLiteral;
-import javax.inject.IllegalProductException;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.IllegalProductException;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -38,7 +38,7 @@
    @SpecAssertion(section = "8.4", id = "b")
    public void testSimpleWebBeanWithSerializableImplementationClassOK()
    {
-      Set<Bean<Jyvaskyla>> beans = getCurrentManager().resolveByType(Jyvaskyla.class);
+      Set<Bean<Jyvaskyla>> beans = getCurrentManager().getBeans(Jyvaskyla.class);
       assert !beans.isEmpty();
    }
    
@@ -88,7 +88,7 @@
    @SpecAssertion(section = "8.4", id = "j")
    public void testDependentEJBsAreSerializable() throws IOException, ClassNotFoundException
    {
-      Set<Bean<Vaasa>> vaasaBeans = getCurrentManager().resolveByType(Vaasa.class);
+      Set<Bean<Vaasa>> vaasaBeans = getCurrentManager().getBeans(Vaasa.class);
       assert vaasaBeans.size() == 1;
       assert testSerialize(vaasaBeans.iterator().next());
    }
@@ -97,7 +97,7 @@
    @SpecAssertion(section = "8.4", id = "l")
    public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoTransientFieldOK()
    {
-      Set<Bean<Joensuu>> beans = getCurrentManager().resolveByType(Joensuu.class);
+      Set<Bean<Joensuu>> beans = getCurrentManager().getBeans(Joensuu.class);
       assert !beans.isEmpty();
    }
 
@@ -112,7 +112,7 @@
    @SpecAssertion(section = "8.4", id = "q")
    public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoTransientFieldOfWebBeanWithPassivatingScopeOK()
    {
-      Set<Bean<Hyvinkaa>> beans = getCurrentManager().resolveByType(Hyvinkaa.class);
+      Set<Bean<Hyvinkaa>> beans = getCurrentManager().getBeans(Hyvinkaa.class);
       assert !beans.isEmpty();
    }
 
@@ -176,7 +176,7 @@
    @SpecAssertion(section = "8.4", id = "a")
    public void testEJBWebBeanCanDeclarePassivatingScope()
    {
-      assert getCurrentManager().resolveByType(TurkuLocal.class).size() == 1;
+      assert getCurrentManager().getBeans(TurkuLocal.class).size() == 1;
    }
    
    @Test(expectedExceptions = IllegalProductException.class)
@@ -190,7 +190,7 @@
    @SpecAssertion(section = "8.4", id = "v")
    public void testIsSerializableOnBean()
    {
-      assert !getCurrentManager().resolveByType(Sysma.class).iterator().next().isSerializable();
-      assert getCurrentManager().resolveByType(Hyvinkaa.class).iterator().next().isSerializable();
+      assert !getCurrentManager().getBeans(Sysma.class).iterator().next().isSerializable();
+      assert getCurrentManager().getBeans(Hyvinkaa.class).iterator().next().isSerializable();
    }
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Salo_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Salo_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Salo_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
 
 @SessionScoped
 class Salo_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Turku.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Turku.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Turku.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.context.passivating;
 
-import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
+import javax.enterprise.context.SessionScoped;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Uusikaupunki_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Uusikaupunki_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Uusikaupunki_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
 
 @SessionScoped
 class Uusikaupunki_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Vaasa.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Vaasa.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Vaasa.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
 
 @SuppressWarnings("serial")
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.passivating;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 
 @Dependent
 class Violation

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation2.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation2.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation2.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.passivating;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 
 @Dependent
 class Violation2

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/CityBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/CityBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/CityBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -7,7 +7,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 import javax.interceptor.InterceptorBindingType;
 
 @InterceptorBindingType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/Kaarina_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/Kaarina_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/Kaarina_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.context.passivating.broken1;
 
-import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
+import javax.enterprise.context.SessionScoped;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/Hamina_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/Hamina_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/Hamina_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.passivating.broken2;
 
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
 
 @SessionScoped
 class Hamina_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/Porvoo_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/Porvoo_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/Porvoo_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.context.passivating.broken3;
 
-import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
+import javax.enterprise.context.SessionScoped;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/CityBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/CityBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/CityBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -7,7 +7,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 import javax.interceptor.InterceptorBindingType;
 
 @InterceptorBindingType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/Kotka_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/Kotka_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/Kotka_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
 
 @SessionScoped
 class Kotka_Broken implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/Raisio_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/Raisio_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/Raisio_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
 
 @SessionScoped
 class Raisio_Broken implements CityInterface, Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Vantaa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Vantaa_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Vantaa_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
 
 @SessionScoped
 class Vantaa_Broken implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Violation.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Violation.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Violation.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.passivating.broken6;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 
 @Dependent
 class Violation

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Loviisa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Loviisa_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Loviisa_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
-import javax.inject.Initializer;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Initializer;
 
 @SessionScoped
 class Loviisa_Broken extends City implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Violation.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Violation.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Violation.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.passivating.broken7;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 
 @Dependent
 class Violation

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Forssa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Forssa_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Forssa_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
-import javax.inject.Initializer;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Initializer;
 
 @SessionScoped
 class Forssa_Broken implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Violation.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Violation.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Violation.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.passivating.broken8;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 
 @Dependent
 class Violation

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Peraseinajoki.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Peraseinajoki.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Peraseinajoki.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.context.passivating.broken9;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
-import javax.inject.Produces;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Produces;
 
 class Peraseinajoki extends City
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.passivating.broken9;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 
 @Dependent
 class Violation

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation2.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation2.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation2.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.passivating.broken9;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 
 @Dependent
 class Violation2

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/British.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/British.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/British.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 
 @BindingType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/CowProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/CowProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/CowProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.passivating.integration;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 public class CowProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 
-import javax.inject.IllegalProductException;
+import javax.enterprise.inject.IllegalProductException;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 
 @Dependent
 class District

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean;
 
-import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.inject.Current;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/FilterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/FilterTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/FilterTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,9 +2,9 @@
 
 import java.io.IOException;
 
-import javax.context.ApplicationScoped;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
@@ -16,7 +16,7 @@
 public class FilterTest implements Filter
 {
    @Current
-   private Manager jsr299Manager;
+   private BeanManager jsr299Manager;
 
    public void destroy()
    {
@@ -43,7 +43,7 @@
          if (jsr299Manager == null)
          {
             InitialContext ic = new InitialContext();
-            jsr299Manager = (Manager) ic.lookup("java:app/Manager");
+            jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
          }
       }
       catch (Exception e)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.servlet.ServletConfig;
@@ -17,7 +17,7 @@
    private static final long serialVersionUID = 1L;
 
    @Current
-   private Manager jsr299Manager;
+   private BeanManager jsr299Manager;
 
    @Override
    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
@@ -34,7 +34,7 @@
       try
       {
          InitialContext ic = new InitialContext();
-         jsr299Manager = (Manager) ic.lookup("java:app/Manager");
+         jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
       }
       catch (NamingException e)
       {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -19,9 +19,9 @@
 
 import java.io.IOException;
 
-import javax.context.ApplicationScoped;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.servlet.ServletConfig;
@@ -42,7 +42,7 @@
    private static final long serialVersionUID = 1L;
    
    @Current
-   private Manager jsr299Manager;
+   private BeanManager jsr299Manager;
 
    @Override
    protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
@@ -71,7 +71,7 @@
       try
       {
          InitialContext ic = new InitialContext();
-         jsr299Manager = (Manager) ic.lookup("java:app/Manager");
+         jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
       }
       catch (NamingException e)
       {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/SimpleRequestBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/SimpleRequestBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/SimpleRequestBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.request;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @RequestScoped
 public class SimpleRequestBean

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/FMSModelIII.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/FMSModelIII.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/FMSModelIII.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,13 +1,13 @@
 package org.jboss.jsr299.tck.tests.context.request.ejb;
 
 import javax.annotation.Resource;
-import javax.context.RequestScoped;
 import javax.ejb.Stateless;
 import javax.ejb.Timeout;
 import javax.ejb.Timer;
 import javax.ejb.TimerService;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 
 @Stateless
 public class FMSModelIII implements FMS
@@ -18,7 +18,7 @@
    private TimerService timerService;
    
    @Current
-   private Manager manager;
+   private BeanManager beanManager;
 
    private static boolean requestScopeActive = false;
    private static double beanId = 0.0d;
@@ -47,19 +47,19 @@
    @Timeout
    public void timeout(Timer timer)
    {
-      if (manager.getContext(RequestScoped.class).isActive())
+      if (beanManager.getContext(RequestScoped.class).isActive())
       {
          requestScopeActive = true;
          if (beanId > 0.0)
          {
-            if (beanId == manager.getInstanceByType(SimpleRequestBean.class).getId())
+            if (beanId == beanManager.getInstanceByType(SimpleRequestBean.class).getId())
             {
                sameBean = true;
             }
          }
          else
          {
-            beanId = manager.getInstanceByType(SimpleRequestBean.class).getId();
+            beanId = beanManager.getInstanceByType(SimpleRequestBean.class).getId();
          }
       }
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/SimpleRequestBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/SimpleRequestBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/SimpleRequestBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.context.request.ejb;
 
 import javax.annotation.PreDestroy;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @RequestScoped
 class SimpleRequestBean

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/SimpleRequestBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/SimpleRequestBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/SimpleRequestBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.request.standalone;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @RequestScoped
 class SimpleRequestBean

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,21 +1,21 @@
 package org.jboss.jsr299.tck.tests.context.request.standalone;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Asynchronously;
 import javax.event.Observes;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
 
 class TcasDisplay
 {
    @Current
-   private Manager manager;
+   private BeanManager beanManager;
    
    private static boolean requestScopeActive = false;
    
    public void drawTarget(@Observes @Asynchronously TargetEvent targetEvent)
    {
-      if (manager.getContext(RequestScoped.class).isActive())
+      if (beanManager.getContext(RequestScoped.class).isActive())
       {
          requestScopeActive = true;
       }
@@ -27,7 +27,7 @@
 
    public void drawNearMiss(@Observes @Asynchronously NearMiss event)
    {
-      event.setBean(manager.getInstanceByType(SimpleRequestBean.class));
+      event.setBean(beanManager.getInstanceByType(SimpleRequestBean.class));
    }
 
    public static boolean isRequestScopeActive()

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/FilterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/FilterTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/FilterTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,9 +2,9 @@
 
 import java.io.IOException;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
@@ -16,7 +16,7 @@
 public class FilterTest implements Filter
 {
    @Current
-   private Manager jsr299Manager;
+   private BeanManager jsr299Manager;
 
    public void destroy()
    {
@@ -43,7 +43,7 @@
          if (jsr299Manager == null)
          {
             InitialContext ic = new InitialContext();
-            jsr299Manager = (Manager) ic.lookup("java:app/Manager");
+            jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
          }
       }
       catch (Exception e)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -19,8 +19,8 @@
 
 import java.io.IOException;
 
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.servlet.ServletConfig;
@@ -40,7 +40,7 @@
    private static final long serialVersionUID = 1L;
    
    @Current
-   private Manager jsr299Manager;
+   private BeanManager jsr299Manager;
 
    @Override
    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
@@ -57,7 +57,7 @@
       try
       {
          InitialContext ic = new InitialContext();
-         jsr299Manager = (Manager) ic.lookup("java:app/Manager");
+         jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
       }
       catch (NamingException e)
       {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.servlet.ServletConfig;
@@ -17,7 +17,7 @@
    private static final long serialVersionUID = 1L;
 
    @Current
-   private Manager jsr299Manager;
+   private BeanManager jsr299Manager;
 
    @Override
    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
@@ -49,7 +49,7 @@
       try
       {
          InitialContext ic = new InitialContext();
-         jsr299Manager = (Manager) ic.lookup("java:app/Manager");
+         jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
       }
       catch (NamingException e)
       {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -19,9 +19,9 @@
 
 import java.io.IOException;
 
-import javax.context.SessionScoped;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.servlet.ServletConfig;
@@ -42,7 +42,7 @@
    private static final long serialVersionUID = 1L;
    
    @Current
-   private Manager jsr299Manager;
+   private BeanManager jsr299Manager;
 
    @Override
    protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
@@ -71,7 +71,7 @@
       try
       {
          InitialContext ic = new InitialContext();
-         jsr299Manager = (Manager) ic.lookup("java:app/Manager");
+         jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
       }
       catch (NamingException e)
       {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -3,7 +3,7 @@
 import java.io.Serializable;
 
 import javax.annotation.PreDestroy;
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
 
 @SessionScoped
 class SimpleSessionBean implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,10 +2,11 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.context.RequestScoped;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Production;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.deployment.Production;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -33,16 +34,16 @@
    @SpecAssertion(section = "2", id = "a")
    public void testBeanTypesNonEmpty()
    {
-      assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1;
-      assert getCurrentManager().resolveByType(RedSnapper.class).iterator().next().getTypes().size() > 0;
+      assert getCurrentManager().getBeans(RedSnapper.class).size() == 1;
+      assert getCurrentManager().getBeans(RedSnapper.class).iterator().next().getTypes().size() > 0;
    }
    
    @Test
    @SpecAssertion(section = "2", id = "b")
    public void testBindingTypesNonEmpty()
    {
-      assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1;
-      assert getCurrentManager().resolveByType(RedSnapper.class).iterator().next().getBindings().size() > 0;
+      assert getCurrentManager().getBeans(RedSnapper.class).size() == 1;
+      assert getCurrentManager().getBeans(RedSnapper.class).iterator().next().getBindings().size() > 0;
    }
    
    @Test
@@ -53,8 +54,8 @@
    })
    public void testHasScopeType()
    {
-      assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1;
-      assert getCurrentManager().resolveByType(RedSnapper.class).iterator().next().getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().getBeans(RedSnapper.class).size() == 1;
+      assert getCurrentManager().getBeans(RedSnapper.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }
    
    @Test
@@ -65,19 +66,19 @@
    })
    public void testHasDeploymentType()
    {
-      assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1;
-      assert getCurrentManager().resolveByType(RedSnapper.class).iterator().next().getDeploymentType().equals(Production.class);
+      assert getCurrentManager().getBeans(RedSnapper.class).size() == 1;
+      assert getCurrentManager().getBeans(RedSnapper.class).iterator().next().getDeploymentType().equals(Production.class);
    }
    
    @Test(groups = "producerMethod")
    @SpecAssertion(section = "5.2", id = "b")
    public void testIsNullable() throws Exception
    {
-      assert getCurrentManager().resolveByType(int.class).size() == 1;
-      Bean<Integer> bean = getCurrentManager().resolveByType(int.class).iterator().next();
+      assert getCurrentManager().getBeans(int.class).size() == 1;
+      Bean<Integer> bean = getCurrentManager().getBeans(int.class).iterator().next();
       assert !bean.isNullable();
-      assert getCurrentManager().resolveByType(Animal.class, TAME_LITERAL).size() == 1;
-      Bean<Animal> animalBean = getCurrentManager().resolveByType(Animal.class, TAME_LITERAL).iterator().next();
+      assert getCurrentManager().getBeans(Animal.class, TAME_LITERAL).size() == 1;
+      Bean<Animal> animalBean = getCurrentManager().getBeans(Animal.class, TAME_LITERAL).iterator().next();
       assert animalBean.isNullable();
    }
    
@@ -93,8 +94,8 @@
    })
    public void testBeanTypes()
    {
-      assert getCurrentManager().resolveByType(Tarantula.class).size() == 1;
-      Bean<Tarantula> bean = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
+      assert getCurrentManager().getBeans(Tarantula.class).size() == 1;
+      Bean<Tarantula> bean = getCurrentManager().getBeans(Tarantula.class).iterator().next();
       assert bean.getTypes().size() == 6;
       assert bean.getTypes().contains(Tarantula.class);
       assert bean.getTypes().contains(Spider.class);
@@ -109,8 +110,8 @@
    @SuppressWarnings("unused")
    public void testBeanClientCanCastBeanInstanceToAnyBeanType()
    {
-      assert getCurrentManager().resolveByType(Tarantula.class).size() == 1;
-      Bean<Tarantula> bean = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
+      assert getCurrentManager().getBeans(Tarantula.class).size() == 1;
+      Bean<Tarantula> bean = getCurrentManager().getBeans(Tarantula.class).iterator().next();
       Tarantula tarantula = getCurrentManager().getInstance(bean);
       
       Spider spider = (Spider) tarantula;
@@ -124,14 +125,14 @@
    @SpecAssertion(section = "2.2", id = "g")
    public void testFinalApiType()
    {
-      assert !getCurrentManager().resolveByType(DependentFinalTuna.class).isEmpty();
+      assert !getCurrentManager().getBeans(DependentFinalTuna.class).isEmpty();
    }
    
    @Test
    @SpecAssertion(section = "3.2.3", id = "bd")
    public void testMultipleStereotypes()
    {
-      Bean<ComplicatedTuna> tunaBean = getCurrentManager().resolveByType(ComplicatedTuna.class).iterator().next();
+      Bean<ComplicatedTuna> tunaBean = getCurrentManager().getBeans(ComplicatedTuna.class).iterator().next();
       assert tunaBean.getScopeType().equals(RequestScoped.class);
       assert tunaBean.getName().equals("complicatedTuna");
    }
@@ -140,8 +141,8 @@
    @SpecAssertion(section = "3.2.3", id = "c")
    public void testBeanExtendsAnotherBean()
    {
-      assert !getCurrentManager().resolveByType(Spider.class).isEmpty();
-      assert !getCurrentManager().resolveByType(Tarantula.class).isEmpty();
+      assert !getCurrentManager().getBeans(Spider.class).isEmpty();
+      assert !getCurrentManager().getBeans(Tarantula.class).isEmpty();
    }
    
 }
\ No newline at end of file

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/ComplicatedTuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/ComplicatedTuna.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/ComplicatedTuna.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.bean;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @FishStereotype
 @AnimalStereotype

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,9 +6,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Named;
-import javax.annotation.Stereotype;
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.bean;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @FishStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/SpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/SpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.bean;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 class SpiderProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -3,11 +3,11 @@
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
-import javax.inject.Production;
-import javax.inject.manager.Bean;
-import javax.inject.manager.InjectionPoint;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.deployment.Production;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.InjectionPoint;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -26,7 +26,7 @@
    @SpecAssertion(section = "2.3.1", id = "a") 
    public void testDefaultBindingDeclaredInJava()
    {
-      Bean<Order> order = getCurrentManager().resolveByType(Order.class).iterator().next();
+      Bean<Order> order = getCurrentManager().getBeans(Order.class).iterator().next();
       assert order.getBindings().size() == 1;
       order.getBindings().iterator().next().annotationType().equals(Production.class);
    }
@@ -35,7 +35,7 @@
    @SpecAssertion(section = "2.3.1", id = "b")
    public void testDefaultBindingForInjectionPoint()
    {
-      Bean<Order> order = getCurrentManager().resolveByType(Order.class).iterator().next();     
+      Bean<Order> order = getCurrentManager().getBeans(Order.class).iterator().next();     
       InjectionPoint injectionPoint = order.getInjectionPoints().iterator().next();
       assert injectionPoint.getBean().getBindings().iterator().next().annotationType().equals(Current.class);
    }
@@ -44,14 +44,14 @@
    @SpecAssertion(section = "2.3.2", id = "b")
    public void testBindingDeclaresBindingAnnotation()
    {
-      assert !getCurrentManager().resolveByType(Tarantula.class, new TameBinding()).isEmpty();
+      assert !getCurrentManager().getBeans(Tarantula.class, new TameBinding()).isEmpty();
    }
 
    @Test
    @SpecAssertion(section = "2.3.3", id = "a")
    public void testBindingsDeclaredInJava()
    {
-      Bean<Cat> cat = getCurrentManager().resolveByType(Cat.class, new SynchronousBinding()).iterator().next();
+      Bean<Cat> cat = getCurrentManager().getBeans(Cat.class, new SynchronousBinding()).iterator().next();
       assert cat.getBindings().size() == 1;
       assert cat.getBindings().contains(new SynchronousBinding());
    }
@@ -63,7 +63,7 @@
    })
    public void testMultipleBindings()
    {
-      Bean<?> model = getCurrentManager().resolveByType(Cod.class, new ChunkyBinding(true), new WhitefishBinding()).iterator().next();
+      Bean<?> model = getCurrentManager().getBeans(Cod.class, new ChunkyBinding(true), new WhitefishBinding()).iterator().next();
       assert model.getBindings().size() == 2;
    }
 
@@ -71,7 +71,7 @@
    @SpecAssertion(section = "2.3.5", id = "a")
    public void testFieldInjectedFromProducerMethod() throws Exception
    {
-      Barn barn = getCurrentManager().resolveByType(Barn.class).iterator().next().create(new MockCreationalContext<Barn>());
+      Barn barn = getCurrentManager().getBeans(Barn.class).iterator().next().create(new MockCreationalContext<Barn>());
       assert barn.petSpider != null;
       assert barn.petSpider instanceof DefangedTarantula;
    }
@@ -100,7 +100,7 @@
    @SpecAssertion(section = "4.1", id = "aa")
    public void testBindingDeclaredInheritedIsInherited() throws Exception
    {
-      Set<? extends Annotation> bindings = getCurrentManager().resolveByType(BorderCollie.class, new HairyBinding(false)).iterator().next().getBindings();
+      Set<? extends Annotation> bindings = getCurrentManager().getBeans(BorderCollie.class, new HairyBinding(false)).iterator().next().getBindings();
       assert bindings.size() == 1;
       assert bindings.iterator().next().annotationType().equals(Hairy.class);
    }
@@ -109,7 +109,7 @@
    @SpecAssertion(section = "4.1", id = "aa")
    public void testBindingNotDeclaredInheritedIsNotInherited()
    {
-      Set<? extends Annotation> bindings = getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getBindings();
+      Set<? extends Annotation> bindings = getCurrentManager().getBeans(ShetlandPony.class).iterator().next().getBindings();
       assert bindings.size() == 1;
       assert bindings.iterator().next().annotationType().equals(Current.class);
    }
@@ -118,7 +118,7 @@
    @SpecAssertion(section = "4.1", id = "aa")
    public void testBindingDeclaredInheritedIsBlockedByIntermediateClass()
    {
-      Set<? extends Annotation> bindings = getCurrentManager().resolveByType(ClippedBorderCollie.class, new HairyBinding(true)).iterator().next().getBindings();
+      Set<? extends Annotation> bindings = getCurrentManager().getBeans(ClippedBorderCollie.class, new HairyBinding(true)).iterator().next().getBindings();
       assert bindings.size() == 1;
       Annotation binding = bindings.iterator().next();
       assert binding.annotationType().equals(Hairy.class);
@@ -130,7 +130,7 @@
    @SpecAssertion(section = "4.1", id = "ag")
    public void testBindingDeclaredInheritedIsIndirectlyInherited()
    {
-      Set<? extends Annotation> bindings = getCurrentManager().resolveByType(EnglishBorderCollie.class, new HairyBinding(false)).iterator().next().getBindings();
+      Set<? extends Annotation> bindings = getCurrentManager().getBeans(EnglishBorderCollie.class, new HairyBinding(false)).iterator().next().getBindings();
       assert bindings.size() == 1;
       assert bindings.iterator().next().annotationType().equals(Hairy.class);
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cat.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cat.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.binding;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 
 @Production

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Chunky.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Chunky.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Chunky.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ChunkyBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ChunkyBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ChunkyBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.binding;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class ChunkyBinding extends AnnotationLiteral<Chunky> implements Chunky
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cod.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cod.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.definition.binding;
 
-import javax.annotation.Named;
-import javax.inject.Production;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Whitefish

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Hairy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Hairy.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Hairy.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -11,7 +11,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/HairyBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/HairyBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/HairyBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.binding;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 public class HairyBinding extends AnnotationLiteral<Hairy> implements Hairy
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MockCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MockCreationalContext.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MockCreationalContext.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.binding;
 
-import javax.context.CreationalContext;
+import javax.enterprise.context.spi.CreationalContext;
 
 public class MockCreationalContext<T> implements CreationalContext<T>
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Order.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Order.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.definition.binding;
 
-import javax.inject.Initializer;
-import javax.inject.Production;
+import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class Order

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/OrderProcessor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/OrderProcessor.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/OrderProcessor.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.binding;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 public class OrderProcessor

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Produced.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Produced.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Produced.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Species.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Species.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Species.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.binding;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 class SpiderProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Synchronous.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Synchronous.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Synchronous.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SynchronousBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SynchronousBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SynchronousBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.binding;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class SynchronousBinding extends AnnotationLiteral<Synchronous> implements Synchronous
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/TameBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/TameBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/TameBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.binding;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class TameBinding extends AnnotationLiteral<Tame> implements Tame
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.binding;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Whitefish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Whitefish.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Whitefish.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/WhitefishBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/WhitefishBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/WhitefishBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.binding;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class WhitefishBinding extends AnnotationLiteral<Whitefish> implements Whitefish
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -20,7 +20,7 @@
    @SpecAssertion(section = "4.1", id = "ad")
    public void testBindingDeclaredInheritedIsInherited() throws Exception
    {
-      Set<? extends Annotation> bindings = getCurrentManager().resolveByType(BorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings();
+      Set<? extends Annotation> bindings = getCurrentManager().getBeans(BorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings();
       assert bindings.size() == 1;
       assert bindings.iterator().next().annotationType().equals(Hairy.class);
    }
@@ -29,7 +29,7 @@
    @SpecAssertion(section = "4.1", id = "aj")
    public void testBindingDeclaredInheritedIsIndirectlyInherited()
    {
-      Set<? extends Annotation> bindings = getCurrentManager().resolveByType(EnglishBorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings();
+      Set<? extends Annotation> bindings = getCurrentManager().getBeans(EnglishBorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings();
       assert bindings.size() == 1;
       assert bindings.iterator().next().annotationType().equals(Hairy.class);
    }   

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairy.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairy.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -11,7 +11,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairyBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairyBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairyBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.binding.enterprise;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 public class HairyBinding extends AnnotationLiteral<Hairy> implements Hairy
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -5,10 +5,10 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.inject.DeploymentType;
-import javax.inject.Production;
-import javax.inject.UnsatisfiedDependencyException;
-import javax.inject.manager.Bean;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
+import javax.enterprise.inject.deployment.DeploymentType;
+import javax.enterprise.inject.deployment.Production;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -30,8 +30,8 @@
    @SpecAssertion(section = "2.5.2", id = "a")
    public void testDeploymentTypeHasCorrectTarget()
    {
-      assert getCurrentManager().resolveByType(BlackWidow.class).size() == 1;
-      Bean<BlackWidow> blackWidowSpiderModel = getCurrentManager().resolveByType(BlackWidow.class).iterator().next();
+      assert getCurrentManager().getBeans(BlackWidow.class).size() == 1;
+      Bean<BlackWidow> blackWidowSpiderModel = getCurrentManager().getBeans(BlackWidow.class).iterator().next();
       
       Target target = blackWidowSpiderModel.getScopeType().getAnnotation(Target.class);
       List<ElementType> elements = Arrays.asList(target.value());
@@ -48,8 +48,8 @@
    @SpecAssertion(section = "2.5.2", id = "c")
    public void testDeploymentTypeDeclaresDeploymentTypeAnnotation()
    {
-      assert getCurrentManager().resolveByType(BlackWidow.class).size() == 1;
-      Bean<BlackWidow> blackWidowSpiderModel = getCurrentManager().resolveByType(BlackWidow.class).iterator().next();            
+      assert getCurrentManager().getBeans(BlackWidow.class).size() == 1;
+      Bean<BlackWidow> blackWidowSpiderModel = getCurrentManager().getBeans(BlackWidow.class).iterator().next();            
       assert blackWidowSpiderModel.getDeploymentType().getAnnotation(DeploymentType.class) != null;
    }
 
@@ -57,8 +57,8 @@
    @SpecAssertion(section = "2.5.3", id = "c")
    public void testDeploymentTypeInheritedFromDeclaringBean() throws Exception
    {
-      assert getCurrentManager().resolveByType(BlackWidow.class).size() == 1;
-      Bean<BlackWidow> blackWidowSpiderModel = getCurrentManager().resolveByType(BlackWidow.class).iterator().next();
+      assert getCurrentManager().getBeans(BlackWidow.class).size() == 1;
+      Bean<BlackWidow> blackWidowSpiderModel = getCurrentManager().getBeans(BlackWidow.class).iterator().next();
       assert blackWidowSpiderModel.getDeploymentType().equals(AnotherDeploymentType.class);
    }
 
@@ -66,8 +66,8 @@
    @SpecAssertion(section = "2.5.5", id = "a")
    public void testDefaultDeploymentType()
    {
-      assert getCurrentManager().resolveByType(Tarantula.class).size() == 1;
-      Bean<Tarantula> bean = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
+      assert getCurrentManager().getBeans(Tarantula.class).size() == 1;
+      Bean<Tarantula> bean = getCurrentManager().getBeans(Tarantula.class).iterator().next();
       assert bean.getDeploymentType().equals(Production.class);
    }
 
@@ -75,12 +75,12 @@
    @SpecAssertion(section = "2.5.5", id = "b")
    public void testHighestPrecedenceDeploymentTypeFromStereotype()
    {
-      assert getCurrentManager().resolveByType(Rhinoceros.class).size() == 1;
-      Bean<?> bean = getCurrentManager().resolveByType(Rhinoceros.class).iterator().next();
+      assert getCurrentManager().getBeans(Rhinoceros.class).size() == 1;
+      Bean<?> bean = getCurrentManager().getBeans(Rhinoceros.class).iterator().next();
       assert bean.getDeploymentType().equals(HornedAnimalDeploymentType.class);
    }
 
-   @Test(groups = { "beanLifecycle", "deploymentType" }, expectedExceptions = UnsatisfiedDependencyException.class)
+   @Test(groups = { "beanLifecycle", "deploymentType" }, expectedExceptions = UnsatisfiedResolutionException.class)
    @SpecAssertion(section = "2.5.6", id = "a")
    public void testBeanWithDisabledDeploymentTypeNotInstantiated()
    {
@@ -94,8 +94,8 @@
    })
    public void testWebBeanDeploymentTypeOverridesStereotype()
    {
-      assert getCurrentManager().resolveByType(Reindeer.class).size() == 1;
-      Bean<Reindeer> bean = getCurrentManager().resolveByType(Reindeer.class).iterator().next();
+      assert getCurrentManager().getBeans(Reindeer.class).size() == 1;
+      Bean<Reindeer> bean = getCurrentManager().getBeans(Reindeer.class).iterator().next();
       assert bean.getDeploymentType().equals(Production.class);
    }
    
@@ -103,8 +103,8 @@
    @SpecAssertion(section = "2.5.3", id = "i")   
    public void testDeploymentTypeMayBeSpecifiedByStereotype()
    {
-      assert getCurrentManager().resolveByType(Goat.class).size() == 1;
-      Bean<Goat> bean = getCurrentManager().resolveByType(Goat.class).iterator().next();
+      assert getCurrentManager().getBeans(Goat.class).size() == 1;
+      Bean<Goat> bean = getCurrentManager().getBeans(Goat.class).iterator().next();
       assert bean.getDeploymentType().equals(HornedAnimalDeploymentType.class);
    }
 
@@ -112,48 +112,48 @@
    @SpecAssertion(section = "4.1", id = "ca")
    public void testDeploymentTypeDeclaredInheritedIsInherited() throws Exception
    {
-      assert getCurrentManager().resolveByType(BorderCollie.class).size() == 1;
-      assert getCurrentManager().resolveByType(BorderCollie.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
+      assert getCurrentManager().getBeans(BorderCollie.class).size() == 1;
+      assert getCurrentManager().getBeans(BorderCollie.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
    }
 
    @Test(groups = { "deploymentType" })
    @SpecAssertion(section = "4.1", id = "ca")
    public void testDeploymentTypeNotDeclaredInheritedIsNotInherited()
    {
-      assert getCurrentManager().resolveByType(ShetlandPony.class).size() == 1;
-      assert getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class);
+      assert getCurrentManager().getBeans(ShetlandPony.class).size() == 1;
+      assert getCurrentManager().getBeans(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class);
    }
 
    @Test(groups = { "deploymentType" })
    @SpecAssertion(section = "4.1", id = "cc")
    public void testDeploymentTypeDeclaredInheritedIsBlockedByIntermediateDeploymentTypeNotMarkedInherited()
    {
-      assert getCurrentManager().resolveByType(GoldenRetriever.class).size() == 1;
-      assert getCurrentManager().resolveByType(GoldenRetriever.class).iterator().next().getDeploymentType().equals(Production.class);
+      assert getCurrentManager().getBeans(GoldenRetriever.class).size() == 1;
+      assert getCurrentManager().getBeans(GoldenRetriever.class).iterator().next().getDeploymentType().equals(Production.class);
    }
 
    @Test(groups = { "deploymentType" })
    @SpecAssertion(section = "4.1", id = "cc")
    public void testDeploymentTypeDeclaredInheritedIsBlockedByIntermediateDeploymentTypeMarkedInherited()
    {
-      assert getCurrentManager().resolveByType(GoldenLabrador.class).size() == 1;
-      assert getCurrentManager().resolveByType(GoldenLabrador.class).iterator().next().getDeploymentType().equals(InheritedDeploymentType.class);
+      assert getCurrentManager().getBeans(GoldenLabrador.class).size() == 1;
+      assert getCurrentManager().getBeans(GoldenLabrador.class).iterator().next().getDeploymentType().equals(InheritedDeploymentType.class);
    }
 
    @Test
    @SpecAssertion(section = "4.1", id = "dab")
    public void testDeploymentTypeIsOverriddenByInheritedDeploymentType()
    {
-      assert getCurrentManager().resolveByType(Cow.class).size() == 1;
-      assert getCurrentManager().resolveByType(Cow.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);      
+      assert getCurrentManager().getBeans(Cow.class).size() == 1;
+      assert getCurrentManager().getBeans(Cow.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);      
    }
    
    @Test
    @SpecAssertion(section = "4.1", id = "dcb")
    public void testDeploymentTypeIsOverriddenByIndirectlyInheritedDeploymentType()
    {
-      assert getCurrentManager().resolveByType(JerseyCow.class).size() == 1;
-      assert getCurrentManager().resolveByType(JerseyCow.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);      
+      assert getCurrentManager().getBeans(JerseyCow.class).size() == 1;
+      assert getCurrentManager().getBeans(JerseyCow.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);      
    }   
 
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DisabledDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DisabledDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DisabledDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,9 +6,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Named;
-import javax.annotation.Stereotype;
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedAnimalDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedAnimalDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedAnimalDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/InheritedDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/InheritedDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/InheritedDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/NotInheritedDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/NotInheritedDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/NotInheritedDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/RedSnapper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/RedSnapper.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/RedSnapper.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.deployment;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @FishStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Reindeer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Reindeer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Reindeer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.deployment;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 @HornedMammalStereotype
 @Production

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/SpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/SpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.definition.deployment;
 
-import javax.annotation.Named;
-import javax.inject.Produces;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerField;
 
-import javax.inject.Produces;
-import javax.inject.Production;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerMethod;
 
-import javax.inject.Produces;
-import javax.inject.Production;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Production;
 
 @Production 
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/BeanWithInjectedField_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/BeanWithInjectedField_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/BeanWithInjectedField_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.deployment.broken.typevariable;
 
-import javax.inject.Initializer;
+import javax.enterprise.inject.Initializer;
 
 class BeanWithInjectedField_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/Farmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/Farmer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/Farmer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.deployment.broken.typevariable;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class Farmer_Broken<T>

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/BeanWithInjectedField_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/BeanWithInjectedField_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/BeanWithInjectedField_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.deployment.broken.wildcard;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 class BeanWithInjectedField_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/Farmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/Farmer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/Farmer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.deployment.broken.wildcard;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class Farmer_Broken<T>

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.deployment.custom;
 
-import javax.inject.Standard;
+import javax.enterprise.inject.deployment.Standard;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/HornedAnimalDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/HornedAnimalDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/HornedAnimalDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.definition.deployment.defaultDeploymentType;
 
-import javax.inject.Production;
-import javax.inject.Standard;
+import javax.enterprise.inject.deployment.Production;
+import javax.enterprise.inject.deployment.Standard;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -19,31 +19,31 @@
    @SpecAssertion(section = "4.1", id = "cb")
    public void testDeploymentTypeDeclaredInheritedIsInherited() throws Exception
    {
-      assert getCurrentManager().resolveByType(BorderCollieLocal.class, new WoofBinding()).size() == 1;
-      assert getCurrentManager().resolveByType(BorderCollieLocal.class, new WoofBinding()).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
+      assert getCurrentManager().getBeans(BorderCollieLocal.class, new WoofBinding()).size() == 1;
+      assert getCurrentManager().getBeans(BorderCollieLocal.class, new WoofBinding()).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
    }
    
    @Test(groups = { "deploymentType" })
    @SpecAssertion(section = "4.1", id = "cd")
    public void testDeploymentTypeDeclaredInheritedIsIndirectlyInherited() throws Exception
    {
-      assert getCurrentManager().resolveByType(EnglishBorderCollieLocal.class).size() == 1;
-      assert getCurrentManager().resolveByType(EnglishBorderCollieLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
+      assert getCurrentManager().getBeans(EnglishBorderCollieLocal.class).size() == 1;
+      assert getCurrentManager().getBeans(EnglishBorderCollieLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
    }   
    
    @Test
    @SpecAssertion(section = "4.1", id = "dbb")
    public void testDeploymentTypeIsOverriddenByInheritedDeploymentType()
    {
-      assert getCurrentManager().resolveByType(CowLocal.class).size() == 1;
-      assert getCurrentManager().resolveByType(CowLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);      
+      assert getCurrentManager().getBeans(CowLocal.class).size() == 1;
+      assert getCurrentManager().getBeans(CowLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);      
    }
    
    @Test
    @SpecAssertion(section = "4.1", id = "ddb")
    public void testDeploymentTypeIsOverriddenByIndirectlyInheritedDeploymentType()
    {
-      assert getCurrentManager().resolveByType(JerseyBullLocal.class).size() == 1;
-      assert getCurrentManager().resolveByType(JerseyBullLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);      
+      assert getCurrentManager().getBeans(JerseyBullLocal.class).size() == 1;
+      assert getCurrentManager().getBeans(JerseyBullLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);      
    }     
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedAnimalDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedAnimalDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedAnimalDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Woof.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Woof.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Woof.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/WoofBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/WoofBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/WoofBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.deployment.enterprise;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 public class WoofBinding extends AnnotationLiteral<Woof> implements Woof
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/Gazelle_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/Gazelle_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/Gazelle_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.deployment.nonBuiltInUsesStandard;
 
-import javax.inject.Standard;
+import javax.enterprise.inject.deployment.Standard;
 
 @Standard
 class Gazelle_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,9 +6,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Named;
-import javax.annotation.Stereotype;
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Haddock.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Haddock.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Haddock.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.definition.name;
 
-import javax.annotation.Named;
-import javax.inject.Production;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Named

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Moose.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Moose.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Moose.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.name;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
 
 @Named("aMoose")
 class Moose implements Animal

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.definition.name;
 
+import javax.enterprise.inject.spi.Bean;
 import javax.inject.DefinitionException;
-import javax.inject.manager.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -33,8 +33,8 @@
    })
    public void testNonDefaultNamed()
    {
-      assert getCurrentManager().resolveByType(Moose.class).size() == 1;
-      Bean<Moose> moose =getCurrentManager().resolveByType(Moose.class).iterator().next(); 
+      assert getCurrentManager().getBeans(Moose.class).size() == 1;
+      Bean<Moose> moose =getCurrentManager().getBeans(Moose.class).iterator().next(); 
       assert moose.getName().equals("aMoose");
    }
    
@@ -46,8 +46,8 @@
    })
    public void testDefaultNamed()
    {
-      assert getCurrentManager().resolveByType(Haddock.class).size() == 1; 
-      Bean<Haddock> haddock = getCurrentManager().resolveByType(Haddock.class).iterator().next();
+      assert getCurrentManager().getBeans(Haddock.class).size() == 1; 
+      Bean<Haddock> haddock = getCurrentManager().getBeans(Haddock.class).iterator().next();
       assert haddock.getName() != null;
       assert haddock.getName().equals("haddock");
    }
@@ -60,8 +60,8 @@
    })
    public void testSterotypeDefaultsName()
    {
-      assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1; 
-      Bean<RedSnapper> bean = getCurrentManager().resolveByType(RedSnapper.class).iterator().next();
+      assert getCurrentManager().getBeans(RedSnapper.class).size() == 1; 
+      Bean<RedSnapper> bean = getCurrentManager().getBeans(RedSnapper.class).iterator().next();
       assert bean.getName().equals("redSnapper");
    }
    
@@ -72,8 +72,8 @@
    })
    public void testNotNamedInJava()
    {
-      assert getCurrentManager().resolveByType(SeaBass.class).size() == 1; 
-      Bean<SeaBass> bean = getCurrentManager().resolveByType(SeaBass.class).iterator().next();
+      assert getCurrentManager().getBeans(SeaBass.class).size() == 1; 
+      Bean<SeaBass> bean = getCurrentManager().getBeans(SeaBass.class).iterator().next();
       assert bean.getName() == null;
    }
    
@@ -86,8 +86,8 @@
    @Test @SpecAssertion(section="2.6.4", id = "a")
    public void testNotNamedInStereotype()
    {
-      assert getCurrentManager().resolveByType(Minnow.class).size() == 1; 
-      Bean<Minnow> bean = getCurrentManager().resolveByType(Minnow.class).iterator().next();
+      assert getCurrentManager().getBeans(Minnow.class).size() == 1; 
+      Bean<Minnow> bean = getCurrentManager().getBeans(Minnow.class).iterator().next();
       assert bean.getName() == null;
    }
    

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RedSnapper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RedSnapper.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RedSnapper.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.name;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @FishStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/SeaBass.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/SeaBass.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/SeaBass.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.definition.name;
 
-import javax.context.RequestScoped;
-import javax.inject.Production;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScope.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScope.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScope.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.context.ScopeType;
+import javax.enterprise.context.ScopeType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.context.ScopeType;
+import javax.enterprise.context.ScopeType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Dog.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Dog.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Dog.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.scope;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @RequestScoped
 class Dog

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,9 +6,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Named;
-import javax.annotation.Stereotype;
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Minnow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Minnow.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Minnow.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.scope;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @RiverFishStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/NotInheritedScope.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/NotInheritedScope.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/NotInheritedScope.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.context.ScopeType;
+import javax.enterprise.context.ScopeType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Order.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Order.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.scope;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class Order

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Pollock.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Pollock.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Pollock.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.scope;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 
 @AnimalStereotype
 @FishStereotype

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RedSnapper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RedSnapper.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RedSnapper.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.scope;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @FishStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Retriever.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Retriever.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Retriever.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.scope;
 
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 class Retriever extends Dog

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -5,11 +5,11 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.context.ApplicationScoped;
-import javax.context.Dependent;
-import javax.context.RequestScoped;
-import javax.context.ScopeType;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.ScopeType;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -29,8 +29,8 @@
    @Test @SpecAssertion(section="2.4", id = "c")
    public void testScopeTypesAreExtensible()
    {
-      assert getCurrentManager().resolveByType(Mullet.class).size() == 1; 
-      Bean<Mullet> bean = getCurrentManager().resolveByType(Mullet.class).iterator().next();
+      assert getCurrentManager().getBeans(Mullet.class).size() == 1; 
+      Bean<Mullet> bean = getCurrentManager().getBeans(Mullet.class).iterator().next();
       assert bean.getScopeType().equals(AnotherScopeType.class);
    }
    
@@ -38,8 +38,8 @@
    @SpecAssertion(section="2.4.2", id = "aa")
    public void testScopeTypeHasCorrectTarget()
    {
-      assert getCurrentManager().resolveByType(Mullet.class).size() == 1; 
-      Bean<Mullet> bean = getCurrentManager().resolveByType(Mullet.class).iterator().next();
+      assert getCurrentManager().getBeans(Mullet.class).size() == 1; 
+      Bean<Mullet> bean = getCurrentManager().getBeans(Mullet.class).iterator().next();
       Target target = bean.getScopeType().getAnnotation(Target.class);
       List<ElementType> elements = Arrays.asList(target.value());
       assert elements.contains(ElementType.TYPE);
@@ -51,24 +51,24 @@
    @SpecAssertion(section="2.4.2", id = "b")
    public void testScopeTypeDeclaresScopeTypeAnnotation()
    {
-      assert getCurrentManager().resolveByType(Mullet.class).size() == 1; 
-      Bean<Mullet> bean = getCurrentManager().resolveByType(Mullet.class).iterator().next();
+      assert getCurrentManager().getBeans(Mullet.class).size() == 1; 
+      Bean<Mullet> bean = getCurrentManager().getBeans(Mullet.class).iterator().next();
       assert bean.getScopeType().getAnnotation(ScopeType.class) != null;
    }
    
    @Test @SpecAssertion(section="2.4.3", id = "a")
    public void testScopeDeclaredInJava()
    {
-      assert getCurrentManager().resolveByType(SeaBass.class).size() == 1; 
-      Bean<SeaBass> bean = getCurrentManager().resolveByType(SeaBass.class).iterator().next();
+      assert getCurrentManager().getBeans(SeaBass.class).size() == 1; 
+      Bean<SeaBass> bean = getCurrentManager().getBeans(SeaBass.class).iterator().next();
       assert bean.getScopeType().equals(RequestScoped.class);
    }
    
    @Test @SpecAssertion(section="2.4.5", id = "a")
    public void testDefaultScope()
    {
-      assert getCurrentManager().resolveByType(Order.class).size() == 1; 
-      Bean<Order> bean = getCurrentManager().resolveByType(Order.class).iterator().next();
+      assert getCurrentManager().getBeans(Order.class).size() == 1; 
+      Bean<Order> bean = getCurrentManager().getBeans(Order.class).iterator().next();
       assert bean.getScopeType().equals(Dependent.class);
    }
    
@@ -79,24 +79,24 @@
    })
    public void testScopeSpecifiedAndStereotyped()
    {
-      assert getCurrentManager().resolveByType(Minnow.class).size() == 1; 
-      Bean<Minnow> bean = getCurrentManager().resolveByType(Minnow.class).iterator().next();
+      assert getCurrentManager().getBeans(Minnow.class).size() == 1; 
+      Bean<Minnow> bean = getCurrentManager().getBeans(Minnow.class).iterator().next();
       assert bean.getScopeType().equals(RequestScoped.class);
    }
    
    @Test @SpecAssertion(section="2.4.5", id = "d")
    public void testMutipleIncompatibleScopeStereotypesWithScopeSpecified()
    {
-      assert getCurrentManager().resolveByType(Pollock.class).size() == 1; 
-      Bean<Pollock> bean = getCurrentManager().resolveByType(Pollock.class).iterator().next();
+      assert getCurrentManager().getBeans(Pollock.class).size() == 1; 
+      Bean<Pollock> bean = getCurrentManager().getBeans(Pollock.class).iterator().next();
       assert bean.getScopeType().equals(Dependent.class);
    }
    
    @Test @SpecAssertion(section="2.4.5", id = "c")
    public void testMutipleCompatibleScopeStereotypes()
    {
-      assert getCurrentManager().resolveByType(Grayling.class).size() == 1; 
-      Bean<Grayling> bean = getCurrentManager().resolveByType(Grayling.class).iterator().next();
+      assert getCurrentManager().getBeans(Grayling.class).size() == 1; 
+      Bean<Grayling> bean = getCurrentManager().getBeans(Grayling.class).iterator().next();
       assert bean.getScopeType().equals(ApplicationScoped.class);
    }
    
@@ -107,42 +107,42 @@
    })
    public void testWebBeanScopeTypeOverridesStereotype()
    {
-      assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1; 
-      Bean<RedSnapper> bean = getCurrentManager().resolveByType(RedSnapper.class).iterator().next();
+      assert getCurrentManager().getBeans(RedSnapper.class).size() == 1; 
+      Bean<RedSnapper> bean = getCurrentManager().getBeans(RedSnapper.class).iterator().next();
       assert bean.getScopeType().equals(RequestScoped.class);
    }
    
    @Test @SpecAssertion(section="4.1", id = "ba")
    public void testScopeTypeDeclaredInheritedIsInherited() throws Exception
    {
-      assert getCurrentManager().resolveByType(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().getBeans(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }
    
    @Test @SpecAssertion(section="4.1", id = "ba")
    public void testScopeTypeNotDeclaredInheritedIsNotInherited()
    {
-      assert getCurrentManager().resolveByType(ShetlandPony.class).size() == 1; 
-      assert getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getScopeType().equals(Dependent.class);
+      assert getCurrentManager().getBeans(ShetlandPony.class).size() == 1; 
+      assert getCurrentManager().getBeans(ShetlandPony.class).iterator().next().getScopeType().equals(Dependent.class);
    }
    
    @Test @SpecAssertion(section="4.1", id = "ba")
    public void testScopeTypeDeclaredInheritedIsBlockedByIntermediateScopeTypeMarkedInherited()
    {
-      assert getCurrentManager().resolveByType(GoldenRetriever.class).size() == 1; 
+      assert getCurrentManager().getBeans(GoldenRetriever.class).size() == 1; 
    }
    
    @Test @SpecAssertion(section="4.1", id = "ba")
    public void testScopeTypeDeclaredInheritedIsBlockedByIntermediateScopeTypeNotMarkedInherited()
    {
-      assert getCurrentManager().resolveByType(GoldenLabrador.class).size() == 1; 
-      assert getCurrentManager().resolveByType(GoldenLabrador.class).iterator().next().getScopeType().equals(Dependent.class);
+      assert getCurrentManager().getBeans(GoldenLabrador.class).size() == 1; 
+      assert getCurrentManager().getBeans(GoldenLabrador.class).iterator().next().getScopeType().equals(Dependent.class);
    }
    
    @Test
    @SpecAssertion(section = "4.1", id = "bc")
    public void testScopeTypeDeclaredInheritedIsIndirectlyInherited()
    {
-      assert getCurrentManager().resolveByType(EnglishBorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().getBeans(EnglishBorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }
    
 }
\ No newline at end of file

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/SeaBass.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/SeaBass.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/SeaBass.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.definition.scope;
 
-import javax.context.RequestScoped;
-import javax.inject.Production;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Dog.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Dog.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Dog.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.scope.enterprise;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @RequestScoped
 class Dog

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.scope.enterprise;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -16,13 +16,13 @@
    @Test @SpecAssertion(section="4.1", id = "bb")
    public void testScopeTypeDeclaredInheritedIsInherited() throws Exception
    {
-      assert getCurrentManager().resolveByType(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().getBeans(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }
    
    @Test
    @SpecAssertion(section = "4.1", id = "bd")
    public void testScopeTypeDeclaredInheritedIsIndirectlyInherited()
    {
-      assert getCurrentManager().resolveByType(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().getBeans(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }   
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/AnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/AnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/FishStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/FishStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.definition.scope.tooMany;
 
-import javax.context.ConversationScoped;
-import javax.context.RequestScoped;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.context.RequestScoped;
 
 @RequestScoped
 @ConversationScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,8 +9,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Stereotype;
 
 @ApplicationScoped
 @Stereotype(supportedScopes=ApplicationScoped.class)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.stereotype;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @RequestScopedAnimalStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.stereotype;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @HornedMammalStereotype
 @RequestScopedAnimalStereotype

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
 
 @AnimalStereotype
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.stereotype;
 
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
 
 @ApplicationScopedHornedMammalStereotype
 @RequestScopedAnimalStereotype

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,13 +2,13 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.context.ApplicationScoped;
-import javax.context.Dependent;
-import javax.context.RequestScoped;
-import javax.context.SessionScoped;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Production;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.deployment.Production;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -32,7 +32,7 @@
    @SpecAssertion(section = "2.7.1", id = "b")
    public void testHasStereotypeAnnotation()
    {
-      Bean<Goat> bean = getCurrentManager().resolveByType(Goat.class).iterator().next();
+      Bean<Goat> bean = getCurrentManager().getBeans(Goat.class).iterator().next();
       assert !bean.getDeploymentType().equals(HornedAnimalDeploymentType.class);
    }
 
@@ -43,8 +43,8 @@
    })
    public void testStereotypeWithScopeType()
    {
-      assert getCurrentManager().resolveByType(Moose.class).size() == 1; 
-      assert getCurrentManager().resolveByType(Moose.class).iterator().next().getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().getBeans(Moose.class).size() == 1; 
+      assert getCurrentManager().getBeans(Moose.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }
 
    @Test
@@ -54,15 +54,15 @@
    })
    public void testStereotypeWithoutScopeType()
    {
-      assert getCurrentManager().resolveByType(Reindeer.class).size() == 1; 
-      assert getCurrentManager().resolveByType(Reindeer.class).iterator().next().getScopeType().equals(Dependent.class);
+      assert getCurrentManager().getBeans(Reindeer.class).size() == 1; 
+      assert getCurrentManager().getBeans(Reindeer.class).iterator().next().getScopeType().equals(Dependent.class);
    }
       
    @Test
    @SpecAssertion(section = "2.7", id = "c")
    public void testOneStereotype()
    {
-      Bean<LongHairedDog> bean = getCurrentManager().resolveByType(LongHairedDog.class).iterator().next();
+      Bean<LongHairedDog> bean = getCurrentManager().getBeans(LongHairedDog.class).iterator().next();
       assert bean.getScopeType().equals(RequestScoped.class);
    }
 
@@ -74,8 +74,8 @@
       })
    public void testMultipleStereotypes()
    {
-      assert getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).size() == 1; 
-      Bean<HighlandCow> highlandCow = getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).iterator().next();
+      assert getCurrentManager().getBeans(HighlandCow.class, TAME_LITERAL).size() == 1; 
+      Bean<HighlandCow> highlandCow = getCurrentManager().getBeans(HighlandCow.class, TAME_LITERAL).iterator().next();
       assert highlandCow.getName() == null;
       assert highlandCow.getBindings().iterator().next().annotationType().equals(Tame.class);
       assert highlandCow.getScopeType().equals(RequestScoped.class);
@@ -87,8 +87,8 @@
       @SpecAssertion(section = "2.7.4", id = "c") })
    public void testMultipleStereotypesMergesScopes()
    {
-      assert getCurrentManager().resolveByType(Springbok.class).size() == 1; 
-      assert getCurrentManager().resolveByType(Springbok.class).iterator().next().getScopeType().equals(ApplicationScoped.class);
+      assert getCurrentManager().getBeans(Springbok.class).size() == 1; 
+      assert getCurrentManager().getBeans(Springbok.class).iterator().next().getScopeType().equals(ApplicationScoped.class);
    }
 
    @Test
@@ -96,8 +96,8 @@
       @SpecAssertion(section = "2.7.4", id = "a") })
    public void testRequiredTypeIsImplemented()
    {
-      assert getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).size() == 1; 
-      assert getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).iterator().next().getTypes().contains(Animal.class);
+      assert getCurrentManager().getBeans(HighlandCow.class, TAME_LITERAL).size() == 1; 
+      assert getCurrentManager().getBeans(HighlandCow.class, TAME_LITERAL).iterator().next().getTypes().contains(Animal.class);
    }
 
    @Test
@@ -105,44 +105,44 @@
       @SpecAssertion(section = "2.7.4", id = "b") })
    public void testScopeIsSupported()
    {
-      assert getCurrentManager().resolveByType(Goldfish.class).size() == 1; 
-      assert getCurrentManager().resolveByType(Goldfish.class).iterator().next().getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().getBeans(Goldfish.class).size() == 1; 
+      assert getCurrentManager().getBeans(Goldfish.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }
 
    @Test
    @SpecAssertion(section = "4.1", id = "ab")
    public void testStereotypeDeclaredInheritedIsInherited() throws Exception
    {
-      assert getCurrentManager().resolveByType(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().getBeans(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }
 
    @Test
    @SpecAssertion(section = "4.1", id = "ab")
    public void testStereotypeNotDeclaredInheritedIsNotInherited()
    {
-      assert getCurrentManager().resolveByType(ShetlandPony.class).size() == 1; 
-      assert getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class);
+      assert getCurrentManager().getBeans(ShetlandPony.class).size() == 1; 
+      assert getCurrentManager().getBeans(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class);
    }
    
    @Test
    @SpecAssertion(section = "4.1", id = "ah")
    public void testStereotypeDeclaredInheritedIsIndirectlyInherited()
    {
-      assert getCurrentManager().resolveByType(EnglishBorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);      
+      assert getCurrentManager().getBeans(EnglishBorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);      
    }
    
    @Test
    @SpecAssertion(section = "4.1", id = "daa")
    public void testStereotypeScopeIsOverriddenByInheritedScope()
    {
-      assert getCurrentManager().resolveByType(Chihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class);      
+      assert getCurrentManager().getBeans(Chihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class);      
    }
    
    @Test
    @SpecAssertion(section = "4.1", id = "dca")
    public void testStereotypeScopeIsOverriddenByIndirectlyInheritedScope()
    {
-      assert getCurrentManager().resolveByType(MexicanChihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class);      
+      assert getCurrentManager().getBeans(MexicanChihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class);      
    }   
 
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,8 +9,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.definition.stereotype.enterprise;
 
-import javax.context.RequestScoped;
-import javax.context.SessionScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.SessionScoped;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -24,27 +24,27 @@
    @SpecAssertion(section = "4.1", id = "ae")
    public void testStereotypeDeclaredInheritedIsInherited() throws Exception
    {
-      assert getCurrentManager().resolveByType(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().getBeans(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }
    
    @Test
    @SpecAssertion(section = "4.1", id = "ak")
    public void testStereotypeDeclaredInheritedIsIndirectlyInherited()
    {
-      assert getCurrentManager().resolveByType(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);      
+      assert getCurrentManager().getBeans(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);      
    }   
    
    @Test
    @SpecAssertion(section = "4.1", id = "dba")
    public void testStereotypeScopeIsOverriddenByInheritedScope()
    {
-      assert getCurrentManager().resolveByType(ChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class);      
+      assert getCurrentManager().getBeans(ChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class);      
    }
    
    @Test
    @SpecAssertion(section = "4.1", id = "dda")
    public void testStereotypeScopeIsOverriddenByIndirectlyInheritedScope()
    {
-      assert getCurrentManager().resolveByType(MexicanChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class);      
+      assert getCurrentManager().getBeans(MexicanChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class);      
    }    
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
 
 @AnimalStereotype
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Stereotype;
 
 @ApplicationScoped
 @Stereotype

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Named;
-import javax.annotation.Stereotype;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,8 +9,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Bovine.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Bovine.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Bovine.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
+import javax.enterprise.inject.Stereotype;
 
 
 @Stereotype(requiredTypes=Mammal.class)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(supportedScopes=RequestScoped.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.inject.Production;
+import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.deployment.Production;
 
 @Stereotype
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,9 +6,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.ApplicationScoped;
-import javax.context.RequestScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
+import javax.enterprise.inject.Stereotype;
 
 
 @Stereotype

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessAuthorizationDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessAuthorizationDecorator.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessAuthorizationDecorator.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import javax.decorator.Decorates;
 import javax.decorator.Decorator;
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 @Decorator
 class DataAccessAuthorizationDecorator implements DataAccess

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -61,9 +61,9 @@
    })
    public void testOnlyEnabledBeansDeployed()
    {
-      assert !getCurrentManager().resolveByType(User.class).isEmpty();
-      assert getCurrentManager().resolveByType(DisabledBean.class).isEmpty();
-      assert getCurrentManager().resolveByType(Interceptor1.class).isEmpty();
-      assert getCurrentManager().resolveByType(DataAccessAuthorizationDecorator.class).isEmpty();
+      assert !getCurrentManager().getBeans(User.class).isEmpty();
+      assert getCurrentManager().getBeans(DisabledBean.class).isEmpty();
+      assert getCurrentManager().getBeans(Interceptor1.class).isEmpty();
+      assert getCurrentManager().getBeans(DataAccessAuthorizationDecorator.class).isEmpty();
    }
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.deployment.lifecycle;
 
-import javax.inject.AnnotationLiteral;
-import javax.inject.manager.Initialized;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
 
-class InitializedBinding extends AnnotationLiteral<Initialized> implements Initialized
+class InitializedBinding extends AnnotationLiteral<BeforeBeanDiscovery> implements BeforeBeanDiscovery
 {
 
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,11 +1,11 @@
 package org.jboss.jsr299.tck.tests.deployment.lifecycle;
 
-import javax.context.ApplicationScoped;
-import javax.context.RequestScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
 import javax.event.Observes;
-import javax.inject.manager.Deployed;
-import javax.inject.manager.Initialized;
-import javax.inject.manager.Manager;
 
 class ManagerObserver
 {
@@ -14,19 +14,19 @@
    private static boolean requestContextActive = false;
    private static boolean applicationContextActive = false;
    
-   public void managerInitialized(@Observes @Initialized Manager manager)
+   public void managerInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager)
    {
       managerInitialized = true;
-      requestContextActive = manager.getContext(RequestScoped.class).isActive();
-      applicationContextActive = manager.getContext(ApplicationScoped.class).isActive();
+      requestContextActive = beanManager.getContext(RequestScoped.class).isActive();
+      applicationContextActive = beanManager.getContext(ApplicationScoped.class).isActive();
    }
 
-   public void managerDeployed(@Observes @Deployed Manager manager)
+   public void managerDeployed(@Observes @AfterBeanDiscovery BeanManager beanManager)
    {
       assert managerInitialized : "Manager should have been initialized before deployed";
       managerDeployed = true;
-      requestContextActive &= manager.getContext(RequestScoped.class).isActive();
-      applicationContextActive &= manager.getContext(ApplicationScoped.class).isActive();
+      requestContextActive &= beanManager.getContext(RequestScoped.class).isActive();
+      applicationContextActive &= beanManager.getContext(ApplicationScoped.class).isActive();
    }
 
    public static boolean isManagerInitialized()

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BrokenInitializerBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BrokenInitializerBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BrokenInitializerBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail;
 
+import javax.enterprise.inject.Initializer;
 import javax.event.Observes;
-import javax.inject.Initializer;
 
 class BrokenInitializerBean
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/ManagerObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/ManagerObserver.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/ManagerObserver.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,12 +1,12 @@
 package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail;
 
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
 import javax.event.Observes;
-import javax.inject.manager.Initialized;
-import javax.inject.manager.Manager;
 
 class ManagerObserver
 {
-   public void managerInitialized(@Observes @Initialized Manager manager)
+   public void managerInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager)
    {
       assert false : "Deployment should already have failed";
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanWithInjection.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanWithInjection.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanWithInjection.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail2;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 class BeanWithInjection
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/ManagerObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/ManagerObserver.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/ManagerObserver.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,20 +1,20 @@
 package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail2;
 
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
 import javax.event.Observes;
-import javax.inject.manager.Deployed;
-import javax.inject.manager.Initialized;
-import javax.inject.manager.Manager;
 
 class ManagerObserver
 {
    private static boolean managerInitialized;
    
-   public void managerInitialized(@Observes @Initialized Manager manager)
+   public void managerInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager)
    {
       managerInitialized = true;
    }
 
-   public void managerDeployed(@Observes @Deployed Manager manager)
+   public void managerDeployed(@Observes @AfterBeanDiscovery BeanManager beanManager)
    {
       assert false : "Manager should not be deployed due to deployment errors";
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ManagerObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ManagerObserver.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ManagerObserver.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,12 +1,12 @@
 package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail3;
 
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
 import javax.event.Observes;
-import javax.inject.manager.Initialized;
-import javax.inject.manager.Manager;
 
 class ManagerObserver
 {
-   public void managerInitialized(@Observes @Initialized Manager manager)
+   public void managerInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager)
    {
       assert false : "This error should be turned into a DefinitionException";
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ManagerObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ManagerObserver.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ManagerObserver.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,12 +1,12 @@
 package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail4;
 
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Observes;
-import javax.inject.manager.Deployed;
-import javax.inject.manager.Manager;
 
 class ManagerObserver
 {
-   public void managerDeployed(@Observes @Deployed Manager manager)
+   public void managerDeployed(@Observes @AfterBeanDiscovery BeanManager beanManager)
    {
       assert false : "This error should result in a DeploymentException";
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype()
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotypeAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotypeAnnotationLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotypeAnnotationLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,10 +2,10 @@
 
 import java.util.Set;
 
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 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.
@@ -13,11 +13,11 @@
  */
 class BananaSpider
 {
-   public void observeStringEvent(@Observes String someEvent, @Current Manager manager)
+   public void observeStringEvent(@Observes String someEvent, @Current BeanManager beanManager)
    {
       assert someEvent != null;
-      assert manager != null;
-      Set<Observer<String>> allStringObservers = manager.resolveObservers(someEvent);
+      assert beanManager != null;
+      Set<Observer<String>> allStringObservers = beanManager.resolveObservers(someEvent);
       assert allStringObservers != null;
       assert allStringObservers.size() > 0;
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingNotRuntime.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingNotRuntime.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingNotRuntime.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -5,7 +5,7 @@
 
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { FIELD, PARAMETER })
 @BindingType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -4,15 +4,15 @@
 import java.util.ArrayList;
 import java.util.Set;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.inject.deployment.Standard;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Event;
 import javax.event.Observer;
-import javax.inject.AnnotationLiteral;
 import javax.inject.DuplicateBindingTypeException;
-import javax.inject.Standard;
-import javax.inject.TypeLiteral;
-import javax.inject.manager.Bean;
-import javax.inject.manager.Manager;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -150,7 +150,7 @@
    @SpecAssertions( { @SpecAssertion(section = "7.2", id = "a") })
    public void testManagerInterfaceForFireEventMethod() throws Exception
    {
-      assert Manager.class.getDeclaredMethod("fireEvent", Object.class, Annotation[].class) != null;
+      assert BeanManager.class.getDeclaredMethod("fireEvent", Object.class, Annotation[].class) != null;
    }
 
    @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
@@ -564,7 +564,7 @@
          {
             // Retrieve the implicit event bean from the manager only by
             // its API type
-            Set<?> eventBeans = getCurrentManager().resolveByType(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding());
+            Set<?> eventBeans = getCurrentManager().getBeans(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding());
             assert !eventBeans.isEmpty();
          }
 
@@ -583,7 +583,7 @@
          {
             // Retrieve the implicit event bean from the manager
             // by its binding types (uses OrangeCheekedWaxbill)
-            Set<?> eventBeans = getCurrentManager().resolveByType(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding(), new TameAnnotationLiteral(), new RoleBinding("Admin"));
+            Set<?> eventBeans = getCurrentManager().getBeans(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding(), new TameAnnotationLiteral(), new RoleBinding("Admin"));
             assert !eventBeans.isEmpty();
          }
 
@@ -602,7 +602,7 @@
          {
             // Retrieve the implicit event bean from the manager
             // only by its API type (uses BlueFacedParrotFinch)
-            Set<?> eventBeans = getCurrentManager().resolveByType(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding());
+            Set<?> eventBeans = getCurrentManager().getBeans(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding());
             assert eventBeans.size() == 1;
             Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next();
             assert eventBean.getDeploymentType().equals(Standard.class);
@@ -622,7 +622,7 @@
          {
             // Retrieve the implicit event bean from the manager only
             // by its API type (uses BlueFacedParrotFinch)
-            Set<?> eventBeans = getCurrentManager().resolveByType(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding());
+            Set<?> eventBeans = getCurrentManager().getBeans(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding());
             assert eventBeans.size() == 1;
             Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next();
             assert eventBean.getScopeType().equals(Dependent.class);
@@ -641,7 +641,7 @@
          {
             // Retrieve the implicit event bean from the manager only
             // by its API type (uses BlueFacedParrotFinch)
-            Set<?> eventBeans = getCurrentManager().resolveByType(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding());
+            Set<?> eventBeans = getCurrentManager().getBeans(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding());
             assert eventBeans.size() == 1;
             Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next();
             assert eventBean.getName() == null;
@@ -660,7 +660,7 @@
          {
             // Retrieve the implicit event bean from the manager only
             // by its API type (uses BlueFacedParrotFinch)
-            Set<?> eventBeans = getCurrentManager().resolveByType(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding());
+            Set<?> eventBeans = getCurrentManager().getBeans(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding());
             assert eventBeans.size() == 1;
          }
       }.run();

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event;
 
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes @AnotherDeploymentType
 class FarmShop extends Shop

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FiresBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FiresBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FiresBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.event;
 
+import javax.enterprise.inject.AnnotationLiteral;
 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/jsr299/tck/tests/event/Pomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
 import javax.event.Observes;
 
 @Named("Teddy")

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 import javax.event.IfExists;
 import javax.event.Observes;
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Role.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Role.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Role.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -7,7 +7,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { FIELD, PARAMETER })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 
 class RoleBinding extends AnnotationLiteral<Role> implements Role

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.event;
 
-import javax.annotation.Named;
 import javax.ejb.Stateful;
+import javax.enterprise.inject.Named;
 import javax.event.Observes;
 
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TeaCupPomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TeaCupPomeranian.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TeaCupPomeranian.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
 import javax.event.Observes;
 
 @Tame

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/JavaSparrow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/JavaSparrow_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/JavaSparrow_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.event.broken.event4;
 
+import javax.enterprise.inject.Produces;
 import javax.event.Event;
 import javax.event.Fires;
-import javax.inject.Produces;
 
 class JavaSparrow_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TameAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TameAnnotationLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TameAnnotationLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.broken.observer10;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TeaCupPomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TeaCupPomeranian.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TeaCupPomeranian.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.broken.observer10;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
 import javax.event.Observes;
 
 @Tame

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/TeaCupPomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/TeaCupPomeranian.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/TeaCupPomeranian.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.broken.observer11;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
 import javax.event.Observes;
 
 @Tame

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/Boxer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/Boxer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/Boxer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.event.broken.observer2;
 
-import javax.context.ConversationScoped;
 import javax.ejb.Stateless;
+import javax.enterprise.context.ConversationScoped;
 
 @Stateless
 @ConversationScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/YorkshireTerrier_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/YorkshireTerrier_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/YorkshireTerrier_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,13 +1,13 @@
 package org.jboss.jsr299.tck.tests.event.broken.observer2;
 
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
 import javax.event.Observes;
-import javax.inject.manager.Initialized;
-import javax.inject.manager.Manager;
 
 
 class YorkshireTerrier_Broken
 {
-   public void observeInitialized(@Observes @Initialized Manager manager, @Observes Boxer anotherDog)
+   public void observeInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager, @Observes Boxer anotherDog)
    {
    }
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/BorderTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/BorderTerrier.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/BorderTerrier.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,14 +1,14 @@
 package org.jboss.jsr299.tck.tests.event.broken.observer4;
 
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
 import javax.event.Observes;
-import javax.inject.Produces;
-import javax.inject.manager.Initialized;
-import javax.inject.manager.Manager;
 
 class BorderTerrier
 {
    @Produces
-   public String observeInitialized(@Observes @Initialized Manager manager)
+   public String observeInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager)
    {
       return "product";
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/AustralianTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/AustralianTerrier.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/AustralianTerrier.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.event.broken.observer5;
 
+import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
 import javax.event.Observes;
-import javax.inject.Initializer;
-import javax.inject.manager.Initialized;
-import javax.inject.manager.Manager;
 
 class AustralianTerrier
 {
@@ -11,7 +11,7 @@
     * @see org.jboss.jsr299.tck.unit.event.broken.observer5.Terrier#observeInitialized(javax.inject.manager.Manager)
     */
    @Initializer
-   public void observeInitialized(@Observes @Initialized Manager manager)
+   public void observeInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager)
    {
    }
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/FoxTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/FoxTerrier.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/FoxTerrier.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,16 +1,16 @@
 package org.jboss.jsr299.tck.tests.event.broken.observer6;
 
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
 import javax.event.Observes;
-import javax.inject.Disposes;
-import javax.inject.manager.Initialized;
-import javax.inject.manager.Manager;
 
 class FoxTerrier
 {
    /* (non-Javadoc)
     * @see org.jboss.jsr299.tck.unit.event.broken.observer6.Terrier#observeInitialized(javax.inject.manager.Manager, java.lang.String)
     */
-   public void observeInitialized(@Observes @Initialized Manager manager, @Disposes String badParam)
+   public void observeInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager, @Disposes String badParam)
    {
    }
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AuroraFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AuroraFinch.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AuroraFinch.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.event.register.fires1;
 
+import javax.enterprise.inject.Initializer;
 import javax.event.Event;
 import javax.event.Fires;
-import javax.inject.Initializer;
 
 import org.jboss.jsr299.tck.tests.event.register.fires1.StarFinch.Mess;
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BirdCage.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BirdCage.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BirdCage.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.event.register.fires1;
 
-import javax.annotation.Named;
-import javax.context.RequestScoped;
-import javax.inject.Current;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
 
 import org.jboss.jsr299.tck.tests.event.register.fires1.StarFinch.Mess;
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/FinchKeeper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/FinchKeeper.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/FinchKeeper.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.event.register.fires1;
 
-import javax.annotation.Named;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Named;
 import javax.event.Observes;
 
 import org.jboss.jsr299.tck.tests.event.register.fires1.StarFinch.Mess;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyed.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyed.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyed.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyedLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyedLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyedLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.register.fires1;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 public class OneEyedLiteral extends AnnotationLiteral<OneEyed> implements OneEyed
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OrangeCheekedWaxbill.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OrangeCheekedWaxbill.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OrangeCheekedWaxbill.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.event.register.fires1;
 
+import javax.enterprise.inject.Initializer;
 import javax.event.Event;
 import javax.event.Fires;
-import javax.inject.Initializer;
 
 import org.jboss.jsr299.tck.tests.event.register.fires1.StarFinch.Mess;
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/StarFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/StarFinch.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/StarFinch.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.event.register.fires1;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 import javax.event.Event;
 import javax.event.Fires;
-import javax.inject.Produces;
 
 @Named("StarFinch")
 public class StarFinch

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype()
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotypeAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotypeAnnotationLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotypeAnnotationLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.register.observer1;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -20,8 +20,8 @@
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
+import javax.enterprise.inject.TypeLiteral;
 import javax.event.Observer;
-import javax.inject.TypeLiteral;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Role.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Role.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Role.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -4,7 +4,7 @@
 
 import java.lang.annotation.Retention;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @BindingType
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/RoleBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/RoleBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/RoleBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.register.observer1;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 
 class RoleBinding extends AnnotationLiteral<Role> implements Role

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/TameAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/TameAnnotationLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/TameAnnotationLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.register.observer1;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype()
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotypeAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotypeAnnotationLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotypeAnnotationLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.register.observer2;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -20,8 +20,8 @@
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
+import javax.enterprise.inject.TypeLiteral;
 import javax.event.Observer;
-import javax.inject.TypeLiteral;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Role.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Role.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Role.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -4,7 +4,7 @@
 
 import java.lang.annotation.Retention;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @BindingType
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/RoleBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/RoleBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/RoleBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.register.observer2;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 
 class RoleBinding extends AnnotationLiteral<Role> implements Role

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/TameAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/TameAnnotationLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/TameAnnotationLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.register.observer2;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeA.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeA.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeA.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,5 +1,5 @@
 package org.jboss.jsr299.tck.tests.event.resolve.binding;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 public class BindingTypeABinding extends AnnotationLiteral<BindingTypeA> implements BindingTypeA {}
\ No newline at end of file

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeB.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeB.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeB.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,5 +1,5 @@
 package org.jboss.jsr299.tck.tests.event.resolve.binding;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 public class BindingTypeBBinding extends AnnotationLiteral<BindingTypeB> implements BindingTypeB {}
\ No newline at end of file

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeC.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeC.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeC.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.resolve.binding;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 public class BindingTypeCBinding extends AnnotationLiteral<BindingTypeC> implements BindingTypeC
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype()
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.resolve.nonbinding;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.util.Set;
 
+import javax.enterprise.inject.TypeLiteral;
 import javax.event.Observer;
-import javax.inject.TypeLiteral;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.util.ArrayList;
 
+import javax.enterprise.inject.TypeLiteral;
 import javax.event.Observer;
-import javax.inject.TypeLiteral;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogAgent.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogAgent.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogAgent.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,14 +2,14 @@
 
 import static javax.ejb.TransactionManagementType.BEAN;
 
-import javax.annotation.Named;
 import javax.annotation.Resource;
 import javax.annotation.security.RunAs;
 import javax.ejb.EJBException;
 import javax.ejb.Stateless;
 import javax.ejb.TransactionManagement;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.transaction.UserTransaction;
 
 @Stateless
@@ -22,7 +22,7 @@
    private UserTransaction userTransaction;
 
    @Current
-   private Manager jsr299Manager;
+   private BeanManager jsr299Manager;
 
    public void sendInTransaction(Object event)
    {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -21,7 +21,7 @@
 import java.math.BigInteger;
 
 import javax.ejb.EJBException;
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,14 +6,14 @@
 import java.math.BigInteger;
 import java.util.logging.Logger;
 
-import javax.annotation.Named;
 import javax.annotation.Resource;
-import javax.context.SessionScoped;
 import javax.ejb.EJBException;
 import javax.ejb.Remove;
 import javax.ejb.SessionContext;
 import javax.ejb.Stateful;
 import javax.ejb.TransactionManagement;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Named;
 import javax.event.AfterTransactionCompletion;
 import javax.event.AfterTransactionFailure;
 import javax.event.AfterTransactionSuccess;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Deadliest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Deadliest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Deadliest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.inject.AnnotationLiteral;
-import javax.inject.manager.Bean;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -36,7 +36,7 @@
          @Override
          protected void execute() throws Exception
          {
-            Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class, DEADLIEST_LITERAL).iterator().next();
+            Bean<Tarantula> tarantula = getCurrentManager().getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next();
             Tarantula instance = getCurrentManager().getInstance(tarantula);
             tarantula.destroy(instance);
          }
@@ -59,7 +59,7 @@
          @Override
          protected void execute() throws Exception
          {
-            Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class, DEADLIEST_LITERAL).iterator().next();
+            Bean<Tarantula> tarantula = getCurrentManager().getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next();
             Tarantula instance = getCurrentManager().getInstance(tarantula);
             tarantula.destroy(instance);
          }
@@ -86,7 +86,7 @@
          @Override
          protected void execute() throws Exception
          {
-            Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class, DEADLIEST_LITERAL).iterator().next();
+            Bean<Tarantula> tarantula = getCurrentManager().getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next();
             Tarantula instance = getCurrentManager().getInstance(tarantula);
             tarantula.destroy(instance);
          }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition;
 
-import javax.inject.Disposes;
+import javax.enterprise.inject.Disposes;
 
 class DisposalNonBean
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition;
 
-import javax.inject.Current;
-import javax.inject.Disposes;
-import javax.inject.Produces;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken1;
 
-import javax.inject.Disposes;
-import javax.inject.Produces;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken2;
 
-import javax.inject.Disposes;
-import javax.inject.Produces;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken3;
 
-import javax.inject.Disposes;
-import javax.inject.Initializer;
-import javax.inject.Produces;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken4;
 
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
 import javax.event.Observes;
-import javax.inject.Disposes;
-import javax.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5;
 
-import javax.inject.Disposes;
-import javax.inject.Produces;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5;
 
-import javax.inject.UnsatisfiedDependencyException;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -15,7 +15,7 @@
  * 
  */
 @Artifact
- at ExpectedDeploymentException(UnsatisfiedDependencyException.class)
+ at ExpectedDeploymentException(UnsatisfiedResolutionException.class)
 @BeansXml("beans.xml")
 public class UnresolvedDisposalMethodDefinitionTest extends AbstractJSR299Test
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken6;
 
 import javax.ejb.Stateless;
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @Stateless
 public class AppleTree implements AppleTreeLocal

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,9 +2,9 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.context.RequestScoped;
-import javax.inject.AnnotationLiteral;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -29,28 +29,28 @@
    @SpecAssertion(section = "3.3", id = "b")
    public void testStatelessWithDependentScopeOK()
    {
-      assert getCurrentManager().resolveByType(GiraffeLocal.class).size() == 1;
+      assert getCurrentManager().getBeans(GiraffeLocal.class).size() == 1;
    }
 
    @Test(groups = { "enterpriseBeans" })
    @SpecAssertion(section = "3.3", id = "c")
    public void testSingletonWithDependentScopeOK()
    {
-      assert getCurrentManager().resolveByType(Labrador.class).size() == 1;
+      assert getCurrentManager().getBeans(Labrador.class).size() == 1;
    }
 
    @Test(groups = { "enterpriseBeans" })
    @SpecAssertion(section = "3.3", id = "c")
    public void testSingletonWithApplicationScopeOK()
    {
-      assert getCurrentManager().resolveByType(Laika.class).size() == 1;
+      assert getCurrentManager().getBeans(Laika.class).size() == 1;
    }
 
    @Test(groups = { "enterpriseBeans" })
    @SpecAssertion(section = "3.3.2", id = "a")
    public void testAnnotatedEnterpriseBean()
    {
-      assert getCurrentManager().resolveByType(GiraffeLocal.class).size() > 0;
+      assert getCurrentManager().getBeans(GiraffeLocal.class).size() > 0;
    }
 
    @Test(groups = { "enterpriseBeans" })
@@ -60,7 +60,7 @@
       @SpecAssertion(section = "3.3.4", id = "c") } )
    public void testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces()
    {
-      Bean<DogLocal> dogBean = getCurrentManager().resolveByType(DogLocal.class).iterator().next();
+      Bean<DogLocal> dogBean = getCurrentManager().getBeans(DogLocal.class).iterator().next();
       assert dogBean.getTypes().contains(DogLocal.class);
       assert dogBean.getTypes().contains(PitbullLocal.class);
       assert !dogBean.getTypes().contains(Pitbull.class);
@@ -76,7 +76,7 @@
    public void testEnterpriseBeanWithLocalViewAndNotParameterizedTypeHasClassAndSuperclassesAsBeanTypes()
    {
       //TODO We need a 3.1 compliant container for this test
-      Bean<DogLocal> dogBean = getCurrentManager().resolveByType(DogLocal.class).iterator().next();
+      Bean<DogLocal> dogBean = getCurrentManager().getBeans(DogLocal.class).iterator().next();
       assert dogBean.getTypes().contains(Pitbull.class);
    }
 
@@ -88,15 +88,15 @@
    })
    public void testObjectIsInAPITypes()
    {
-      assert getCurrentManager().resolveByType(GiraffeLocal.class).size() == 1;
-      assert getCurrentManager().resolveByType(GiraffeLocal.class).iterator().next().getTypes().contains(Object.class);
+      assert getCurrentManager().getBeans(GiraffeLocal.class).size() == 1;
+      assert getCurrentManager().getBeans(GiraffeLocal.class).iterator().next().getTypes().contains(Object.class);
    }
 
    @Test(groups = { "enterpriseBeans" })
    @SpecAssertion(section = "3.3.3", id = "d")
    public void testRemoteInterfacesAreNotInAPITypes()
    {
-      Bean<DogLocal> dogBean = getCurrentManager().resolveByType(DogLocal.class).iterator().next();
+      Bean<DogLocal> dogBean = getCurrentManager().getBeans(DogLocal.class).iterator().next();
       assert !dogBean.getTypes().contains(DogRemote.class);
    }
 
@@ -104,7 +104,7 @@
    @SpecAssertion(section = "3.3.4", id = "ba")
    public void testBeanWithScopeAnnotation()
    {
-      Bean<LionLocal> lionBean = getCurrentManager().resolveByType(LionLocal.class).iterator().next();
+      Bean<LionLocal> lionBean = getCurrentManager().getBeans(LionLocal.class).iterator().next();
       assert lionBean.getScopeType().equals(RequestScoped.class);
    }
 
@@ -112,7 +112,7 @@
    @SpecAssertion(section = "3.3.4", id = "bb")
    public void testBeanWithNamedAnnotation()
    {
-      Bean<MonkeyLocal> monkeyBean = getCurrentManager().resolveByType(MonkeyLocal.class).iterator().next();
+      Bean<MonkeyLocal> monkeyBean = getCurrentManager().getBeans(MonkeyLocal.class).iterator().next();
       assert monkeyBean.getName().equals("Monkey");
    }
 
@@ -120,7 +120,7 @@
    @SpecAssertion(section = "3.3.4", id = "bc")
    public void testBeanWithDeploymentType()
    {
-      Bean<MonkeyLocal> monkeyBean = getCurrentManager().resolveByType(MonkeyLocal.class).iterator().next();
+      Bean<MonkeyLocal> monkeyBean = getCurrentManager().getBeans(MonkeyLocal.class).iterator().next();
       assert monkeyBean.getDeploymentType().equals(AnotherDeploymentType.class);
    }
 
@@ -128,7 +128,7 @@
    @SpecAssertion(section = "3.3.4", id = "bd")
    public void testBeanWithStereotype()
    {
-      Bean<PolarBearLocal> polarBearBean = getCurrentManager().resolveByType(PolarBearLocal.class).iterator().next();
+      Bean<PolarBearLocal> polarBearBean = getCurrentManager().getBeans(PolarBearLocal.class).iterator().next();
       assert polarBearBean.getDeploymentType().equals(AnotherDeploymentType.class);
       assert polarBearBean.getScopeType().equals(RequestScoped.class);
       assert polarBearBean.getName().equals("polarBear");
@@ -139,7 +139,7 @@
    public void testBeanWithBindings()
    {
       Annotation tame = new AnnotationLiteral<Tame>(){};
-      Bean<ApeLocal> apeBean = getCurrentManager().resolveByType(ApeLocal.class, tame).iterator().next();
+      Bean<ApeLocal> apeBean = getCurrentManager().getBeans(ApeLocal.class, tame).iterator().next();
       assert apeBean.getBindings().contains(tame);
    }
 
@@ -147,8 +147,8 @@
    @SpecAssertion(section = "3.3.8", id = "a")
    public void testDefaultName()
    {
-      assert getCurrentManager().resolveByType(PitbullLocal.class).size() == 1;
-      assert getCurrentManager().resolveByType(PitbullLocal.class).iterator().next().getName().equals("pitbull");
+      assert getCurrentManager().getBeans(PitbullLocal.class).size() == 1;
+      assert getCurrentManager().getBeans(PitbullLocal.class).iterator().next().getName().equals("pitbull");
    }
 
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -17,7 +17,7 @@
 
 package org.jboss.jsr299.tck.tests.implementation.enterprise.definition;
 
-import javax.inject.manager.Bean;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -48,7 +48,7 @@
    })
    public void testEjbDeclaredInXmlNotSimpleBean()
    {
-      Bean<ElephantLocal> elephantBean = getCurrentManager().resolveByType(ElephantLocal.class).iterator().next();
+      Bean<ElephantLocal> elephantBean = getCurrentManager().getBeans(ElephantLocal.class).iterator().next();
       // The interface is a known type but the class should not be
       assert elephantBean.getTypes().contains(ElephantLocal.class);
       assert !elephantBean.getTypes().contains(Elephant.class);

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.definition;
 
-import javax.context.Dependent;
 import javax.ejb.Singleton;
+import javax.enterprise.context.Dependent;
 
 @Singleton
 @Dependent

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.definition;
 
-import javax.context.ApplicationScoped;
 import javax.ejb.Remove;
 import javax.ejb.Singleton;
+import javax.enterprise.context.ApplicationScoped;
 
 @Singleton
 @ApplicationScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Lion.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Lion.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Lion.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.definition;
 
-import javax.context.RequestScoped;
 import javax.ejb.Stateful;
+import javax.enterprise.context.RequestScoped;
 
 @Stateful
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.definition;
 
-import javax.annotation.Named;
 import javax.ejb.Stateless;
+import javax.enterprise.inject.Named;
 
 @Stateless
 @Named("Monkey")

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.definition;
 
-import javax.annotation.Named;
-import javax.context.ApplicationScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Named;
 
 @Stateful
 @ApplicationScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,9 +8,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Named;
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -4,10 +4,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.context.Context;
-import javax.context.CreationalContext;
-import javax.context.RequestScoped;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -57,7 +57,7 @@
    public void testCreateSFSB() throws Exception
    {
       GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class);
-      Bean<KleinStadt> stadtBean = getCurrentManager().resolveByType(KleinStadt.class).iterator().next();
+      Bean<KleinStadt> stadtBean = getCurrentManager().getBeans(KleinStadt.class).iterator().next();
       assert stadtBean != null : "Expected a bean for stateful session bean Kassel";
       CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>();
       KleinStadt stadtInstance = stadtBean.create(creationalContext);
@@ -91,7 +91,7 @@
    public void testDestroyRemovesSFSB() throws Exception
    {
       GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class);
-      Bean<KleinStadt> stadtBean = getCurrentManager().resolveByType(KleinStadt.class).iterator().next();
+      Bean<KleinStadt> stadtBean = getCurrentManager().getBeans(KleinStadt.class).iterator().next();
       assert stadtBean != null : "Expected a bean for stateful session bean Kassel";
       Context requestContext = getCurrentManager().getContext(RequestScoped.class);
       CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>();
@@ -122,7 +122,7 @@
    @SpecAssertion(section = "6.6", id = "a")
    public void testCreateSLSB()
    {
-      Bean<NeueStadt> stadtBean = getCurrentManager().resolveByType(NeueStadt.class).iterator().next();
+      Bean<NeueStadt> stadtBean = getCurrentManager().getBeans(NeueStadt.class).iterator().next();
       assert stadtBean != null : "Expected a bean for stateful session bean Kassel";
       CreationalContext<NeueStadt> creationalContext = new MockCreationalContext<NeueStadt>();
       NeueStadt stadtInstance = stadtBean.create(creationalContext);
@@ -158,7 +158,7 @@
    {
       UniStadt marburg = getCurrentManager().getInstanceByType(UniStadt.class);
       assert marburg != null : "Couldn't find the main SFSB";
-      Bean<UniStadt> uniStadtBean = getCurrentManager().resolveByType(UniStadt.class).iterator().next();
+      Bean<UniStadt> uniStadtBean = getCurrentManager().getBeans(UniStadt.class).iterator().next();
       uniStadtBean.destroy(marburg);
       GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class);
       assert frankfurt.isSchlossDestroyed();
@@ -169,7 +169,7 @@
    public void testDirectSubClassInheritsPostConstructOnSuperclass() throws Exception
    {
       OrderProcessor.postConstructCalled = false;
-      assert getCurrentManager().resolveByType(DirectOrderProcessorLocal.class).size() == 1;
+      assert getCurrentManager().getBeans(DirectOrderProcessorLocal.class).size() == 1;
       new RunInDependentContext()
       {
          @Override
@@ -186,7 +186,7 @@
    public void testIndirectSubClassInheritsPostConstructOnSuperclass() throws Exception
    {
       OrderProcessor.postConstructCalled = false;
-      assert getCurrentManager().resolveByType(OrderProcessorLocal.class).size() == 1;
+      assert getCurrentManager().getBeans(OrderProcessorLocal.class).size() == 1;
       new RunInDependentContext()
       {
          @Override
@@ -203,13 +203,13 @@
    public void testSubClassInheritsPreDestroyOnSuperclass() throws Exception
    {
       OrderProcessor.preDestroyCalled = false;
-      assert getCurrentManager().resolveByType(DirectOrderProcessorLocal.class).size() == 1;
+      assert getCurrentManager().getBeans(DirectOrderProcessorLocal.class).size() == 1;
       new RunInDependentContext()
       {
          @Override
          protected void execute() throws Exception
          {  
-            Bean<DirectOrderProcessorLocal> bean = getCurrentManager().resolveByType(DirectOrderProcessorLocal.class).iterator().next();
+            Bean<DirectOrderProcessorLocal> bean = getCurrentManager().getBeans(DirectOrderProcessorLocal.class).iterator().next();
             DirectOrderProcessorLocal instance = getCurrentManager().getInstanceByType(DirectOrderProcessorLocal.class);
             bean.destroy(instance);
          }
@@ -222,13 +222,13 @@
    public void testIndirectSubClassInheritsPreDestroyOnSuperclass() throws Exception
    {
       OrderProcessor.preDestroyCalled = false;
-      assert getCurrentManager().resolveByType(IndirectOrderProcessor.class).size() == 1;
+      assert getCurrentManager().getBeans(IndirectOrderProcessor.class).size() == 1;
       new RunInDependentContext()
       {
          @Override
          protected void execute() throws Exception
          {  
-            Bean<IndirectOrderProcessor> bean = getCurrentManager().resolveByType(IndirectOrderProcessor.class).iterator().next();
+            Bean<IndirectOrderProcessor> bean = getCurrentManager().getBeans(IndirectOrderProcessor.class).iterator().next();
             IndirectOrderProcessor instance = getCurrentManager().getInstanceByType(IndirectOrderProcessor.class);
             bean.destroy(instance);
          }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
 
-import javax.context.RequestScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
+import javax.enterprise.context.RequestScoped;
 
 @Stateful
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,10 +2,10 @@
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import javax.context.RequestScoped;
 import javax.ejb.EJB;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
+import javax.enterprise.context.RequestScoped;
 
 @Stateful
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,10 +1,10 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
 
 import javax.annotation.PreDestroy;
-import javax.context.Dependent;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.inject.Current;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Current;
 
 @Stateful
 @Dependent

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import javax.annotation.PostConstruct;
 import javax.ejb.Stateless;
-import javax.inject.Current;
-import javax.inject.Initializer;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Initializer;
 
 @Stateless
 public class Mainz implements AlteStadt

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 @Stateful
 public class Marburg implements UniStadt

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
 
-import javax.context.CreationalContext;
+import javax.enterprise.context.spi.CreationalContext;
 
 public class MockCreationalContext<T> implements CreationalContext<T>
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.newAndOtherBinding;
 
-import javax.inject.Current;
-import javax.inject.New;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.New;
 
 class NewAndOtherBindingType_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.newAndOtherBinding;
 
-import javax.annotation.Named;
-import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Named;
 
 @SessionScoped
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,9 +8,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Named;
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
 
-import javax.context.SessionScoped;
 import javax.ejb.Stateful;
-import javax.inject.Disposes;
-import javax.inject.Produces;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetriever.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetriever.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetriever.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
 
-import javax.context.RequestScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
+import javax.enterprise.context.RequestScoped;
 import javax.event.Observes;
 
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/InitializerSimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/InitializerSimpleBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/InitializerSimpleBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,10 +2,10 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
-import javax.context.SessionScoped;
 import javax.ejb.Stateful;
-import javax.inject.Initializer;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Named;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
 
-import javax.inject.AnnotationLiteral;
-import javax.inject.manager.Bean;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -92,7 +92,7 @@
          {
             FoxLocal fox = getCurrentManager().getInstanceByType(FoxLocal.class);
             FoxLocal newFox = getCurrentManager().getInstanceByType(FoxLocal.class, new NewLiteral());
-            Bean<Litter> litterBean = getCurrentManager().resolveByType(Litter.class).iterator().next();
+            Bean<Litter> litterBean = getCurrentManager().getBeans(Litter.class).iterator().next();
             Litter litter = getCurrentManager().getInstanceByType(Litter.class);
             litterBean.destroy(litter);
             assert fox.isLitterDisposed();

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -3,13 +3,14 @@
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
-import javax.context.Dependent;
-import javax.context.RequestScoped;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
-import javax.inject.New;
-import javax.inject.Standard;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.New;
+import javax.enterprise.inject.deployment.Standard;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -37,7 +38,7 @@
    @SpecAssertion(section = "3.3.6", id = "d")
    public void testNewBeanIsDependentScoped()
    {
-      Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, new NewLiteral());
+      Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral());
       assert beans.size() == 1;
       newEnterpriseBean = beans.iterator().next();
       assert Dependent.class.equals(newEnterpriseBean.getScopeType());
@@ -47,7 +48,7 @@
    @SpecAssertion(section = "3.3.6", id = "e")
    public void testNewBeanIsOfStandardDeploymentType()
    {
-      Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, new NewLiteral());
+      Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral());
       assert beans.size() == 1;
       newEnterpriseBean = beans.iterator().next();
       assert Standard.class.equals(newEnterpriseBean.getDeploymentType());
@@ -57,7 +58,7 @@
    @SpecAssertion(section = "3.3.6", id = "f")
    public void testNewBeanIsHasOnlyNewBinding()
    {
-      Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, new NewLiteral());
+      Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral());
       assert beans.size() == 1;
       newEnterpriseBean = beans.iterator().next();
       assert newEnterpriseBean.getBindings().size() == 1;
@@ -68,7 +69,7 @@
    @SpecAssertion(section = "3.3.6", id = "g")
    public void testNewBeanHasNoWebBeanName()
    {
-      Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, new NewLiteral());
+      Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral());
       assert beans.size() == 1;
       newEnterpriseBean = beans.iterator().next();
       assert newEnterpriseBean.getName() == null;
@@ -78,8 +79,8 @@
    @SpecAssertion(section = "3.3.6", id = "h")
    public void testNewBeanHasNoStereotypes()
    {
-      Bean<MonkeyLocal> monkeyBean = getCurrentManager().resolveByType(MonkeyLocal.class).iterator().next();
-      Bean<MonkeyLocal> newMonkeyBean = getCurrentManager().resolveByType(MonkeyLocal.class, new NewLiteral()).iterator().next();
+      Bean<MonkeyLocal> monkeyBean = getCurrentManager().getBeans(MonkeyLocal.class).iterator().next();
+      Bean<MonkeyLocal> newMonkeyBean = getCurrentManager().getBeans(MonkeyLocal.class, new NewLiteral()).iterator().next();
       assert monkeyBean.getScopeType().equals(RequestScoped.class);
       assert newMonkeyBean.getScopeType().equals(Dependent.class);
       assert monkeyBean.getName().equals("monkey");
@@ -101,24 +102,24 @@
    })
    public void testForEachEnterpriseBeanANewBeanExists()
    {
-      Bean<OrderLocal> orderBean = getCurrentManager().resolveByType(OrderLocal.class).iterator().next();
-      Bean<OrderLocal> newOrderBean = getCurrentManager().resolveByType(OrderLocal.class, new NewLiteral()).iterator().next();
+      Bean<OrderLocal> orderBean = getCurrentManager().getBeans(OrderLocal.class).iterator().next();
+      Bean<OrderLocal> newOrderBean = getCurrentManager().getBeans(OrderLocal.class, new NewLiteral()).iterator().next();
       assert orderBean.getBindings().size() == 1;
       assert orderBean.getBindings().iterator().next().annotationType().equals(Current.class);
       
-      assert getCurrentManager().resolveByType(OrderLocal.class, new NewLiteral()).size() == 1;
+      assert getCurrentManager().getBeans(OrderLocal.class, new NewLiteral()).size() == 1;
       assert newOrderBean.getBindings().size() == 1;
       assert newOrderBean.getBindings().iterator().next().annotationType().equals(New.class);
       
       assert orderBean.getTypes().equals(newOrderBean.getTypes());
       
-      Bean<LionLocal> lionBean = getCurrentManager().resolveByType(LionLocal.class, TAME_LITERAL).iterator().next();
-      Bean<LionLocal> newLionBean = getCurrentManager().resolveByType(LionLocal.class, new NewLiteral()).iterator().next();
-      assert getCurrentManager().resolveByType(LionLocal.class, TAME_LITERAL).size() == 1;
+      Bean<LionLocal> lionBean = getCurrentManager().getBeans(LionLocal.class, TAME_LITERAL).iterator().next();
+      Bean<LionLocal> newLionBean = getCurrentManager().getBeans(LionLocal.class, new NewLiteral()).iterator().next();
+      assert getCurrentManager().getBeans(LionLocal.class, TAME_LITERAL).size() == 1;
       assert lionBean.getBindings().size() == 1;
       assert lionBean.getBindings().iterator().next().annotationType().equals(Tame.class);
       
-      assert getCurrentManager().resolveByType(LionLocal.class, new NewLiteral()).size() == 1;
+      assert getCurrentManager().getBeans(LionLocal.class, new NewLiteral()).size() == 1;
       assert newLionBean.getBindings().size() == 1;
       assert newLionBean.getBindings().iterator().next().annotationType().equals(New.class);
       

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Order.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Order.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
 
-import javax.annotation.Named;
-import javax.context.SessionScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Named;
 
 @SessionScoped
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -3,7 +3,7 @@
 import javax.annotation.PreDestroy;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 @Stateful
 public class DependentSessionBean implements DependentSessionInterface

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.remove;
 
-import javax.context.SessionScoped;
 import javax.ejb.Stateful;
+import javax.enterprise.context.SessionScoped;
 
 @Stateful
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.remove;
 
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 class StateKeeper

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithConversationScope;
 
-import javax.context.ConversationScoped;
+import javax.enterprise.context.ConversationScoped;
 
 
 //@Singleton

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithRequestScope;
 
-import javax.context.RequestScoped;
 import javax.ejb.Singleton;
+import javax.enterprise.context.RequestScoped;
 
 @Singleton
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.context.SessionScoped;
 import javax.ejb.Singleton;
+import javax.enterprise.context.SessionScoped;
 
 @Singleton
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithApplicationScope;
 
-import javax.context.ApplicationScoped;
 import javax.ejb.Stateless;
+import javax.enterprise.context.ApplicationScoped;
 
 @Stateless
 @ApplicationScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithConversationScope;
 
-import javax.context.ConversationScoped;
 import javax.ejb.Stateless;
+import javax.enterprise.context.ConversationScoped;
 
 @Stateless
 @ConversationScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithRequestScope;
 
-import javax.context.RequestScoped;
 import javax.ejb.Stateless;
+import javax.enterprise.context.RequestScoped;
 
 @Stateless
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithSessionScope;
 
-import javax.context.SessionScoped;
 import javax.ejb.Stateless;
+import javax.enterprise.context.SessionScoped;
 
 @Stateless
 @SessionScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/AndalusianChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/AndalusianChicken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/AndalusianChicken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.initializer;
 
 import javax.ejb.Stateless;
-import javax.inject.Initializer;
+import javax.enterprise.inject.Initializer;
 
 @Stateless
 public class AndalusianChicken implements LocalChicken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Chicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Chicken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Chicken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.initializer;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class Chicken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenHutch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenHutch.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenHutch.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.initializer;
 
-import javax.inject.Initializer;
+import javax.enterprise.inject.Initializer;
 
 class ChickenHutch
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Fox.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Fox.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.initializer;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 
 @Dependent
 class Fox

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Preferred.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Preferred.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Preferred.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Retention(RUNTIME)
 @Target({TYPE, METHOD, FIELD, PARAMETER})

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PremiumChickenHutch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PremiumChickenHutch.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PremiumChickenHutch.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.initializer;
 
-import javax.inject.Initializer;
+import javax.enterprise.inject.Initializer;
 
 class PremiumChickenHutch
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChickenHutch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChickenHutch.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChickenHutch.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.initializer;
 
-import javax.inject.Initializer;
+import javax.enterprise.inject.Initializer;
 
 class StandardChickenHutch
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardVariety.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardVariety.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardVariety.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Retention(RUNTIME)
 @Target({TYPE, METHOD, FIELD, PARAMETER})

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.initializer.methodAnnotatedProduces;
 
-import javax.inject.Initializer;
-import javax.inject.Produces;
+import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Produces;
 
 class Pheasant_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedDisposes;
 
-import javax.inject.Disposes;
-import javax.inject.Initializer;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Initializer;
 
 class Capercaillie_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/DangerCall.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/DangerCall.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/DangerCall.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedObserves;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class DangerCall

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedObserves;
 
+import javax.enterprise.inject.Initializer;
 import javax.event.Observes;
-import javax.inject.Initializer;
 
 
 class Grouse_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/Dottrel_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/Dottrel_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/Dottrel_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.initializer.staticInitializer;
 
-import javax.inject.Initializer;
+import javax.enterprise.inject.Initializer;
 
 class Dottrel_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AsAnimal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AsAnimal.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AsAnimal.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
 
-import javax.annotation.Named;
-import javax.inject.Produces;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 
 public class BlackWidowProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Chicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Chicken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Chicken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 
 class Chicken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 class FunnelWeaverSpiderConsumer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 class FunnelWeaverSpiderProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LadybirdSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LadybirdSpider.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LadybirdSpider.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
 
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 class LadybirdSpider extends Spider

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
 
-import javax.annotation.Named;
-import javax.inject.Produces;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class OtherSpiderProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -3,10 +3,11 @@
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
-import javax.context.RequestScoped;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Production;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.deployment.Production;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -34,7 +35,7 @@
    @SpecAssertion(section = "2.5.3", id = "h")
    public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception
    {
-      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class);
+      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class);
       assert tarantulaBeans.size() == 1;
       assert tarantulaBeans.iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
    }
@@ -63,9 +64,9 @@
    })
    public void testBeanDeclaresMultipleProducerFields()
    {
-      assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL).size() == 1;
       assert getCurrentManager().getInstanceByType(Tarantula.class, TAME_LITERAL).equals(OtherSpiderProducer.TARANTULA) ;
-      assert getCurrentManager().resolveByType(BlackWidow.class, TAME_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(BlackWidow.class, TAME_LITERAL).size() == 1;
       assert getCurrentManager().getInstanceByType(BlackWidow.class, TAME_LITERAL).equals(OtherSpiderProducer.BLACK_WIDOW) ;
    }
 
@@ -75,7 +76,7 @@
    })
    public void testDefaultBindingType()
    {
-      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class);
+      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class);
       assert tarantulaBeans.size() == 1;
       assert tarantulaBeans.iterator().next().getBindings().contains(new CurrentLiteral());
    }
@@ -84,7 +85,7 @@
    @SpecAssertion(section = "3.5.1", id = "c")
    public void testApiTypeForClassReturn()
    {
-      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class);
+      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class);
       assert tarantulaBeans.size() == 1;
       Bean<Tarantula> tarantulaBean = tarantulaBeans.iterator().next();
       assert tarantulaBean.getTypes().size() == 6;
@@ -100,7 +101,7 @@
    @SpecAssertion(section = "3.5.1", id = "a")
    public void testApiTypeForInterfaceReturn()
    {
-      Set<Bean<Animal>> animalBeans = getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<AsAnimal>() {});
+      Set<Bean<Animal>> animalBeans = getCurrentManager().getBeans(Animal.class, new AnnotationLiteral<AsAnimal>() {});
       assert animalBeans.size() == 1;
       Bean<Animal> animalModel = animalBeans.iterator().next();
       assert animalModel.getTypes().size() == 2;
@@ -112,7 +113,7 @@
    @SpecAssertion(section = "3.5.1", id = "b")
    public void testApiTypeForPrimitiveReturn()
    {
-      Set<Bean<?>> beans = getCurrentManager().resolveByName("SpiderSize");
+      Set<Bean<?>> beans = getCurrentManager().getBeans("SpiderSize");
       assert beans.size() == 1;
       Bean<?> intModel = beans.iterator().next();
       assert intModel.getTypes().size() == 2;
@@ -127,7 +128,7 @@
    })
    public void testApiTypeForArrayTypeReturn()
    {
-      Set<Bean<Spider[]>> spidersBeans = getCurrentManager().resolveByType(Spider[].class);
+      Set<Bean<Spider[]>> spidersBeans = getCurrentManager().getBeans(Spider[].class);
       assert spidersBeans.size() == 1;
       Bean<Spider[]> spidersModel = spidersBeans.iterator().next();
       assert spidersModel.getTypes().size() == 2;
@@ -142,7 +143,7 @@
    })
    public void testBindingType()
    {
-      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, new TameAnnotationLiteral());
+      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class, new TameAnnotationLiteral());
       assert tarantulaBeans.size() == 1;
       Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next();
       assert tarantulaModel.getBindings().size() == 1;
@@ -153,7 +154,7 @@
    @SpecAssertion(section = "3.5.2", id = "b")
    public void testScopeType()
    {
-      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL, FOO_LITERAL);
+      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL, FOO_LITERAL);
       assert !tarantulaBeans.isEmpty();
       Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next();
       assert tarantulaModel.getScopeType().equals(RequestScoped.class);
@@ -163,7 +164,7 @@
    @SpecAssertion(section = "3.5.2", id = "d")
    public void testDeploymentType()
    {
-      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL, FOO_LITERAL);
+      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL, FOO_LITERAL);
       assert !tarantulaBeans.isEmpty();
       Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next();
       assert tarantulaModel.getDeploymentType().equals(Production.class);
@@ -176,7 +177,7 @@
    })
    public void testNamedField()
    {
-      Set<Bean<?>> beans = getCurrentManager().resolveByName("blackWidow");
+      Set<Bean<?>> beans = getCurrentManager().getBeans("blackWidow");
       assert beans.size() == 1;
 
       @SuppressWarnings("unchecked")
@@ -192,7 +193,7 @@
    })
    public void testDefaultNamedField()
    {
-      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, STATIC_LITERAL);
+      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class, STATIC_LITERAL);
       assert tarantulaBeans.size() == 1;
       Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next();
       assert tarantulaModel.getName().equals("produceTarantula");
@@ -206,7 +207,7 @@
    })
    public void testStereotype()
    {
-      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, STATIC_LITERAL);
+      Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class, STATIC_LITERAL);
       assert !tarantulaBeans.isEmpty();
       Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next();
       assert tarantulaModel.getScopeType().equals(RequestScoped.class);

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -25,10 +25,10 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Named;
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
-import javax.inject.Production;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.deployment.Production;
 
 /**
  * Test stereotype used to change the scope type and deployment type

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Static.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Static.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Static.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -17,7 +17,7 @@
 
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameAnnotationLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameAnnotationLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
 
-import javax.context.RequestScoped;
-import javax.inject.Produces;
-import javax.inject.Production;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Production;
 
 
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -17,7 +17,7 @@
 
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 /**
  * This bean contains an injection point for a Tarantula that must be provided

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class TarantulaProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Chicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Chicken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Chicken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.enterprise;
 
 import javax.ejb.Stateful;
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @Stateful
 public class Chicken implements ChickenLocal

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Foo.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Foo.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Foo.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.parameterizedReturnTypeWithWildcard;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 public class SpiderProducerWildCardType_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -17,7 +17,7 @@
 
 package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 /**
  * This simple bean contains an injection point to receive the value of a

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
 
-import javax.annotation.Named;
-import javax.inject.Produces;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 public class BlackWidowProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BrownRecluseProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BrownRecluseProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BrownRecluseProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 class BrownRecluseProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Null.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Null.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Null.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -17,8 +17,8 @@
 
 package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
 
-import javax.annotation.Named;
-import javax.inject.Produces;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 
 /**
  * Contains producer for Spider which always is a null value and

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -17,9 +17,9 @@
 
 package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
 
-import javax.annotation.Named;
-import javax.context.RequestScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 
 /**
  * Bean with a producer field that always returns null and is not

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
 
-import javax.inject.IllegalProductException;
+import javax.enterprise.inject.IllegalProductException;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -17,8 +17,8 @@
 
 package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
 
-import javax.inject.Produces;
-import javax.inject.Specializes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Specializes;
 
 /**
  * This bean contains a producer field and specializes another bean

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -25,10 +25,10 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Named;
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
-import javax.inject.Production;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.deployment.Production;
 
 /**
  * Test stereotype used to change the scope type and deployment type

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -17,7 +17,7 @@
 
 package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 public class StaticTarantulaProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaConsumer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaConsumer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -17,7 +17,7 @@
 
 package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 /**
  * This bean contains an injection point for a Tarantula that must be provided

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 public class TarantulaProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Working.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Working.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Working.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
 
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AppleTree.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AppleTree.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AppleTree.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 class AppleTree
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/BeanWithStaticProducerMethod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/BeanWithStaticProducerMethod.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/BeanWithStaticProducerMethod.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
 
-import javax.inject.Disposes;
-import javax.inject.Produces;
-import javax.inject.Production;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class BeanWithStaticProducerMethod

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Chicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Chicken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Chicken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 class Chicken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Deadliest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Deadliest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Deadliest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/LadybirdSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/LadybirdSpider.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/LadybirdSpider.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 class LadybirdSpider extends Spider implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
 
-import javax.inject.Disposes;
-import javax.inject.Produces;
-import javax.inject.Production;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class NonBeanWithStaticProducerMethod

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
 
-import javax.context.Dependent;
-import javax.context.RequestScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class OakTree

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,12 +2,13 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.context.RequestScoped;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
-import javax.inject.IllegalProductException;
-import javax.inject.TypeLiteral;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.IllegalProductException;
+import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -36,8 +37,8 @@
    } )
    public void testProducerMethodInheritsDeploymentTypeOfDeclaringWebBean() throws Exception
    {
-      assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).size() == 1;
-      assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
+      assert getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
    }
 
    @Test(groups = "producerMethod")
@@ -48,7 +49,7 @@
    } )
    public void testStaticMethod() throws Exception
    {
-      assert getCurrentManager().resolveByType(String.class).size() == 1;
+      assert getCurrentManager().getBeans(String.class).size() == 1;
       assert getCurrentManager().getInstanceByType(String.class).equals(BeanWithStaticProducerMethod.getString());
    }
 
@@ -58,7 +59,7 @@
    } )
    public void testProducerOnNonBean() throws Exception
    {
-      assert getCurrentManager().resolveByType(Cherry.class).isEmpty();
+      assert getCurrentManager().getBeans(Cherry.class).isEmpty();
    }
 
    @Test(groups = "producerMethod")
@@ -67,9 +68,9 @@
    } )
    public void testStaticDisposalMethod() throws Exception
    {
-      assert getCurrentManager().resolveByType(String.class).size() == 1;
+      assert getCurrentManager().getBeans(String.class).size() == 1;
       String aString = getCurrentManager().getInstanceByType(String.class);
-      Bean<String> stringBean = getCurrentManager().resolveByType(String.class).iterator().next();
+      Bean<String> stringBean = getCurrentManager().getBeans(String.class).iterator().next();
       stringBean.destroy(aString);
       assert BeanWithStaticProducerMethod.stringDestroyed;
    }
@@ -78,7 +79,7 @@
    @SpecAssertion(section = "3.4", id = "g")
    public void testParameterizedReturnType() throws Exception
    {
-      assert getCurrentManager().resolveByType(new TypeLiteral<FunnelWeaver<Spider>>() {}).size() == 1;
+      assert getCurrentManager().getBeans(new TypeLiteral<FunnelWeaver<Spider>>() {}).size() == 1;
    }
 
    @Test(groups = "producerMethod")
@@ -89,9 +90,9 @@
    })
    public void testDefaultBindingType() throws Exception
    {
-      assert getCurrentManager().resolveByType(Tarantula.class).size() == 1;
-      assert getCurrentManager().resolveByType(Tarantula.class).iterator().next().getBindings().size() == 1;
-      assert getCurrentManager().resolveByType(Tarantula.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class);
+      assert getCurrentManager().getBeans(Tarantula.class).size() == 1;
+      assert getCurrentManager().getBeans(Tarantula.class).iterator().next().getBindings().size() == 1;
+      assert getCurrentManager().getBeans(Tarantula.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class);
    }
 
    @Test(groups = "producerMethod")
@@ -101,8 +102,8 @@
    })
    public void testApiTypeForClassReturn() throws Exception
    {
-      assert getCurrentManager().resolveByType(Tarantula.class).size() == 1;
-      Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
+      assert getCurrentManager().getBeans(Tarantula.class).size() == 1;
+      Bean<Tarantula> tarantula = getCurrentManager().getBeans(Tarantula.class).iterator().next();
       
       assert tarantula.getTypes().size() == 6;
       assert tarantula.getTypes().contains(Tarantula.class);
@@ -117,8 +118,8 @@
    @SpecAssertion(section = "3.4.1", id = "a")
    public void testApiTypeForInterfaceReturn() throws Exception
    {
-      assert getCurrentManager().resolveByType(Bite.class).size() == 1;
-      Bean<Bite> animal = getCurrentManager().resolveByType(Bite.class).iterator().next();
+      assert getCurrentManager().getBeans(Bite.class).size() == 1;
+      Bean<Bite> animal = getCurrentManager().getBeans(Bite.class).iterator().next();
       assert animal.getTypes().size() == 2;
       assert animal.getTypes().contains(Bite.class);
       assert animal.getTypes().contains(Object.class);
@@ -128,8 +129,8 @@
    @SpecAssertion(section = "3.4.1", id = "b")
    public void testApiTypeForPrimitiveReturn() throws Exception
    {
-      assert getCurrentManager().resolveByType(Integer.class).size() == 1;
-      Bean<Integer> integer = getCurrentManager().resolveByType(Integer.class).iterator().next();
+      assert getCurrentManager().getBeans(Integer.class).size() == 1;
+      Bean<Integer> integer = getCurrentManager().getBeans(Integer.class).iterator().next();
       assert integer.getTypes().size() == 2;
       assert integer.getTypes().contains(int.class);
       assert integer.getTypes().contains(Object.class);
@@ -142,8 +143,8 @@
    })
    public void testApiTypeForArrayTypeReturn() throws Exception
    {
-      assert getCurrentManager().resolveByType(Spider[].class).size() == 1;
-      Bean<Spider[]> spiders = getCurrentManager().resolveByType(Spider[].class).iterator().next();
+      assert getCurrentManager().getBeans(Spider[].class).size() == 1;
+      Bean<Spider[]> spiders = getCurrentManager().getBeans(Spider[].class).iterator().next();
       assert spiders.getTypes().size() == 2;
       assert spiders.getTypes().contains(Spider[].class);
       assert spiders.getTypes().contains(Object.class);
@@ -156,8 +157,8 @@
    })
    public void testBindingType() throws Exception
    {
-      assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).size() == 1;
-      Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).iterator().next();
+      assert getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL).size() == 1;
+      Bean<Tarantula> tarantula = getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL).iterator().next();
       assert tarantula.getBindings().size() == 1;
       assert tarantula.getBindings().iterator().next().annotationType().equals(Tame.class);
    }
@@ -169,8 +170,8 @@
    })
    public void testScopeType() throws Exception
    {
-      assert getCurrentManager().resolveByType(DaddyLongLegs.class).size() == 1;
-      Bean<DaddyLongLegs> daddyLongLegs = getCurrentManager().resolveByType(DaddyLongLegs.class).iterator().next();
+      assert getCurrentManager().getBeans(DaddyLongLegs.class).size() == 1;
+      Bean<DaddyLongLegs> daddyLongLegs = getCurrentManager().getBeans(DaddyLongLegs.class).iterator().next();
       assert daddyLongLegs.getScopeType().equals(RequestScoped.class);
    }
 
@@ -181,8 +182,8 @@
    })
    public void testDeploymentType() throws Exception
    {
-      assert getCurrentManager().resolveByType(LadybirdSpider.class).size() == 1;
-      Bean<LadybirdSpider> ladybirdSpider = getCurrentManager().resolveByType(LadybirdSpider.class).iterator().next();
+      assert getCurrentManager().getBeans(LadybirdSpider.class).size() == 1;
+      Bean<LadybirdSpider> ladybirdSpider = getCurrentManager().getBeans(LadybirdSpider.class).iterator().next();
       assert ladybirdSpider.getDeploymentType().equals(SpiderDeploymentType.class);
    }
 
@@ -193,8 +194,8 @@
    })
    public void testNamedMethod() throws Exception
    {
-      assert getCurrentManager().resolveByType(BlackWidow.class).size() == 1;
-      Bean<BlackWidow> blackWidowSpider = getCurrentManager().resolveByType(BlackWidow.class).iterator().next();
+      assert getCurrentManager().getBeans(BlackWidow.class).size() == 1;
+      Bean<BlackWidow> blackWidowSpider = getCurrentManager().getBeans(BlackWidow.class).iterator().next();
       assert blackWidowSpider.getName().equals("blackWidow");
    }
 
@@ -206,8 +207,8 @@
    })
    public void testDefaultNamedMethod() throws Exception
    {
-      assert getCurrentManager().resolveByType(DaddyLongLegs.class).size() == 1;
-      Bean<DaddyLongLegs> daddyLongLegsSpider = getCurrentManager().resolveByType(DaddyLongLegs.class).iterator().next();
+      assert getCurrentManager().getBeans(DaddyLongLegs.class).size() == 1;
+      Bean<DaddyLongLegs> daddyLongLegsSpider = getCurrentManager().getBeans(DaddyLongLegs.class).iterator().next();
       assert daddyLongLegsSpider.getName().equals("produceDaddyLongLegs");
    }
 
@@ -224,8 +225,8 @@
    })
    public void testStereotypeSpecifiesScope() throws Exception
    {
-      assert getCurrentManager().resolveByType(WolfSpider.class).size() == 1;
-      Bean<WolfSpider> wolfSpider = getCurrentManager().resolveByType(WolfSpider.class).iterator().next();
+      assert getCurrentManager().getBeans(WolfSpider.class).size() == 1;
+      Bean<WolfSpider> wolfSpider = getCurrentManager().getBeans(WolfSpider.class).iterator().next();
       assert wolfSpider.getScopeType().equals(RequestScoped.class);
    }
 
@@ -233,7 +234,7 @@
    @SpecAssertion(section = "4.2", id = "da")
    public void testNonStaticProducerMethodInheritedBySpecializingSubclass()
    {
-      assert getCurrentManager().resolveByType(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 1;
+      assert getCurrentManager().getBeans(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 1;
       assert getCurrentManager().getInstanceByType(Egg.class, new AnnotationLiteral<Yummy>() {}).getMother().getClass().equals(AndalusianChicken.class);
    }
    
@@ -244,7 +245,7 @@
    })
    public void testNonStaticProducerMethodNotInherited()
    {
-      assert getCurrentManager().resolveByType(Apple.class, new AnnotationLiteral<Yummy>() {}).size() == 1;
+      assert getCurrentManager().getBeans(Apple.class, new AnnotationLiteral<Yummy>() {}).size() == 1;
       assert getCurrentManager().getInstanceByType(Apple.class, new AnnotationLiteral<Yummy>() {}).getTree().getClass().equals(AppleTree.class);      
    }
    
@@ -252,7 +253,7 @@
    @SpecAssertion(section = "2.3.6", id = "a")
    public void testBindingTypesAppliedToProducerMethodParameters()
    {
-      Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class, DEADLIEST_LITERAL).iterator().next();
+      Bean<Tarantula> tarantula = getCurrentManager().getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next();
       Tarantula instance = getCurrentManager().getInstance(tarantula);
       assert instance.getDeathsCaused() == 1;
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
 
-import javax.annotation.Named;
-import javax.context.RequestScoped;
-import javax.inject.Current;
-import javax.inject.Produces;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Yummy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Yummy.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Yummy.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise;
 
 import javax.ejb.Stateful;
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @AnotherDeploymentType
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AppleTree.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AppleTree.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AppleTree.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise;
 
 import javax.ejb.Stateful;
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @Stateful
 public class AppleTree implements AppleTreeLocal

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Chicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Chicken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Chicken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise;
 
 import javax.ejb.Stateful;
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @Stateful
 public class Chicken implements ChickenLocal

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -22,7 +22,7 @@
    @SpecAssertion(section = "4.2", id = "dd")
    public void testNonStaticProducerMethodInheritedBySpecializingSubclass()
    {
-      assert getCurrentManager().resolveByType(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 1;
+      assert getCurrentManager().getBeans(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 1;
       assert getCurrentManager().getInstanceByType(Egg.class, new AnnotationLiteral<Yummy>() {}).getMother().getClass().equals(AndalusianChicken.class);
    }
    
@@ -33,7 +33,7 @@
    })
    public void testNonStaticProducerMethodNotInherited()
    {
-      assert getCurrentManager().resolveByType(Apple.class, new AnnotationLiteral<Yummy>() {}).size() == 1;
+      assert getCurrentManager().getBeans(Apple.class, new AnnotationLiteral<Yummy>() {}).size() == 1;
       assert getCurrentManager().getInstanceByType(Apple.class, new AnnotationLiteral<Yummy>() {}).getTree().getClass().equals(AppleTree.class);      
    }
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Yummy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Yummy.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Yummy.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/FooProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/FooProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/FooProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.enterprise.nonbusiness;
 
 import javax.ejb.Stateful;
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @Stateful
 public class FooProducer implements FooProducerLocal

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
 
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Bakery.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Bakery.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Bakery.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 class Bakery
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/BrownRecluse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/BrownRecluse.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/BrownRecluse.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,15 +1,15 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
 
-import javax.inject.Current;
-import javax.inject.Produces;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.BeanManager;
 
 class BrownRecluse
 {
    @Produces
-   public SpiderEgg layAnEgg(@Current Manager manager)
+   public SpiderEgg layAnEgg(@Current BeanManager beanManager)
    {
-      assert manager != null : "Manager was not injected";
+      assert beanManager != null : "Manager was not injected";
       return new SpiderEgg();
    }
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @PoultryFarmDeploymentType
 class Chicken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
 
-import javax.context.RequestScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class Lays

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class LorryProducer_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/MockCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/MockCreationalContext.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/MockCreationalContext.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
 
-import javax.context.CreationalContext;
+import javax.enterprise.context.spi.CreationalContext;
 
 public class MockCreationalContext<T> implements CreationalContext<T>
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Null.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Null.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Null.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
 
-import javax.context.Dependent;
-import javax.inject.IllegalProductException;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.IllegalProductException;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -40,7 +40,7 @@
          {
             SpiderProducer.setTarantulaDestroyed(false);
             Tarantula tarantula = getCurrentManager().getInstanceByType(Tarantula.class);
-            Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
+            Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class).iterator().next();
             tarantulaBean.destroy(tarantula);
             assert SpiderProducer.isTarantulaDestroyed();
             assert SpiderProducer.isDestroyArgumentsSet();
@@ -81,7 +81,7 @@
          @Override
          protected void execute() throws Exception
          {
-            Bean<SpiderEgg> eggBean = getCurrentManager().resolveByType(SpiderEgg.class).iterator().next();
+            Bean<SpiderEgg> eggBean = getCurrentManager().getBeans(SpiderEgg.class).iterator().next();
             assert eggBean.create(new MockCreationalContext<SpiderEgg>()) != null;
          }
          
@@ -103,7 +103,7 @@
          protected void execute() throws Exception
          {
             Tarantula.setNumberCreated(0);
-            Bean<Tarantula> spiderBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
+            Bean<Tarantula> spiderBean = getCurrentManager().getBeans(Tarantula.class).iterator().next();
             Tarantula tarantula = getCurrentManager().getInstance(spiderBean);
             assert tarantula.getValue().equals("Pete");
             assert Tarantula.getNumberCreated() == 1;
@@ -117,7 +117,7 @@
    })
    public void testCreateReturnsNullIfProducerDoesAndDependent() throws Exception
    {
-      Bean<Bread> breadBean = getCurrentManager().resolveByType(Bread.class).iterator().next();
+      Bean<Bread> breadBean = getCurrentManager().getBeans(Bread.class).iterator().next();
       assert breadBean.create(new MockCreationalContext<Bread>()) == null;
    }
 
@@ -127,7 +127,7 @@
    })
    public void testCreateFailsIfProducerReturnsNullAndNotDependent() throws Exception
    {
-      Bean<PotatoChip> chipBean = getCurrentManager().resolveByType(PotatoChip.class).iterator().next();
+      Bean<PotatoChip> chipBean = getCurrentManager().getBeans(PotatoChip.class).iterator().next();
       assert chipBean.create(new MockCreationalContext<PotatoChip>()) == null;
    }
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Request.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Request.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Request.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class ShipProducer_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
 
-import javax.inject.Current;
-import javax.inject.Disposes;
-import javax.inject.Produces;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.BeanManager;
 
 @AnotherDeploymentType
 class SpiderProducer
@@ -25,10 +25,10 @@
       return null;
    }
    
-   public static void destroyTarantula(@Disposes Tarantula spider, @Current Manager manager)
+   public static void destroyTarantula(@Disposes Tarantula spider, @Current BeanManager beanManager)
    {
       tarantulaDestroyed = true;
-      if (manager != null)
+      if (beanManager != null)
       {
          destroyArgumentsSet = true;
       }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducerNotUsed.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducerNotUsed.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducerNotUsed.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
 
-import javax.inject.Disposes;
-import javax.inject.Produces;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
 
 public class SpiderProducerNotUsed
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
 
-import javax.context.RequestScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.parameterAnnotatedDisposes;
 
-import javax.inject.Disposes;
-import javax.inject.Produces;
-import javax.inject.Production;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class SpiderProducer_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.parameterAnnotatedObserves;
 
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Production;
 import javax.event.Observes;
-import javax.inject.Produces;
-import javax.inject.Production;
 
 @Production
 class SpiderProducer_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 class SpiderProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/TProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/TProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/TProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter2;
 
-import javax.inject.Produces;
-import javax.inject.manager.InjectionPoint;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
 
 public class TProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithWildcard;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 class SpiderProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.stereotypeEnforcesRequiredTypes;
 
-import javax.inject.Produces;
-import javax.inject.Production;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class SpiderProducer_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Animal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Animal.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Animal.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.definition;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 interface Animal

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ClovenHoved.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ClovenHoved.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ClovenHoved.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Cow_NotBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Cow_NotBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Cow_NotBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.definition;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 abstract class Cow_NotBean

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Donkey.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Donkey.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Donkey.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.definition;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class Donkey

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEntity.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEntity.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEntity.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.definition;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/OuterClass.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/OuterClass.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/OuterClass.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.definition;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 class OuterClass
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Sheep.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Sheep.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Sheep.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.definition;
 
-import javax.inject.Initializer;
-import javax.inject.Produces;
-import javax.inject.Production;
+import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class Sheep

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -24,7 +24,7 @@
    })
    public void testAbstractClassDeclaredInJavaNotDiscovered()
    {
-      assert getCurrentManager().resolveByType(Cow_NotBean.class).size() == 0;
+      assert getCurrentManager().getBeans(Cow_NotBean.class).size() == 0;
    }
 
    @Test(groups = "innerClass")
@@ -34,7 +34,7 @@
    })
    public void testStaticInnerClassDeclaredInJavaAllowed()
    {
-      assert getCurrentManager().resolveByType(StaticInnerClass.class).size() == 1;
+      assert getCurrentManager().getBeans(StaticInnerClass.class).size() == 1;
    }
 
    @Test
@@ -44,7 +44,7 @@
    })
    public void testNonStaticInnerClassDeclaredInJavaNotDiscovered()
    {
-      assert getCurrentManager().resolveByType(InnerClass_NotBeean.class).size() == 0;
+      assert getCurrentManager().getBeans(InnerClass_NotBeean.class).size() == 0;
    }
 
    @Test
@@ -54,21 +54,21 @@
    })
    public void testParameterizedClassDeclaredInJavaIsNotDiscovered()
    {
-      assert getCurrentManager().resolveByType(ParameterizedClass_NotBean.class).size() == 0;
+      assert getCurrentManager().getBeans(ParameterizedClass_NotBean.class).size() == 0;
    }
    
    @Test
    @SpecAssertion(section = "3.2.1", id = "cb")
    public void testInterfaceNotDiscoveredAsSimpleBean()
    {
-      assert getCurrentManager().resolveByType(Animal.class).size() == 0;
+      assert getCurrentManager().getBeans(Animal.class).size() == 0;
    }
    
    @Test
    @SpecAssertion(section = "3.2.1", id = "e")
    public void testEntityClassesNotDiscoveredAsSimpleBean()
    {
-      assert getCurrentManager().resolveByType(MockEntity.class).size() == 0;
+      assert getCurrentManager().getBeans(MockEntity.class).size() == 0;
    }
 
    @Test
@@ -80,41 +80,41 @@
       @SpecAssertion(section = "3.2.1", id = "k")})
    public void testClassesImplementingServletInterfacesNotDiscoveredAsSimpleBeans()
    {
-      assert getCurrentManager().resolveByType(MockFilter.class).size() == 0;
-      assert getCurrentManager().resolveByType(MockHttpSessionListener.class).size() == 0;
-      assert getCurrentManager().resolveByType(MockServlet.class).size() == 0;
-      assert getCurrentManager().resolveByType(MockServletContextListener.class).size() == 0;
-      assert getCurrentManager().resolveByType(MockServletRequestListener.class).size() == 0;
+      assert getCurrentManager().getBeans(MockFilter.class).size() == 0;
+      assert getCurrentManager().getBeans(MockHttpSessionListener.class).size() == 0;
+      assert getCurrentManager().getBeans(MockServlet.class).size() == 0;
+      assert getCurrentManager().getBeans(MockServletContextListener.class).size() == 0;
+      assert getCurrentManager().getBeans(MockServletRequestListener.class).size() == 0;
    }
 
    @Test
    @SpecAssertion(section="3.2.1", id="l")
    public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean()
    {
-      assert getCurrentManager().resolveByType(MockEnterpriseBean.class).size() == 0;
+      assert getCurrentManager().getBeans(MockEnterpriseBean.class).size() == 0;
    }
 
    @Test
    @SpecAssertion(section="3.2.1", id="m")
    public void testClassExtendingUiComponentNotDiscoveredAsSimpleBean()
    {
-      assert getCurrentManager().resolveByType(MockUIComponent.class).size() == 0;
+      assert getCurrentManager().getBeans(MockUIComponent.class).size() == 0;
    }
 
    @Test
    @SpecAssertion(section="3.2.1", id="p")
    public void testSimpleBeanOnlyIfConstructorParameterless()
    {
-      assert getCurrentManager().resolveByType(Antelope_NotBean.class).isEmpty();
-      assert !getCurrentManager().resolveByType(Donkey.class).isEmpty();
+      assert getCurrentManager().getBeans(Antelope_NotBean.class).isEmpty();
+      assert !getCurrentManager().getBeans(Donkey.class).isEmpty();
    }
 
    @Test
    @SpecAssertion(section="3.2.1", id="q")
    public void testSimpleBeanOnlyIfConstructorIsInitializer()
    {
-      assert getCurrentManager().resolveByType(Antelope_NotBean.class).isEmpty();
-      assert !getCurrentManager().resolveByType(Sheep.class).isEmpty();
+      assert getCurrentManager().getBeans(Antelope_NotBean.class).isEmpty();
+      assert !getCurrentManager().getBeans(Sheep.class).isEmpty();
    }
 
    @Test

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -21,7 +21,7 @@
    @SpecAssertion(section = "3.2.1", id = "o")
    public void testOrmMappedEntityClassesNotDiscoveredAsSimpleBean()
    {
-      assert getCurrentManager().resolveByType(Vet.class).size() == 0;
+      assert getCurrentManager().getBeans(Vet.class).size() == 0;
    }
 
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -21,7 +21,7 @@
    @SpecAssertion(section = "3.2.1", id = "o")
    public void testOrmMappedEntityClassesNotDiscoveredAsSimpleBean()
    {
-      assert getCurrentManager().resolveByType(Vet.class).size() == 0;
+      assert getCurrentManager().getBeans(Vet.class).size() == 0;
    }
 
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Tiger.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Tiger.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Tiger.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.definition;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 
 @Dependent
 class Tiger

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Turkey.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Turkey.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Turkey.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.definition;
 
-import javax.inject.Initializer;
-import javax.inject.Produces;
-import javax.inject.Production;
+import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class Turkey

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasDisposesParameter;
 
-import javax.inject.Disposes;
+import javax.enterprise.inject.Disposes;
 
 class DisposingConstructor_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.definition.dependentWithPublicField;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @RequestScoped
 class Leopard_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.definition.tooManyInitializerAnnotatedConstructors;
 
-import javax.inject.Initializer;
-import javax.inject.Production;
+import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class Goose_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Cod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Cod.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Cod.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
 
 import javax.annotation.PreDestroy;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @RequestScoped
 class Cod

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Duck.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Duck.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Duck.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
 
-import javax.inject.Initializer;
-import javax.inject.Produces;
-import javax.inject.Production;
+import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Production;
 
 
 @Production

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/EggProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/EggProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/EggProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
 
-import javax.inject.Disposes;
-import javax.inject.Produces;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
 
 public class EggProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Farm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Farm.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Farm.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -4,7 +4,7 @@
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 class Farm
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishPond.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishPond.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishPond.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
 
 import javax.annotation.PreDestroy;
-import javax.inject.Current;
-import javax.inject.Initializer;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Initializer;
 
 class FishPond
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,9 +6,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Named;
-import javax.annotation.Stereotype;
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Goldfish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Goldfish.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Goldfish.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
 
-import javax.context.RequestScoped;
-import javax.inject.Production;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.deployment.Production;
 
 @RequestScopedAnimalStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
 
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MyCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MyCreationalContext.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MyCreationalContext.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
 
-import javax.context.CreationalContext;
+import javax.enterprise.context.spi.CreationalContext;
 
 class MyCreationalContext<T> implements CreationalContext<T>
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RedSnapper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RedSnapper.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RedSnapper.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @FishStereotype
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,8 +6,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class)
 @Target( { TYPE })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,14 +2,14 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.context.Context;
-import javax.context.Contextual;
-import javax.context.CreationalContext;
-import javax.context.Dependent;
-import javax.context.RequestScoped;
-import javax.inject.AnnotationLiteral;
-import javax.inject.CreationException;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.CreationException;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -38,7 +38,7 @@
    })
    public void testInjectionOfParametersIntoBeanConstructor()
    {
-      assert getCurrentManager().resolveByType(FishPond.class).size() == 1;
+      assert getCurrentManager().getBeans(FishPond.class).size() == 1;
       FishPond fishPond = getCurrentManager().getInstanceByType(FishPond.class);
       assert fishPond.goldfish != null;
    }
@@ -82,7 +82,7 @@
    public void testCreateReturnsSameBeanPushed() throws Exception
    {
       final CreationalContext<Farm> farmCreationalContext = new MyCreationalContext<Farm>();
-      final Contextual<Farm> farmBean = getCurrentManager().resolveByType(Farm.class).iterator().next();
+      final Contextual<Farm> farmBean = getCurrentManager().getBeans(Farm.class).iterator().next();
       MyCreationalContext.setLastBeanPushed(null);
       MyCreationalContext.setPushCalled(false);
       new RunInDependentContext()
@@ -112,7 +112,7 @@
    })
    public void testCreateReturnsInstanceOfBean()
    {
-      assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1;
+      assert getCurrentManager().getBeans(RedSnapper.class).size() == 1;
       assert getCurrentManager().getInstanceByType(RedSnapper.class) instanceof RedSnapper;
    }
 
@@ -123,7 +123,7 @@
    })
    public void testCreateInjectsFieldsDeclaredInJava()
    {
-      assert getCurrentManager().resolveByType(TunaFarm.class).size() == 1;
+      assert getCurrentManager().getBeans(TunaFarm.class).size() == 1;
       TunaFarm tunaFarm = getCurrentManager().getInstanceByType(TunaFarm.class);
       assert tunaFarm.tuna != null;
    }
@@ -135,7 +135,7 @@
    public void testContextCreatesNewInstanceForInjection()
    {
       Context requestContext = getCurrentManager().getContext(RequestScoped.class);
-      Bean<Tuna> tunaBean = getCurrentManager().resolveByType(Tuna.class).iterator().next();
+      Bean<Tuna> tunaBean = getCurrentManager().getBeans(Tuna.class).iterator().next();
       assert requestContext.get(tunaBean) == null;
       TunaFarm tunaFarm = getCurrentManager().getInstanceByType(TunaFarm.class);
       assert tunaFarm.tuna != null;
@@ -149,8 +149,8 @@
    })
    public void testPostConstructPreDestroy() throws Exception
    {
-      assert getCurrentManager().resolveByType(Farm.class).size() == 1;
-      Bean<Farm> farmBean = getCurrentManager().resolveByType(Farm.class).iterator().next();
+      assert getCurrentManager().getBeans(Farm.class).size() == 1;
+      Bean<Farm> farmBean = getCurrentManager().getBeans(Farm.class).iterator().next();
       Farm farm = getCurrentManager().getInstanceByType(Farm.class);
       assert farm.founded != null;
       assert farm.initialStaff == 20;
@@ -166,7 +166,7 @@
    })
    public void testContextualDestroyDisposesWhenNecessary() throws Exception
    {
-      final Contextual<Goose> gooseBean = getCurrentManager().resolveByType(Goose.class).iterator().next();
+      final Contextual<Goose> gooseBean = getCurrentManager().getBeans(Goose.class).iterator().next();
       final Goose goose = getCurrentManager().getInstanceByType(Goose.class);
       
       assert !EggProducer.isEggDisposed();
@@ -183,7 +183,7 @@
    })
    public void testContextualDestroyCatchesException()
    {
-      Bean<Cod> codBean = getCurrentManager().resolveByType(Cod.class).iterator().next();
+      Bean<Cod> codBean = getCurrentManager().getBeans(Cod.class).iterator().next();
       Cod codInstance = getCurrentManager().getInstanceByType(Cod.class);
       codBean.destroy(codInstance);
    }
@@ -194,7 +194,7 @@
    })
    public void testDependentsDestroyedAfterPreDestroy()
    {
-      Bean<FishPond> pondBean = getCurrentManager().resolveByType(FishPond.class).iterator().next();
+      Bean<FishPond> pondBean = getCurrentManager().getBeans(FishPond.class).iterator().next();
       FishPond fishPond = getCurrentManager().getInstanceByType(FishPond.class);
       pondBean.destroy(fishPond);
       assert Salmon.isBeanDestroyed();
@@ -205,7 +205,7 @@
    public void testSubClassInheritsPostConstructOnSuperclass() throws Exception
    {
       OrderProcessor.postConstructCalled = false;
-      assert getCurrentManager().resolveByType(CdOrderProcessor.class).size() == 1;
+      assert getCurrentManager().getBeans(CdOrderProcessor.class).size() == 1;
       new RunInDependentContext()
       {
          @Override
@@ -222,7 +222,7 @@
    public void testIndirectSubClassInheritsPostConstructOnSuperclass() throws Exception
    {
       OrderProcessor.postConstructCalled = false;
-      assert getCurrentManager().resolveByType(IndirectOrderProcessor.class).size() == 1;
+      assert getCurrentManager().getBeans(IndirectOrderProcessor.class).size() == 1;
       new RunInDependentContext()
       {
          @Override
@@ -239,13 +239,13 @@
    public void testSubClassInheritsPreDestroyOnSuperclass() throws Exception
    {
       OrderProcessor.preDestroyCalled = false;
-      assert getCurrentManager().resolveByType(CdOrderProcessor.class).size() == 1;
+      assert getCurrentManager().getBeans(CdOrderProcessor.class).size() == 1;
       new RunInDependentContext()
       {
          @Override
          protected void execute() throws Exception
          {  
-            Bean<CdOrderProcessor> bean = getCurrentManager().resolveByType(CdOrderProcessor.class).iterator().next();
+            Bean<CdOrderProcessor> bean = getCurrentManager().getBeans(CdOrderProcessor.class).iterator().next();
             CdOrderProcessor instance = getCurrentManager().getInstanceByType(CdOrderProcessor.class);
             bean.destroy(instance);
          }
@@ -258,13 +258,13 @@
    public void testIndirectSubClassInheritsPreDestroyOnSuperclass() throws Exception
    {
       OrderProcessor.preDestroyCalled = false;
-      assert getCurrentManager().resolveByType(IndirectOrderProcessor.class).size() == 1;
+      assert getCurrentManager().getBeans(IndirectOrderProcessor.class).size() == 1;
       new RunInDependentContext()
       {
          @Override
          protected void execute() throws Exception
          {  
-            Bean<IndirectOrderProcessor> bean = getCurrentManager().resolveByType(IndirectOrderProcessor.class).iterator().next();
+            Bean<IndirectOrderProcessor> bean = getCurrentManager().getBeans(IndirectOrderProcessor.class).iterator().next();
             IndirectOrderProcessor instance = getCurrentManager().getInstanceByType(IndirectOrderProcessor.class);
             bean.destroy(instance);
          }
@@ -276,7 +276,7 @@
    @SpecAssertion(section = "4.2", id = "baa")
    public void testSubClassDoesNotInheritPostConstructOnSuperclassBlockedByIntermediateClass() throws Exception
    {
-      assert getCurrentManager().resolveByType(NovelOrderProcessor.class).size() == 1;
+      assert getCurrentManager().getBeans(NovelOrderProcessor.class).size() == 1;
       OrderProcessor.postConstructCalled = false;
       new RunInDependentContext()
       {
@@ -294,13 +294,13 @@
    public void testSubClassDoesNotInheritPreDestroyConstructOnSuperclassBlockedByIntermediateClass() throws Exception
    {
       OrderProcessor.preDestroyCalled = false;
-      assert getCurrentManager().resolveByType(NovelOrderProcessor.class).size() == 1;
+      assert getCurrentManager().getBeans(NovelOrderProcessor.class).size() == 1;
       new RunInDependentContext()
       {
          @Override
          protected void execute() throws Exception
          {
-            Bean<NovelOrderProcessor> bean = getCurrentManager().resolveByType(NovelOrderProcessor.class).iterator().next();
+            Bean<NovelOrderProcessor> bean = getCurrentManager().getBeans(NovelOrderProcessor.class).iterator().next();
             NovelOrderProcessor instance = getCurrentManager().getInstanceByType(NovelOrderProcessor.class);
             bean.destroy(instance);
          }
@@ -313,7 +313,7 @@
    @SpecAssertion(section = "6.2", id = "h")
    public void testCreationExceptionWrapsCheckedExceptionThrownFromCreate() throws Exception
    {
-      assert getCurrentManager().resolveByType(Lorry_Broken.class).size() == 1;
+      assert getCurrentManager().getBeans(Lorry_Broken.class).size() == 1;
       new RunInDependentContext()
       {
 
@@ -330,7 +330,7 @@
    @SpecAssertion(section = "6.2", id = "g")
    public void testUncheckedExceptionThrownFromCreateNotWrapped() throws Exception
    {
-      assert getCurrentManager().resolveByType(Van_Broken.class).size() == 1;
+      assert getCurrentManager().getBeans(Van_Broken.class).size() == 1;
       new RunInDependentContext()
       {
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Synchronous.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Synchronous.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Synchronous.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
 
-import javax.inject.Current;
-import javax.inject.Production;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class TunaFarm

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,9 +9,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Named;
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/ExplicitContructorSimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/ExplicitContructorSimpleBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/ExplicitContructorSimpleBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Named;
 
 @SessionScoped
 @Named("Fred")

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean;
 
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
 import javax.event.Observes;
-import javax.inject.Disposes;
-import javax.inject.Produces;
 
 @AnimalStereotype
 class Fox

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/InitializerSimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/InitializerSimpleBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/InitializerSimpleBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,10 +2,10 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
-import javax.context.SessionScoped;
-import javax.inject.Current;
-import javax.inject.Initializer;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Named;
 
 @SessionScoped
 @Named("Charlie")

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -5,13 +5,14 @@
 import java.lang.annotation.Target;
 import java.util.Set;
 
-import javax.context.Dependent;
-import javax.context.RequestScoped;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
-import javax.inject.New;
-import javax.inject.Standard;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.New;
+import javax.enterprise.inject.deployment.Standard;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -36,7 +37,7 @@
    @SpecAssertion(section = "3.2.5", id = "d")
    public void testNewBeanIsDependentScoped()
    {
-      Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().resolveByType(ExplicitContructorSimpleBean.class, new NewLiteral());
+      Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().getBeans(ExplicitContructorSimpleBean.class, new NewLiteral());
       assert beans.size() == 1;
       Bean<ExplicitContructorSimpleBean> newSimpleBean = beans.iterator().next();
       assert Dependent.class.equals(newSimpleBean.getScopeType());
@@ -46,7 +47,7 @@
    @SpecAssertion(section = "3.2.5", id = "e")
    public void testNewBeanIsOfStandardDeploymentType()
    {
-      Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().resolveByType(ExplicitContructorSimpleBean.class, new NewLiteral());
+      Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().getBeans(ExplicitContructorSimpleBean.class, new NewLiteral());
       assert beans.size() == 1;
       Bean<ExplicitContructorSimpleBean> newSimpleBean = beans.iterator().next();
       assert Standard.class.equals(newSimpleBean.getDeploymentType());
@@ -56,7 +57,7 @@
    @SpecAssertion(section = "3.2.5", id = "f")
    public void testNewBeanHasOnlyNewBinding()
    {
-      Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().resolveByType(ExplicitContructorSimpleBean.class, new NewLiteral());
+      Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().getBeans(ExplicitContructorSimpleBean.class, new NewLiteral());
       assert beans.size() == 1;
       Bean<ExplicitContructorSimpleBean> newSimpleBean = beans.iterator().next();
       assert newSimpleBean.getBindings().size() == 1;
@@ -67,7 +68,7 @@
    @SpecAssertion(section = "3.2.5", id = "g")
    public void testNewBeanHasNoWebBeanName()
    {
-      Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().resolveByType(ExplicitContructorSimpleBean.class, new NewLiteral());
+      Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().getBeans(ExplicitContructorSimpleBean.class, new NewLiteral());
       assert beans.size() == 1;
       Bean<ExplicitContructorSimpleBean> newSimpleBean = beans.iterator().next();
       assert newSimpleBean.getName() == null;
@@ -77,10 +78,10 @@
    @SpecAssertion(section = "3.2.5", id = "h")
    public void testNewBeanHasNoStereotypes()
    {
-      Bean<Fox> foxBean = getCurrentManager().resolveByType(Fox.class).iterator().next();
+      Bean<Fox> foxBean = getCurrentManager().getBeans(Fox.class).iterator().next();
       assert foxBean.getScopeType().equals(RequestScoped.class);
       assert foxBean.getName().equals("fox");
-      Bean<Fox> newFoxBean = getCurrentManager().resolveByType(Fox.class, new NewLiteral()).iterator().next();
+      Bean<Fox> newFoxBean = getCurrentManager().getBeans(Fox.class, new NewLiteral()).iterator().next();
       assert newFoxBean.getScopeType().equals(Dependent.class);
       assert newFoxBean.getName() == null;
    }
@@ -147,7 +148,7 @@
          {
             Fox fox = getCurrentManager().getInstanceByType(Fox.class);
             Fox newFox = getCurrentManager().getInstanceByType(Fox.class, new NewLiteral());
-            Bean<Litter> litterBean = getCurrentManager().resolveByType(Litter.class).iterator().next();
+            Bean<Litter> litterBean = getCurrentManager().getBeans(Litter.class).iterator().next();
             Litter litter = getCurrentManager().getInstanceByType(Litter.class);
             litterBean.destroy(litter);
             assert fox.isLitterDisposed();
@@ -174,21 +175,21 @@
    @SpecAssertion(section = "3.2.5", id = "a")
    public void testForEachSimpleBeanANewBeanExists()
    {
-      assert getCurrentManager().resolveByType(Order.class).size() == 1;
-      assert getCurrentManager().resolveByType(Order.class).iterator().next().getBindings().size() == 1;
-      assert getCurrentManager().resolveByType(Order.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class);
+      assert getCurrentManager().getBeans(Order.class).size() == 1;
+      assert getCurrentManager().getBeans(Order.class).iterator().next().getBindings().size() == 1;
+      assert getCurrentManager().getBeans(Order.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class);
 
-      assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).size() == 1;
-      assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().size() == 1;
-      assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class);
+      assert getCurrentManager().getBeans(Order.class, new NewLiteral()).size() == 1;
+      assert getCurrentManager().getBeans(Order.class, new NewLiteral()).iterator().next().getBindings().size() == 1;
+      assert getCurrentManager().getBeans(Order.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class);
 
-      assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).size() == 1;
-      assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().size() == 1;
-      assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Tame.class);
+      assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).iterator().next().getBindings().size() == 1;
+      assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Tame.class);
 
-      assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).size() == 1;
-      assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().size() == 1;
-      assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class);
+      assert getCurrentManager().getBeans(Lion.class, new NewLiteral()).size() == 1;
+      assert getCurrentManager().getBeans(Lion.class, new NewLiteral()).iterator().next().getBindings().size() == 1;
+      assert getCurrentManager().getBeans(Lion.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class);
    }
 
    @Test(groups = { "new" })
@@ -218,8 +219,8 @@
    @SpecAssertion(section = "3.2.5", id = "bc")
    public void testNewBeanHasSameInjectedFields()
    {
-      Bean<InitializerSimpleBean> simpleBean = getCurrentManager().resolveByType(InitializerSimpleBean.class).iterator().next();
-      Bean<InitializerSimpleBean> newSimpleBean = getCurrentManager().resolveByType(InitializerSimpleBean.class, new NewLiteral()).iterator().next();
+      Bean<InitializerSimpleBean> simpleBean = getCurrentManager().getBeans(InitializerSimpleBean.class).iterator().next();
+      Bean<InitializerSimpleBean> newSimpleBean = getCurrentManager().getBeans(InitializerSimpleBean.class, new NewLiteral()).iterator().next();
       assert !newSimpleBean.getInjectionPoints().isEmpty();
       assert simpleBean.getInjectionPoints().equals(newSimpleBean.getInjectionPoints());
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class Order implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.newAndOtherBindingType;
 
-import javax.inject.Current;
-import javax.inject.New;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.New;
 
 class NewAndOtherBindingType_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Named;
 
 @SessionScoped
 @Named("Fred")

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -17,7 +17,7 @@
 
 package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb;
 
-import javax.inject.manager.Bean;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -49,7 +49,7 @@
    @SpecAssertion(section = "6.4", id = "b")
    public void testInjectionOfEjbs()
    {
-      Bean<SimpleBean> simpleBeanBean = getCurrentManager().resolveByType(SimpleBean.class).iterator().next();
+      Bean<SimpleBean> simpleBeanBean = getCurrentManager().getBeans(SimpleBean.class).iterator().next();
       SimpleBean simpleBean = simpleBeanBean.create(new MyCreationalContext<SimpleBean>());
       assert !simpleBean.isMyEjbExists() : "Ejb was injected too early";
       assert simpleBean.getMyEjb() != null : "Ejb was not injected into bean";

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb;
 
-import javax.context.CreationalContext;
+import javax.enterprise.context.spi.CreationalContext;
 
 class MyCreationalContext<T> implements CreationalContext<T>
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext;
 
-import javax.context.CreationalContext;
+import javax.enterprise.context.spi.CreationalContext;
 
 class MyCreationalContext<T> implements CreationalContext<T>
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext;
 
-import javax.inject.manager.Bean;
+import javax.enterprise.inject.spi.Bean;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
@@ -37,7 +37,7 @@
    })
    public void testInjectionOfPersistenceContext()
    {
-      Bean<SimpleBean> simpleBeanBean = getCurrentManager().resolveByType(SimpleBean.class).iterator().next();
+      Bean<SimpleBean> simpleBeanBean = getCurrentManager().getBeans(SimpleBean.class).iterator().next();
       SimpleBean simpleBean = simpleBeanBean.create(new MyCreationalContext<SimpleBean>());
       EntityManager entityManager = simpleBean.getPersistenceContext();
       assert !simpleBean.isPersistenceContextExistsDuringConstruction() : "Persistence context injected too early";
@@ -49,7 +49,7 @@
    public void testInjectionOfPersistenceUnit()
    {
       //TODO There is no spec assertion for this test and it does not work, but there is bean support for persistence units
-      Bean<SimpleBean> simpleBeanBean = getCurrentManager().resolveByType(SimpleBean.class).iterator().next();
+      Bean<SimpleBean> simpleBeanBean = getCurrentManager().getBeans(SimpleBean.class).iterator().next();
       SimpleBean simpleBean = simpleBeanBean.create(new MyCreationalContext<SimpleBean>());
       EntityManagerFactory entityManagerFactory = simpleBean.getPersistenceUnit();
       assert !simpleBean.isPersistenceUnitExistsDuringConstruction() : "Persistence unit injected too early";

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/Another.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/Another.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/Another.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.resource.resource;
 
-import javax.inject.manager.Bean;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -22,11 +22,11 @@
    @SpecAssertion(section = "6.4", id = "d")
    public void testInjectionOfResource()
    {
-      Bean<SimpleBean> simpleBeanBean = getCurrentManager().resolveByType(SimpleBean.class).iterator().next();
+      Bean<SimpleBean> simpleBeanBean = getCurrentManager().getBeans(SimpleBean.class).iterator().next();
       SimpleBean simpleBean = simpleBeanBean.create(new MyCreationalContext<SimpleBean>());
-      Manager manager = simpleBean.getManager();
+      BeanManager beanManager = simpleBean.getManager();
       assert !simpleBean.isManagerInjected() : "Manager injected too early";
-      assert manager != null : "@Another Manager not found";
-      assert manager.equals(getCurrentManager()): "Wrong manager found";
+      assert beanManager != null : "@Another Manager not found";
+      assert beanManager.equals(getCurrentManager()): "Wrong manager found";
    }
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.resource.resource;
 
-import javax.context.CreationalContext;
+import javax.enterprise.context.spi.CreationalContext;
 
 class MyCreationalContext<T> implements CreationalContext<T>
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/SimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/SimpleBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/SimpleBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,22 +1,22 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.resource.resource;
 
 import javax.annotation.Resource;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.spi.BeanManager;
 
 class SimpleBean
 {
    @Resource
-   private Manager manager;
+   private BeanManager beanManager;
    private boolean managerInjected;
 
    public SimpleBean()
    {
-      managerInjected = manager != null;
+      managerInjected = beanManager != null;
    }
 
-   public Manager getManager()
+   public BeanManager getManager()
    {
-      return manager;
+      return beanManager;
    }
 
    public boolean isManagerInjected()

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractCow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractCow.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractCow.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.realization;
 
-import javax.context.RequestScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
 
 abstract class AbstractCow
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractHorse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractHorse.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractHorse.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.realization;
 
-import javax.context.RequestScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
 
 abstract class AbstractHorse
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractKennel.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractKennel.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractKennel.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.realization;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class AbstractKennel

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractStable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractStable.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractStable.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.realization;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 abstract class AbstractStable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Cuddly.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Cuddly.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Cuddly.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/FarmAnimalDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/FarmAnimalDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/FarmAnimalDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/RealizationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/RealizationTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/RealizationTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.context.RequestScoped;
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.AnnotationLiteral;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -32,25 +32,25 @@
    @SpecAssertion(section = "4.4.1", id = "ca")
    public void testRealizedBeanWithProducerMethodHasSameScope()
    {
-      assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).size() == 1;
-      assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL).iterator().next().getScopeType().equals(RequestScoped.class);
    }
 
    @Test
    @SpecAssertion(section = "4.4.1", id = "ca")
    public void testRealizedBeanWithProducerMethodHasDeploymentTypeOfRealizingClass()
    {
-      assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).size() == 1;
-      assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
+      assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
    }
 
    @Test
    @SpecAssertion(section = "4.4.1", id = "ca")
    public void testRealizedBeanWithProducerMethodHasSameBindings()
    {
-      assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).size() == 1;
-      assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getBindings().size() == 1;
-      assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Smelly.class);
+      assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL).iterator().next().getBindings().size() == 1;
+      assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Smelly.class);
    }
 
    @SuppressWarnings("unchecked")
@@ -58,42 +58,42 @@
    @SpecAssertion(section = "4.4.1", id = "ca")
    public void testRealizedBeanWithProducerMethodHasBindingsOfMethodAndRealizingType()
    {
-      assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).size() == 1;
-      assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings().size() == 2;
-      assert annotationSetMatches(getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings(), Smelly.class, Tame.class);
+      assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings().size() == 2;
+      assert annotationSetMatches(getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings(), Smelly.class, Tame.class);
    }
 
    @Test
    @SpecAssertion(section = "4.4.1", id = "ca")
    public void testRealizedBeanWithProducerMethodHasSameStereotypes()
    {
-      assert getCurrentManager().resolveByType(Dog.class).size() == 1;
-      assert getCurrentManager().resolveByType(Dog.class).iterator().next().getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().getBeans(Dog.class).size() == 1;
+      assert getCurrentManager().getBeans(Dog.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }
 
    @Test
    @SpecAssertion(section = "4.4.1", id = "cb")
    public void testRealizedBeanWithProducerFieldHasSameScope()
    {
-      assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).size() == 1;
-      assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL).iterator().next().getScopeType().equals(RequestScoped.class);
    }
 
    @Test
    @SpecAssertion(section = "4.4.1", id = "cb")
    public void testRealizedBeanWithProducerFieldHasDeploymentTypeOfRealizingClass()
    {
-      assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).size() == 1;
-      assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
+      assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
    }
 
    @Test
    @SpecAssertion(section = "4.4.1", id = "cb")
    public void testRealizedBeanWithProducerFieldHasSameBindings()
    {
-      assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).size() == 1;
-      assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getBindings().size() == 1;
-      assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Smelly.class);
+      assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL).iterator().next().getBindings().size() == 1;
+      assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Smelly.class);
    }
 
    @SuppressWarnings("unchecked")
@@ -101,17 +101,17 @@
    @SpecAssertion(section = "4.4.1", id = "cb")
    public void testRealizedBeanWithProducerFieldHasBindingsOfMethodAndRealizingType()
    {
-      assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).size() == 1;
-      assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings().size() == 2;
-      assert annotationSetMatches(getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings(), Smelly.class, Tame.class);
+      assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings().size() == 2;
+      assert annotationSetMatches(getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings(), Smelly.class, Tame.class);
    }
 
    @Test
    @SpecAssertion(section = "4.4.1", id = "cb")
    public void testRealizedBeanWithProducerFieldHasSameStereotypes()
    {
-      assert getCurrentManager().resolveByType(Donkey.class).size() == 1;
-      assert getCurrentManager().resolveByType(Donkey.class).iterator().next().getScopeType().equals(RequestScoped.class);
+      assert getCurrentManager().getBeans(Donkey.class).size() == 1;
+      assert getCurrentManager().getBeans(Donkey.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }
 
    @Test(groups = "stub")

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Smelly.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Smelly.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Smelly.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Tame.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Tame.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Building.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Building.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Building.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise;
 
 import javax.ejb.Stateful;
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @Stateful
 public class Building implements BuildingLocal

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -55,7 +55,7 @@
          @Override
          protected void execute() throws Exception
          {
-            assert getCurrentManager().resolveByType(Waste.class).size() == 1;
+            assert getCurrentManager().getBeans(Waste.class).size() == 1;
             assert getCurrentManager().getInstanceByType(Waste.class).getFrom().equals(Office.class.getName());
          }
          

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,9 +2,9 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.Bean;
 import javax.inject.DefinitionException;
-import javax.inject.manager.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -34,11 +34,11 @@
    })
    public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
    {
-      assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1;
-      Bean<FarmerLocal> bean = getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next();
-      assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class);
-      assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2;
-      assert annotationSetMatches( getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class);
+      assert getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1;
+      Bean<FarmerLocal> bean = getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next();
+      assert getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class);
+      assert getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2;
+      assert annotationSetMatches( getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class);
    }
    
    @Test
@@ -48,9 +48,9 @@
    })
    public void testSpecializingBeanHasNameOfSpecializedBean()
    {
-      assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1;
-      assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class);
-      assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer");
+      assert getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class);
+      assert getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer");
    }
    
    @Test(groups={"stub", "specialization"},expectedExceptions=DefinitionException.class) 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
 
 
 @Named("plough")

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Farmer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Farmer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise;
 
-import javax.annotation.Named;
 import javax.ejb.Stateful;
+import javax.enterprise.inject.Named;
 
 
 @Landowner

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Landowner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Landowner.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Landowner.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Lazy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Lazy.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Lazy.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise;
 
 import javax.ejb.Stateful;
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 
 @Specializes @Lazy

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise;
 
 import javax.ejb.Stateful;
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Yard.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Yard.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Yard.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise;
 
-import javax.annotation.Named;
 import javax.ejb.Stateful;
+import javax.enterprise.inject.Named;
 
 @Named("backyard")
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsNothing;
 
 import javax.ejb.Stateful;
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
 
 
 @Named("plough")

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean;
 
 import javax.ejb.Stateful;
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing;
 
 import javax.ejb.Stateful;
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName;
 
-import javax.annotation.Named;
 import javax.ejb.Stateful;
-import javax.inject.Specializes;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/Yard.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/Yard.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/Yard.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName;
 
-import javax.annotation.Named;
 import javax.ejb.Stateful;
+import javax.enterprise.inject.Named;
 
 @Named("backyard")
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Farmer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Farmer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence;
 
-import javax.annotation.Named;
 import javax.ejb.Stateful;
+import javax.enterprise.inject.Named;
 
 
 @Landowner

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Landowner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Landowner.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Landowner.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence;
 
 import javax.ejb.Stateful;
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean;
 
-import javax.annotation.Named;
 import javax.ejb.Stateful;
+import javax.enterprise.inject.Named;
 
 
 @Landowner

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean;
 
 import javax.ejb.Stateful;
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean;
 
 import javax.ejb.Stateful;
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes @AnotherDeploymentType
 @Stateful

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Expensive.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Expensive.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Expensive.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method;
 
-import javax.inject.Produces;
-import javax.inject.Specializes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Specializes;
 
 class JewelryShop extends Shop
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -29,9 +29,9 @@
    })
    public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
    {
-      assert getCurrentManager().resolveByType(Product.class, EXPENSIVE_LITERAL).size() == 1;
-      assert getCurrentManager().resolveByType(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings().size() == 2;
-      assert annotationSetMatches( getCurrentManager().resolveByType(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings(), Expensive.class, Sparkly.class);
+      assert getCurrentManager().getBeans(Product.class, EXPENSIVE_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings().size() == 2;
+      assert annotationSetMatches( getCurrentManager().getBeans(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings(), Expensive.class, Sparkly.class);
    }
    
    @Test
@@ -41,8 +41,8 @@
    })
    public void testSpecializingBeanHasNameOfSpecializedBean()
    {
-      assert getCurrentManager().resolveByType(Product.class, new AnnotationLiteral<Sparkly>(){}).size() == 1;
-      assert getCurrentManager().resolveByType(Product.class, new AnnotationLiteral<Sparkly>(){}).iterator().next().getName().equals("expensiveGift");
+      assert getCurrentManager().getBeans(Product.class, new AnnotationLiteral<Sparkly>(){}).size() == 1;
+      assert getCurrentManager().getBeans(Product.class, new AnnotationLiteral<Sparkly>(){}).iterator().next().getName().equals("expensiveGift");
    }
    
    @Test

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Shop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Shop.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Shop.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method;
 
-import javax.annotation.Named;
-import javax.inject.Produces;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 
 
 class Shop

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Sparkly.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Sparkly.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Sparkly.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Expensive.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Expensive.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Expensive.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride;
 
-import javax.inject.Produces;
-import javax.inject.Specializes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Specializes;
 
 class ShoeShop_Broken extends MallShop
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Shop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Shop.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Shop.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride;
 
-import javax.annotation.Named;
-import javax.inject.Produces;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 
 
 class Shop

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence;
 
-import javax.inject.Produces;
-import javax.inject.Specializes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Specializes;
 
 class ClothesShop_Broken extends Shop
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Expensive.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Expensive.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Expensive.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Shop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Shop.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Shop.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence;
 
-import javax.annotation.Named;
-import javax.inject.Produces;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 
 
 class Shop

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod;
 
-import javax.inject.Produces;
-import javax.inject.Specializes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Specializes;
 
 
 class FurnitureShop_Broken extends Shop

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod;
 
-import javax.annotation.Named;
-import javax.inject.Produces;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 
 
 class Shop

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName;
 
-import javax.annotation.Named;
-import javax.inject.Produces;
-import javax.inject.Specializes;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Specializes;
 
 class HighSchool_Broken extends School
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName;
 
-import javax.annotation.Named;
-import javax.inject.Produces;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 
 class School
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean;
 
-import javax.inject.Produces;
-import javax.inject.Specializes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Specializes;
 
 class Bookshop_Broken extends Shop
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean;
 
-import javax.inject.Produces;
-import javax.inject.Specializes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Specializes;
 
 class PictureShop_Broken extends Shop
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean;
 
-import javax.annotation.Named;
-import javax.inject.Produces;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 
 
 class Shop

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Building.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Building.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Building.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 class Building
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Farmer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Farmer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
 
 
 @Landowner

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Landowner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Landowner.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Landowner.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Lazy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Lazy.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Lazy.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple;
 
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 
 @Specializes @Lazy

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple;
 
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.inject.AnnotationLiteral;
-import javax.inject.manager.Bean;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -33,8 +33,8 @@
    })
    public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
    {
-      assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1;
-      Bean<?> bean = getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next();
+      assert getCurrentManager().getBeans(Farmer.class, LANDOWNER_LITERAL).size() == 1;
+      Bean<?> bean = getCurrentManager().getBeans(Farmer.class, LANDOWNER_LITERAL).iterator().next();
       assert bean.getTypes().contains(LazyFarmer.class);
       assert bean.getBindings().size() == 2;
       assert annotationSetMatches(bean.getBindings(), Landowner.class, Lazy.class);
@@ -47,9 +47,9 @@
    })
    public void testSpecializingBeanHasNameOfSpecializedBean()
    {
-      assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1;
-      assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class);
-      assert "farmer".equals(getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getName());
+      assert getCurrentManager().getBeans(Farmer.class, LANDOWNER_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class);
+      assert "farmer".equals(getCurrentManager().getBeans(Farmer.class, LANDOWNER_LITERAL).iterator().next().getName());
    }
 
    @Test
@@ -83,7 +83,7 @@
          @Override
          protected void execute() throws Exception
          {
-            assert getCurrentManager().resolveByType(Waste.class).size() == 1;
+            assert getCurrentManager().getBeans(Waste.class).size() == 1;
             assert getCurrentManager().getInstanceByType(Waste.class).getFrom().equals(Office.class.getName());
          }
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb;
 
-import javax.annotation.Named;
 import javax.ejb.Stateful;
+import javax.enterprise.inject.Named;
 
 
 @Named("plough")

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb;
 
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names;
 
-import javax.annotation.Named;
-import javax.inject.Specializes;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/Yard.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/Yard.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/Yard.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
 
 @Named("backyard")
 class Yard

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1;
 
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2;
 
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3;
 
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Farmer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Farmer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.precedence;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
 
 @Landowner
 @Named

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Landowner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Landowner.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Landowner.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.precedence;
 
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 class OrganicFarmer_Broken extends Farmer

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Farmer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Farmer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
 
 
 @Landowner

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two;
 
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes
 @AnotherDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Landowner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Landowner.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Landowner.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two;
 
-import javax.inject.Specializes;
+import javax.enterprise.inject.deployment.Specializes;
 
 @Specializes @AnotherDeploymentType
 class SheepFarmer_Broken extends Farmer

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Chunky.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Chunky.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Chunky.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Cod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Cod.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Cod.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.byname;
 
-import javax.annotation.Named;
-import javax.inject.Production;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Whitefish

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Haddock.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Haddock.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Haddock.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.byname;
 
-import javax.annotation.Named;
-import javax.inject.Production;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Named

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -36,7 +36,7 @@
          @Override
          protected void execute() throws Exception
          {
-            assert getCurrentManager().resolveByName("nonexistant").size() == 0;
+            assert getCurrentManager().getBeans("nonexistant").size() == 0;
             assert getCurrentManager().getInstanceByName("nonexistant") == null;
             assert getCurrentManager().getInstanceByName("salmon") instanceof Salmon;
          }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.byname;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
 
 @AnotherDeploymentType
 @Whitefish

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -28,8 +28,8 @@
          @Override
          protected void execute() throws Exception
          {
-            assert getCurrentManager().resolveByName("whitefish").size() == 1;
-            assert getCurrentManager().resolveByName("whitefish").iterator().next().getTypes().contains(Plaice.class);
+            assert getCurrentManager().getBeans("whitefish").size() == 1;
+            assert getCurrentManager().getBeans("whitefish").iterator().next().getTypes().contains(Plaice.class);
          }
          
       }.run();

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Salmon.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Salmon.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Salmon.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.byname;
 
-import javax.annotation.Named;
-import javax.inject.Production;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Named

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/SeaBass.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/SeaBass.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/SeaBass.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.byname;
 
-import javax.context.RequestScoped;
-import javax.inject.Production;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Sole.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Sole.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Sole.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.byname;
 
-import javax.annotation.Named;
-import javax.inject.Production;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Whitefish

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.byname;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Whitefish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Whitefish.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Whitefish.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Cod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Cod.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Cod.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution;
 
-import javax.annotation.Named;
-import javax.inject.Production;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Named("whitefish")

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -17,7 +17,7 @@
 
 package org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution;
 
-import javax.inject.AmbiguousDependencyException;
+import javax.enterprise.inject.AmbiguousResolutionException;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -38,7 +38,7 @@
     * 
     * @throws Exception
     */
-   @Test(groups = { "resolution", "el" }, expectedExceptions = AmbiguousDependencyException.class)
+   @Test(groups = { "resolution", "el" }, expectedExceptions = AmbiguousResolutionException.class)
    @SpecAssertion(section = "5.10", id = "e")
    public void testDuplicateNamedBeans() throws Exception
    {
@@ -48,7 +48,7 @@
          @Override
          protected void execute() throws Exception
          {
-            assert getCurrentManager().resolveByName("whitefish").size() == 2;
+            assert getCurrentManager().getBeans("whitefish").size() == 2;
             getCurrentManager().getInstanceByName("whitefish");
          }
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Sole.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Sole.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Sole.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution;
 
-import javax.annotation.Named;
-import javax.inject.Production;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Named("whitefish")

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 
-import javax.inject.manager.Bean;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -36,7 +36,7 @@
          @Override
          protected void execute() throws Exception
          {
-            Bean<Fox> foxBean = getCurrentManager().resolveByType(Fox.class).iterator().next();
+            Bean<Fox> foxBean = getCurrentManager().getBeans(Fox.class).iterator().next();
             Fox fox = getCurrentManager().getInstance(foxBean);
             assert !getCurrentConfiguration().getBeans().isProxy(fox);
          }
@@ -60,7 +60,7 @@
    @SpecAssertion(section = "5.4.2", id = "a")
    public void testClientProxyInvocation()
    {
-      Bean<TunedTuna> tunaBean = getCurrentManager().resolveByType(TunedTuna.class).iterator().next();
+      Bean<TunedTuna> tunaBean = getCurrentManager().getBeans(TunedTuna.class).iterator().next();
       TunedTuna tuna = getCurrentManager().getInstance(tunaBean);
       assert getCurrentConfiguration().getBeans().isProxy(tuna);
       assert tuna.getState().equals("tuned");

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Fox.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Fox.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.clientProxy;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 
 @Dependent
 class Fox

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Tuna.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Tuna.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.clientProxy;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @RequestScoped
 class Tuna

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/TunedTuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/TunedTuna.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/TunedTuna.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.clientProxy;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @RequestScoped
 class TunedTuna

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.clientProxy.array;
 
-import javax.context.RequestScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
 
 public class ArrayProducer
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.clientProxy.array;
 
-import javax.inject.UnproxyableDependencyException;
+import javax.enterprise.inject.UnproxyableResolutionException;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -9,7 +9,7 @@
 import org.testng.annotations.Test;
 
 @Artifact
- at ExpectedDeploymentException(UnproxyableDependencyException.class)
+ at ExpectedDeploymentException(UnproxyableResolutionException.class)
 public class ArrayTest extends AbstractJSR299Test
 {
    @Test

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/InjectionPointBean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/InjectionPointBean_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/InjectionPointBean_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.clientProxy.array;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 public class InjectionPointBean_Broken
 { 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/FinalMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/FinalMethodTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/FinalMethodTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.clientProxy.finalmethod;
 
-import javax.inject.UnproxyableDependencyException;
+import javax.enterprise.inject.UnproxyableResolutionException;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -9,7 +9,7 @@
 import org.testng.annotations.Test;
 
 @Artifact
- at ExpectedDeploymentException(UnproxyableDependencyException.class)
+ at ExpectedDeploymentException(UnproxyableResolutionException.class)
 public class FinalMethodTest extends AbstractJSR299Test
 {
    @Test

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.clientProxy.finalmethod;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/InjectionPointBean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/InjectionPointBean_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/InjectionPointBean_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.clientProxy.privateconstructor;
 
-import javax.inject.Instance;
+import javax.enterprise.inject.Instance;
 import javax.inject.Obtains;
 
 class InjectionPointBean_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/PrivateConstructorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/PrivateConstructorTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/PrivateConstructorTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.clientProxy.privateconstructor;
 
-import javax.inject.UnproxyableDependencyException;
+import javax.enterprise.inject.UnproxyableResolutionException;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -10,7 +10,7 @@
 
 
 @Artifact
- at ExpectedDeploymentException(UnproxyableDependencyException.class)
+ at ExpectedDeploymentException(UnproxyableResolutionException.class)
 public class PrivateConstructorTest extends AbstractJSR299Test
 {
    @Test

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.clientProxy.privateconstructor;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FinalTuna_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FinalTuna_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FinalTuna_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @RequestScoped
 final class FinalTuna_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FishFarm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FishFarm.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FishFarm.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 public class FishFarm
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable;
 
-import javax.inject.UnproxyableDependencyException;
+import javax.enterprise.inject.UnproxyableResolutionException;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -9,7 +9,7 @@
 import org.testng.annotations.Test;
 
 @Artifact
- at ExpectedDeploymentException(UnproxyableDependencyException.class)
+ at ExpectedDeploymentException(UnproxyableResolutionException.class)
 public class UnproxyableTest extends AbstractJSR299Test
 {
    @Test

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/BrokenInjectedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/BrokenInjectedBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/BrokenInjectedBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.dependency.resolution;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 
 class BrokenInjectedBean

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -7,11 +7,12 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.context.RequestScoped;
-import javax.inject.UnproxyableDependencyException;
-import javax.inject.UnsatisfiedDependencyException;
-import javax.inject.manager.Bean;
-import javax.inject.manager.InjectionPoint;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.UnproxyableResolutionException;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -26,7 +27,7 @@
 {
    class MockInjectionPoint implements InjectionPoint
    {
-      private Bean<?> bean;
+      private Bean<?> beanWithManager;
       private Type type;
       private Member member;
       private Set<Annotation> bindings;
@@ -34,7 +35,7 @@
       public MockInjectionPoint(Bean<?> bean, Type type, Member member, 
             Set<Annotation> bindings)
       {
-         this.bean = bean;
+         this.beanWithManager = bean;
          this.type = type;
          this.member = member;
          this.bindings = bindings;
@@ -52,7 +53,7 @@
 
       public Bean<?> getBean()
       {
-         return bean;
+         return beanWithManager;
       }
 
       public Set<Annotation> getBindings()
@@ -83,48 +84,48 @@
    })
    public void testGetInstanceToInjectReturnsContextualInstance() throws Exception
    {
-      Bean<Vanilla> vanillaBean = getCurrentManager().resolveByType(Vanilla.class).iterator().next();
+      Bean<Vanilla> vanillaBean = getCurrentManager().getBeans(Vanilla.class).iterator().next();
       
       Field injectedField = InjectedBean.class.getField("vanilla");
       Set<Annotation> bindings = new HashSet<Annotation>();
       bindings.add(new CurrentLiteral());
       MockInjectionPoint injectionPoint = new MockInjectionPoint(vanillaBean, Vanilla.class, injectedField, bindings);
       
-      assert getCurrentManager().getInstanceToInject(injectionPoint) instanceof Vanilla;
+      assert getCurrentManager().getInjectableReference(injectionPoint, null) instanceof Vanilla;
    }
    
-   @Test(expectedExceptions = UnsatisfiedDependencyException.class)
+   @Test(expectedExceptions = UnsatisfiedResolutionException.class)
    @SpecAssertion(section = "5.7.1", id = "e")
    public void testGetInstanceToInjectThrowsUnsatisfiedDependencyException() throws Exception
    {
-      Bean<Vanilla> vanillaBean = getCurrentManager().resolveByType(Vanilla.class).iterator().next();
+      Bean<Vanilla> vanillaBean = getCurrentManager().getBeans(Vanilla.class).iterator().next();
       
       Field injectedField = InjectedBean.class.getField("vanilla");
       Set<Annotation> bindings = new HashSet<Annotation>();
       bindings.add(new OtherLiteral());
       MockInjectionPoint injectionPoint = new MockInjectionPoint(vanillaBean, Vanilla.class, injectedField, bindings);
       
-      assert getCurrentManager().getInstanceToInject(injectionPoint) instanceof Vanilla;      
+      assert getCurrentManager().getInjectableReference(injectionPoint, null) instanceof Vanilla;      
    }
    
-   @Test(expectedExceptions = UnsatisfiedDependencyException.class)
+   @Test(expectedExceptions = UnsatisfiedResolutionException.class)
    @SpecAssertion(section = "5.7.1", id = "f")
    public void testGetInstanceToInjectThrowsAmbiguousDependencyException() throws Exception
    {
-      Bean<Vanilla> vanillaBean = getCurrentManager().resolveByType(Vanilla.class).iterator().next();
+      Bean<Vanilla> vanillaBean = getCurrentManager().getBeans(Vanilla.class).iterator().next();
       
       Field injectedField = InjectedBean.class.getField("vanilla");
       Set<Annotation> bindings = new HashSet<Annotation>();
       bindings.add(new OtherLiteral());
       MockInjectionPoint injectionPoint = new MockInjectionPoint(vanillaBean, Vanilla.class, injectedField, bindings);      
-      getCurrentManager().getInstanceToInject(injectionPoint);      
+      getCurrentManager().getInjectableReference(injectionPoint, null);      
    }   
    
-   @Test(expectedExceptions=UnproxyableDependencyException.class)
+   @Test(expectedExceptions=UnproxyableResolutionException.class)
    @SpecAssertion(section = "5.7.1", id = "g")
    public void testGetInstanceToInjectThrowsUnproxyableDependencyException() throws Exception
    {
-      final Bean<Mustard> bean = getCurrentManager().resolveByType(Mustard.class).iterator().next();
+      final Bean<Mustard> bean = getCurrentManager().getBeans(Mustard.class).iterator().next();
       final Set<Annotation> bindings = new HashSet<Annotation>();
       bindings.add(new OtherLiteral());
       
@@ -161,6 +162,6 @@
       
       Field injectedField = BrokenInjectedBean.class.getField("mustard");
       MockInjectionPoint injectionPoint = new MockInjectionPoint(bean, Mustard.class, injectedField, bindings);
-      getCurrentManager().getInstanceToInject(injectionPoint);     
+      getCurrentManager().getInjectableReference(injectionPoint, null);     
    }
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/InjectedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/InjectedBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/InjectedBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.dependency.resolution;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 class InjectedBean
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/Other.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/Other.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/Other.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -11,7 +11,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/OtherLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/OtherLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/OtherLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.dependency.resolution;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class OtherLiteral extends AnnotationLiteral<Other> implements Other
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,9 +2,9 @@
 
 import static org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod.CHEQUE;
 
+import javax.enterprise.inject.Instance;
 import javax.inject.DuplicateBindingTypeException;
-import javax.inject.Instance;
-import javax.inject.manager.Bean;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -28,7 +28,7 @@
    public void testObtainsInjectsInstanceOfInstance()
    {
       Bean<ObtainsInjectionPointBean> injectionPointBean = 
-         getCurrentManager().resolveByType(ObtainsInjectionPointBean.class).iterator().next();
+         getCurrentManager().getBeans(ObtainsInjectionPointBean.class).iterator().next();
       
       ObtainsInjectionPointBean injectionPoint = getCurrentManager().getInstance(injectionPointBean);      
       assert injectionPoint.getPaymentProcessor() instanceof Instance;
@@ -43,7 +43,7 @@
    public void testDynamicLookup()
    {
       Bean<ObtainsInjectionPointBean> injectionPointBean = 
-         getCurrentManager().resolveByType(ObtainsInjectionPointBean.class).iterator().next();
+         getCurrentManager().getBeans(ObtainsInjectionPointBean.class).iterator().next();
       
       ObtainsInjectionPointBean injectionPoint = getCurrentManager().getInstance(injectionPointBean);
       assert injectionPoint.getPaymentProcessor().get() instanceof ChequePaymentProcessor;      
@@ -54,7 +54,7 @@
    public void testDuplicateBindingsThrowsException()
    {
       Bean<ObtainsInjectionPointBean> injectionPointBean = 
-         getCurrentManager().resolveByType(ObtainsInjectionPointBean.class).iterator().next();
+         getCurrentManager().getBeans(ObtainsInjectionPointBean.class).iterator().next();
       
       ObtainsInjectionPointBean injectionPoint = getCurrentManager().getInstance(injectionPointBean);
       injectionPoint.getPaymentProcessor().get(new PayByBinding() { public PaymentMethod value() { return CHEQUE; }});      
@@ -65,7 +65,7 @@
    public void testNonBindingThrowsException()
    {
       Bean<ObtainsInjectionPointBean> injectionPointBean = 
-         getCurrentManager().resolveByType(ObtainsInjectionPointBean.class).iterator().next();
+         getCurrentManager().getBeans(ObtainsInjectionPointBean.class).iterator().next();
       
       ObtainsInjectionPointBean injectionPoint = getCurrentManager().getInstance(injectionPointBean);
       injectionPoint.getPaymentProcessor().get(new NonBinding() );      

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.dynamic;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class NonBinding extends AnnotationLiteral<NonBindingAnnotation> implements NonBindingAnnotation
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import static org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod.CHEQUE;
 
-import javax.inject.Instance;
+import javax.enterprise.inject.Instance;
 import javax.inject.Obtains;
 
 class ObtainsInjectionPointBean

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayBy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayBy.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayBy.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.dynamic;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 abstract class PayByBinding extends AnnotationLiteral<PayBy> implements PayBy
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParamBean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParamBean_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParamBean_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.dynamic.notypeparam;
 
-import javax.inject.Instance;
+import javax.enterprise.inject.Instance;
 import javax.inject.Obtains;
 
 class NoTypeParamBean_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableBean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableBean_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableBean_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.lookup.dynamic.typevariable;
 
-import javax.inject.Instance;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.Produces;
 import javax.inject.Obtains;
-import javax.inject.Produces;
 
 class TypeVariableBean_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/WildcardBean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/WildcardBean_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/WildcardBean_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.dynamic.wildcard;
 
-import javax.inject.Instance;
+import javax.enterprise.inject.Instance;
 import javax.inject.Obtains;
 
 class WildcardBean_Broken

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.lookup.el;
 
-import javax.context.Context;
-import javax.context.Conversation;
-import javax.context.RequestScoped;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.Conversation;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -47,7 +47,7 @@
    public void testContextCreatesNewInstanceForInjection()
    {
       Context requestContext = getCurrentManager().getContext(RequestScoped.class);
-      Bean<Tuna> tunaBean = getCurrentManager().resolveByType(Tuna.class).iterator().next();
+      Bean<Tuna> tunaBean = getCurrentManager().getBeans(Tuna.class).iterator().next();
       assert requestContext.get(tunaBean) == null;
       TunaFarm tunaFarm = getCurrentConfiguration().getEl().evaluateValueExpression("#{tunaFarm}", TunaFarm.class);
       assert tunaFarm.tuna != null;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Tuna.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Tuna.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.el;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @RequestScoped
 class Tuna

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/TunaFarm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/TunaFarm.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/TunaFarm.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.el;
 
-import javax.annotation.Named;
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
 
 @Named
 class TunaFarm

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Fox.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Fox.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.injection;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 
 @Dependent
 class Fox

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/FoxRun.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/FoxRun.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/FoxRun.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.injection;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 class FoxRun
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/HenHouse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/HenHouse.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/HenHouse.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.injection;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 public class HenHouse
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.injection;
 
-import javax.context.ContextNotActiveException;
+import javax.enterprise.context.ContextNotActiveException;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -22,7 +22,7 @@
    @SpecAssertion(section = "5.2", id = "aa")
    public void testInjectionPerformsBoxingIfNecessary() throws Exception
    {
-      assert getCurrentManager().resolveByType(SpiderNest.class).size() == 1;
+      assert getCurrentManager().getBeans(SpiderNest.class).size() == 1;
       SpiderNest spiderNest = getCurrentManager().getInstanceByType(SpiderNest.class);
       assert spiderNest.numberOfSpiders != null;
       assert spiderNest.numberOfSpiders.equals(4);
@@ -32,7 +32,7 @@
    @SpecAssertion(section = "5.3", id = "a")
    public void testInvokeNormalInjectedWebBeanWhenContextNotActive()
    {
-      assert getCurrentManager().resolveByType(TunaFarm.class).size() == 1;
+      assert getCurrentManager().getBeans(TunaFarm.class).size() == 1;
       TunaFarm tunaFarm = getCurrentManager().getInstanceByType(TunaFarm.class);
       assert tunaFarm.tuna != null;
       getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getRequestContext());
@@ -43,7 +43,7 @@
    @SpecAssertion(section = "5.3", id = "b")
    public void testInvokeDependentScopeWhenContextNotActive()
    {
-      assert getCurrentManager().resolveByType(FoxRun.class).size() == 1;
+      assert getCurrentManager().getBeans(FoxRun.class).size() == 1;
       FoxRun foxRun = getCurrentManager().getInstanceByType(FoxRun.class);
       assert foxRun.fox.getName().equals("gavin");
    }
@@ -84,7 +84,7 @@
    @SpecAssertion(section = "3.8", id = "aa")
    public void testInjectingStaticField()
    {
-      assert getCurrentManager().resolveByType(BeanWithStaticBoundField_Broken.class).size() == 1;
+      assert getCurrentManager().getBeans(BeanWithStaticBoundField_Broken.class).size() == 1;
       assert getCurrentManager().getInstanceByType(BeanWithStaticBoundField_Broken.class).tuna == null;
    }
 
@@ -92,7 +92,7 @@
    @SpecAssertion(section = "3.8", id = "ab")
    public void testInjectingFinalField()
    {
-      assert getCurrentManager().resolveByType(BeanWithFinalBoundField_Broken.class).size() == 1;
+      assert getCurrentManager().getBeans(BeanWithFinalBoundField_Broken.class).size() == 1;
       assert getCurrentManager().getInstanceByType(BeanWithFinalBoundField_Broken.class).tuna == null;
    }
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderNest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderNest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderNest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.injection;
 
-import javax.inject.Initializer;
+import javax.enterprise.inject.Initializer;
 
 class SpiderNest
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.injection;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.injection;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/TunaFarm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/TunaFarm.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/TunaFarm.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.injection;
 
-import javax.inject.Current;
-import javax.inject.Production;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class TunaFarm

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/EnterpriseBeanInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/EnterpriseBeanInjectionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/EnterpriseBeanInjectionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
 
-import javax.inject.manager.Bean;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -28,7 +28,7 @@
         @Override
          protected void execute() throws Exception
          {
-           Bean<HenHouseLocal> bean = getCurrentManager().resolveByType(HenHouseLocal.class).iterator().next();
+           Bean<HenHouseLocal> bean = getCurrentManager().getBeans(HenHouseLocal.class).iterator().next();
            HenHouseLocal henHouse = getCurrentManager().getInstance(bean);
            assert henHouse.getFox() != null;
            assert henHouse.getFox().getName().equals("gavin");
@@ -45,7 +45,7 @@
         @Override
          protected void execute() throws Exception
          {
-           Bean<HenHouseLocal> bean = getCurrentManager().resolveByType(HenHouseLocal.class, new MegaPoorBinding()).iterator().next();
+           Bean<HenHouseLocal> bean = getCurrentManager().getBeans(HenHouseLocal.class, new MegaPoorBinding()).iterator().next();
            HenHouseLocal henHouse = getCurrentManager().getInstance(bean);
            assert henHouse.getFox() != null;
            assert henHouse.getFox().getName().equals("gavin");

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.context.Dependent;
+import javax.enterprise.context.Dependent;
 
 @Dependent
 public class Fox implements Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/HenHouse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/HenHouse.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/HenHouse.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 class HenHouse
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoor.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoor.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -11,7 +11,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorBinding.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorBinding.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class MegaPoorBinding extends AnnotationLiteral<MegaPoor> implements MegaPoor
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouseProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouseProducer_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouseProducer_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.injection.nullableBean;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 class FarmHouseProducer_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouse_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouse_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouse_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.injection.nullableBean;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 class FarmHouse_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,8 +8,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 @Stereotype(requiredTypes=Animal.class)
 @Target( { TYPE, METHOD, FIELD })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.injectionpoint;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -16,8 +16,8 @@
  */
 package org.jboss.jsr299.tck.tests.lookup.injectionpoint;
 
-import javax.inject.Current;
-import javax.inject.manager.InjectionPoint;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.InjectionPoint;
 
 /**
  * Test bean with injection point on the constructor of the bean

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -16,8 +16,8 @@
  */
 package org.jboss.jsr299.tck.tests.lookup.injectionpoint;
 
-import javax.inject.Current;
-import javax.inject.Initializer;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Initializer;
 
 /**
  * Test bean to inject a bean using injection point metadata into a constructor

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -17,8 +17,8 @@
 
 package org.jboss.jsr299.tck.tests.lookup.injectionpoint;
 
-import javax.context.RequestScoped;
-import javax.inject.Current;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Current;
 
 /**
  * Test bean to inject another bean which uses injection point metadata in a

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -24,11 +24,11 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.context.Dependent;
-import javax.inject.Current;
-import javax.inject.Standard;
-import javax.inject.manager.Bean;
-import javax.inject.manager.InjectionPoint;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.deployment.Standard;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -64,7 +64,7 @@
             BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
             assert beanWithInjectionPoint.getInjectedMetadata() != null;
    
-            Set<Bean<FieldInjectionPointBean>> resolvedBeans = getCurrentManager().resolveByType(FieldInjectionPointBean.class);
+            Set<Bean<FieldInjectionPointBean>> resolvedBeans = getCurrentManager().getBeans(FieldInjectionPointBean.class);
             assert resolvedBeans.size() == 1;
             assert beanWithInjectionPoint.getInjectedMetadata().getBean().equals(resolvedBeans.iterator().next());
          }
@@ -232,8 +232,8 @@
          @Override
          protected void execute() throws Exception
          {
-            assert getCurrentManager().resolveByType(InjectionPoint.class).size() == 1;
-            assert getCurrentManager().resolveByType(InjectionPoint.class).iterator().next().getDeploymentType().equals(Standard.class);
+            assert getCurrentManager().getBeans(InjectionPoint.class).size() == 1;
+            assert getCurrentManager().getBeans(InjectionPoint.class).iterator().next().getDeploymentType().equals(Standard.class);
          }
          
       }.run();
@@ -249,8 +249,8 @@
          @Override
          protected void execute() throws Exception
          {
-            assert getCurrentManager().resolveByType(InjectionPoint.class).size() == 1;
-            assert getCurrentManager().resolveByType(InjectionPoint.class).iterator().next().getScopeType().equals(Dependent.class);
+            assert getCurrentManager().getBeans(InjectionPoint.class).size() == 1;
+            assert getCurrentManager().getBeans(InjectionPoint.class).iterator().next().getScopeType().equals(Dependent.class);
          }
          
       }.run();

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -17,8 +17,8 @@
 
 package org.jboss.jsr299.tck.tests.lookup.injectionpoint;
 
-import javax.inject.Current;
-import javax.inject.Initializer;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Initializer;
 
 /**
  * Test bean to inject a bean using injection point metadata into a constructor

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/FishFarmOffice.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/FishFarmOffice.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/FishFarmOffice.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,11 +1,11 @@
 package org.jboss.jsr299.tck.tests.lookup.manager;
 
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
 
 class FishFarmOffice
 {
    
-   @Current public Manager manager;
+   @Current public BeanManager beanManager;
    
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,10 +1,11 @@
 package org.jboss.jsr299.tck.tests.lookup.manager;
 
-import javax.context.Dependent;
-import javax.inject.Current;
-import javax.inject.Standard;
-import javax.inject.manager.Bean;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.deployment.Standard;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -31,7 +32,7 @@
          protected void execute() throws Exception
          {
             FishFarmOffice fishFarmOffice = getCurrentManager().getInstanceByType(FishFarmOffice.class);
-            assert fishFarmOffice.manager != null;
+            assert fishFarmOffice.beanManager != null;
          }
          
       }.run();      
@@ -41,31 +42,31 @@
    @SpecAssertion(section = "5.7.2", id = "aa")
    public void testContainerProvidesManagerBean()
    {
-      assert getCurrentManager().resolveByType(Manager.class).size() > 0;
+      assert getCurrentManager().getBeans(BeanManager.class).size() > 0;
    }
    
    @Test
    @SpecAssertion(section = "5.7.2", id = "ab")
    public void testManagerBeanIsDependentScoped()
    {
-      Bean<Manager> manager = getCurrentManager().resolveByType(Manager.class).iterator().next();
-      assert manager.getScopeType().equals(Dependent.class);
+      Bean<BeanManager> beanManager = getCurrentManager().getBeans(BeanManager.class).iterator().next();
+      assert beanManager.getScopeType().equals(Dependent.class);
    }
    
    @Test
    @SpecAssertion(section = "5.7.2", id = "ac")   
    public void testManagerBeanHasStandardDeployment()
    {
-      Bean<Manager> manager = getCurrentManager().resolveByType(Manager.class).iterator().next();      
-      assert manager.getDeploymentType().equals(Standard.class);
+      Bean<BeanManager> beanManager = getCurrentManager().getBeans(BeanManager.class).iterator().next();      
+      assert beanManager.getDeploymentType().equals(Standard.class);
    }
 
    @Test
    @SpecAssertion(section = "5.7.2", id = "ad")
    public void testManagerBeanHasCurrentBinding()
    {      
-      Bean<Manager> manager = getCurrentManager().resolveByType(Manager.class).iterator().next();
-      assert manager.getBindings().iterator().next() instanceof Current;
+      Bean<BeanManager> beanManager = getCurrentManager().getBeans(BeanManager.class).iterator().next();
+      assert beanManager.getBindings().iterator().next() instanceof Current;
    }
    
    @Test
@@ -75,7 +76,7 @@
    })
    public void testGetInstanceReturnsContextualInstance()
    {
-      Bean<FishFarmOffice> bean = getCurrentManager().resolveByType(FishFarmOffice.class).iterator().next();
+      Bean<FishFarmOffice> bean = getCurrentManager().getBeans(FishFarmOffice.class).iterator().next();
       assert getCurrentManager().getInstance(bean) instanceof FishFarmOffice;      
    }
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.manager.jndi;
 
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 
 import org.hibernate.tck.annotations.SpecAssertion;
@@ -18,7 +18,7 @@
    public void testManagerLookupInJndi() throws Exception
    {
       InitialContext ctx = new InitialContext();
-      Manager manager = (Manager) ctx.lookup("java:app/Manager");
-      assert manager != null;
+      BeanManager beanManager = (BeanManager) ctx.lookup("java:app/Manager");
+      assert beanManager != null;
    }
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Farm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Farm.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Farm.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -4,7 +4,7 @@
 
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 @Stateful
 public class Farm implements FarmLocal, Serializable

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -31,7 +31,7 @@
    @SpecAssertion(section = "5.12.1", id = "a")
    public void testInjectionIntoSessionBeanInjectedViaEjb() throws Exception
    {
-      assert getCurrentManager().resolveByType(VillageLocal.class).size() == 1;
+      assert getCurrentManager().getBeans(VillageLocal.class).size() == 1;
       assert getCurrentManager().getInstanceByType(VillageLocal.class).getFarm().getBarn() != null;
    }
    
@@ -40,7 +40,7 @@
    public void testInjectionIntoSessionBeanInjectedViaResource() throws Exception
    {
       // Quite tough as no universal names. Need to allow these to be specified or something...
-      assert getCurrentManager().resolveByType(HamletLocal.class).size() == 1;
+      assert getCurrentManager().getBeans(HamletLocal.class).size() == 1;
       assert getCurrentManager().getInstanceByType(HamletLocal.class).getFarm().getBarn() != null;
    }
    

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/TestServlet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/TestServlet.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/TestServlet.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class AnotherDeploymentTypeLiteral extends AnnotationLiteral<AnotherDeploymentType> implements AnotherDeploymentType
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Chunky.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Chunky.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Chunky.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Cod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Cod.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Cod.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation;
 
-import javax.annotation.Named;
-import javax.inject.Production;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
 
 
 @Production

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/FakeFish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/FakeFish.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/FakeFish.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/InstantiationByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/InstantiationByTypeTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/InstantiationByTypeTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,10 +1,10 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation;
 
-import javax.inject.AmbiguousDependencyException;
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AmbiguousResolutionException;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
 import javax.inject.DuplicateBindingTypeException;
-import javax.inject.TypeLiteral;
-import javax.inject.UnsatisfiedDependencyException;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -59,14 +59,14 @@
       getCurrentManager().getInstanceByType(Tuna.class, new AnotherDeploymentTypeLiteral());
    }
    
-   @Test(expectedExceptions=AmbiguousDependencyException.class) 
+   @Test(expectedExceptions=AmbiguousResolutionException.class) 
    @SpecAssertion(section="5.7.2", id = "n")
    public void testAmbiguousDependencies() throws Exception
    {
       getCurrentManager().getInstanceByType(ScottishFish.class, new AnnotationLiteral<Whitefish>(){});
    }
    
-   @Test(expectedExceptions=UnsatisfiedDependencyException.class) 
+   @Test(expectedExceptions=UnsatisfiedResolutionException.class) 
    @SpecAssertion(section="5.7.2", id = "m")
    public void testUnsatisfiedDependencies() throws Exception
    {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Salmon.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Salmon.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Salmon.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation;
 
-import javax.annotation.Named;
-import javax.inject.Production;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Named

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Sole.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Sole.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Sole.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation;
 
-import javax.annotation.Named;
-import javax.inject.Production;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Whitefish

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Tuna.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Tuna.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Whitefish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Whitefish.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Whitefish.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 class AnotherDeploymentTypeLiteral extends AnnotationLiteral<AnotherDeploymentType> implements AnotherDeploymentType
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 abstract class BindingTypeWithBindingAnnotationMemberLiteral_Broken extends AnnotationLiteral<BindingTypeWithBindingAnnotationMember_Broken> implements BindingTypeWithBindingAnnotationMember_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 abstract class BindingTypeWithBindingArrayTypeMemberLiteral_Broken extends AnnotationLiteral<BindingTypeWithBindingArrayTypeMember_Broken> implements BindingTypeWithBindingArrayTypeMember_Broken
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Chunky.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Chunky.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Chunky.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 abstract class ChunkyLiteral extends AnnotationLiteral<Chunky> implements Chunky
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cod.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cod.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.annotation.Named;
-import javax.inject.Production;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Whitefish

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,8 +10,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.NonBinding;
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
+import javax.enterprise.inject.NonBinding;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 abstract class ExpensiveLiteral extends AnnotationLiteral<Expensive> implements Expensive
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FakeFish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FakeFish.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FakeFish.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class Farmer<T>

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FishILike.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FishILike.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FishILike.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Haddock.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Haddock.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Haddock.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.annotation.Named;
-import javax.inject.Production;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Named

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/LadybirdSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/LadybirdSpider.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/LadybirdSpider.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 class LadybirdSpider extends Spider

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
 
 @AnotherDeploymentType
 @Whitefish

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -4,11 +4,12 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.inject.spi.Bean;
 import javax.inject.DefinitionException;
 import javax.inject.DuplicateBindingTypeException;
-import javax.inject.TypeLiteral;
-import javax.inject.manager.Bean;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -35,7 +36,7 @@
    })
    public void testDefaultBindingTypeAssumed() throws Exception
    {
-      Set<Bean<Tuna>> possibleTargets = getCurrentManager().resolveByType(Tuna.class);
+      Set<Bean<Tuna>> possibleTargets = getCurrentManager().getBeans(Tuna.class);
       assert possibleTargets.size() == 1;
       assert possibleTargets.iterator().next().getTypes().contains(Tuna.class);
    }
@@ -44,28 +45,28 @@
    @SpecAssertion(section="5.9", id = "cb")
    public void testParameterizedTypeWithWildcardParameter()
    {
-      getCurrentManager().resolveByType(new TypeLiteral<ParameterizedBean_Broken<?>>(){});
+      getCurrentManager().getBeans(new TypeLiteral<ParameterizedBean_Broken<?>>(){});
    }
    
    @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) 
    @SpecAssertion(section="5.9", id = "ca")
    public  <T> void testParameterizedTypeWithTypeParameter()
    {
-      getCurrentManager().resolveByType(new TypeLiteral<ParameterizedBean_Broken<T>>(){});
+      getCurrentManager().getBeans(new TypeLiteral<ParameterizedBean_Broken<T>>(){});
    }
    
    @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) 
    @SpecAssertion(section="5.9", id = "d")
    public void testDuplicateBindingTypesUsed()
    {
-      getCurrentManager().resolveByType(Tuna.class, new CurrentLiteral(), new CurrentLiteral());
+      getCurrentManager().getBeans(Tuna.class, new CurrentLiteral(), new CurrentLiteral());
    }
    
    @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) 
    @SpecAssertion(section="5.9", id = "e")
    public void testNonBindingTypeUsed()
    {
-      getCurrentManager().resolveByType(Tuna.class, new AnotherDeploymentTypeLiteral());
+      getCurrentManager().getBeans(Tuna.class, new AnotherDeploymentTypeLiteral());
    }
    
    @Test(groups="resolution") 
@@ -76,11 +77,11 @@
    public void testResolveByType() throws Exception
    {
       
-      assert getCurrentManager().resolveByType(Tuna.class, new CurrentLiteral()).size() == 1;
+      assert getCurrentManager().getBeans(Tuna.class, new CurrentLiteral()).size() == 1;
       
-      assert getCurrentManager().resolveByType(Tuna.class).size() == 1;
+      assert getCurrentManager().getBeans(Tuna.class).size() == 1;
       
-      Set<Bean<Animal>> beans = getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<FishILike>() {});
+      Set<Bean<Animal>> beans = getCurrentManager().getBeans(Animal.class, new AnnotationLiteral<FishILike>() {});
       assert beans.size() == 3;
       List<Class<? extends Animal>> classes = new ArrayList<Class<? extends Animal>>();
       for (Bean<Animal> bean : beans)
@@ -112,7 +113,7 @@
    })
    public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean()
    {
-      assert getCurrentManager().resolveByType(Animal.class, new ChunkyLiteral() {
+      assert getCurrentManager().getBeans(Animal.class, new ChunkyLiteral() {
 
          public boolean realChunky()
          {
@@ -120,7 +121,7 @@
          }
          
       }, new AnnotationLiteral<Whitefish>() {}).size() == 1;
-      assert getCurrentManager().resolveByType(Animal.class, new ChunkyLiteral() {
+      assert getCurrentManager().getBeans(Animal.class, new ChunkyLiteral() {
 
          public boolean realChunky()
          {
@@ -129,9 +130,9 @@
          
       }, new AnnotationLiteral<Whitefish>() {}).iterator().next().getTypes().contains(Cod.class);
       
-      assert getCurrentManager().resolveByType(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}).size() == 2;
+      assert getCurrentManager().getBeans(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}).size() == 2;
       List<Class<? extends Animal>> classes = new ArrayList<Class<? extends Animal>>();
-      for (Bean<ScottishFish> bean : getCurrentManager().resolveByType(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}))
+      for (Bean<ScottishFish> bean : getCurrentManager().getBeans(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}))
       {
          if (bean.getTypes().contains(Cod.class))
          {
@@ -154,22 +155,22 @@
    })
    public void testResolveByTypeWithTypeParameter() throws Exception
    {
-      assert getCurrentManager().resolveByType(new TypeLiteral<Farmer<ScottishFish>>(){}).size() == 1;
-      assert getCurrentManager().resolveByType(new TypeLiteral<Farmer<ScottishFish>>(){}).iterator().next().getTypes().contains(ScottishFishFarmer.class);
+      assert getCurrentManager().getBeans(new TypeLiteral<Farmer<ScottishFish>>(){}).size() == 1;
+      assert getCurrentManager().getBeans(new TypeLiteral<Farmer<ScottishFish>>(){}).iterator().next().getTypes().contains(ScottishFishFarmer.class);
    }
    
    @Test(groups={"resolution", "producerMethod"}) 
    @SpecAssertion(section="5.9", id = "fc")
    public void testResolveByTypeWithArray() throws Exception
    {
-      assert getCurrentManager().resolveByType(Spider[].class).size() == 1;
+      assert getCurrentManager().getBeans(Spider[].class).size() == 1;
    }
    
    @Test @SpecAssertion(section="5.9", id = "ha")
    public void testOnlyHighestEnabledPrecedenceWebBeansResolved() throws Exception
    {
-      assert getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<Whitefish>() {}).size() == 1;
-      assert getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<Whitefish>() {}).iterator().next().getTypes().contains(Plaice.class);
+      assert getCurrentManager().getBeans(Animal.class, new AnnotationLiteral<Whitefish>() {}).size() == 1;
+      assert getCurrentManager().getBeans(Animal.class, new AnnotationLiteral<Whitefish>() {}).iterator().next().getTypes().contains(Plaice.class);
       
    }
   
@@ -178,7 +179,7 @@
    @SpecAssertion(section="5.9", id = "hb")
    public void testNoWebBeansFound() throws Exception
    {
-      assert getCurrentManager().resolveByType(Tuna.class, new AnnotationLiteral<FakeFish>() {}).size() == 0;
+      assert getCurrentManager().getBeans(Tuna.class, new AnnotationLiteral<FakeFish>() {}).size() == 0;
    }
    
    @Test(groups="resolution") 
@@ -190,7 +191,7 @@
    public void testResolveByTypeWithNonBindingMembers() throws Exception
    {
       
-      Set<Bean<Animal>> beans = getCurrentManager().resolveByType(Animal.class, new ExpensiveLiteral() 
+      Set<Bean<Animal>> beans = getCurrentManager().getBeans(Animal.class, new ExpensiveLiteral() 
       {
 
          public int cost()
@@ -226,7 +227,7 @@
    @SpecAssertion(section="5.9.1", id = "ca")
    public void testArrayValuedAnnotationMemberWithoutNonBinding()
    {
-      getCurrentManager().resolveByType(Animal.class, new BindingTypeWithBindingArrayTypeMemberLiteral_Broken() {
+      getCurrentManager().getBeans(Animal.class, new BindingTypeWithBindingArrayTypeMemberLiteral_Broken() {
          
          public boolean[] bool()
          {
@@ -240,7 +241,7 @@
    @SpecAssertion(section="5.9.1", id = "cb")
    public void testAnnotationValuedAnnotationMemberWithoutNonBinding()
    {
-      getCurrentManager().resolveByType(Animal.class, new BindingTypeWithBindingAnnotationMemberLiteral_Broken()
+      getCurrentManager().getBeans(Animal.class, new BindingTypeWithBindingAnnotationMemberLiteral_Broken()
       {
          
          public Expensive expensive()

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Salmon.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Salmon.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Salmon.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.annotation.Named;
-import javax.inject.Production;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Named

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.inject.Production;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 class ScottishFishFarmer extends Farmer<ScottishFish>

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SeaBass.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SeaBass.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SeaBass.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.context.RequestScoped;
-import javax.inject.Production;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Sole.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Sole.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Sole.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.annotation.Named;
-import javax.inject.Production;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Whitefish

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.inject.Produces;
+import javax.enterprise.inject.Produces;
 
 @AnotherDeploymentType
 class SpiderProducer

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @AnotherDeploymentType
 @RequestScoped

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Whitefish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Whitefish.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Whitefish.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,8 +1,8 @@
 package org.jboss.jsr299.tck.tests.xml.annotationtypes;
 
-import javax.context.RequestScoped;
-import javax.inject.AnnotationLiteral;
-import javax.inject.manager.Bean;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -23,7 +23,7 @@
    public void testBindingTypeFromXML()
    {
       //TODO The binding type appears as a non-binding annotation in the call to resolveByType()
-      assert getCurrentManager().resolveByType(BeanWithBinding.class, new AnnotationLiteral<TestBindingType>(){}).size() > 0;
+      assert getCurrentManager().getBeans(BeanWithBinding.class, new AnnotationLiteral<TestBindingType>(){}).size() > 0;
    }
 
    @Test(groups = { "ri-broken", "xml" })
@@ -52,7 +52,7 @@
    public void testStereotypeFromXML()
    {
       //TODO The stereotype is not being applied to this bean
-      Bean<BeanWithStereotype> bean = getCurrentManager().resolveByType(BeanWithStereotype.class).iterator().next();
+      Bean<BeanWithStereotype> bean = getCurrentManager().getBeans(BeanWithStereotype.class).iterator().next();
       assert TestScopeType.class.isAssignableFrom(bean.getScopeType());
       assert TestDeploymentType.class.isAssignableFrom(bean.getDeploymentType());
       assert bean.getName() != null : "No default name for bean";
@@ -96,7 +96,7 @@
    public void testStereotypeAnnotationOverridenByXML()
    {
       //TODO The stereotype is not being applied to this bean
-      Bean<BeanWithAnotherStereotype> bean = getCurrentManager().resolveByType(BeanWithAnotherStereotype.class).iterator().next();
+      Bean<BeanWithAnotherStereotype> bean = getCurrentManager().getBeans(BeanWithAnotherStereotype.class).iterator().next();
       assert RequestScoped.class.isAssignableFrom(bean.getScopeType());
    }
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestBindingType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestBindingType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestBindingType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Retention(RUNTIME)
 @Target({TYPE, METHOD, FIELD, PARAMETER})

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
+import javax.enterprise.inject.Stereotype;
 
 @Retention(RUNTIME)
 @Target(TYPE)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.xml.annotationtypes;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @DeploymentType
 public @interface TestDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestNamed.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestNamed.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestNamed.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.xml.annotationtypes;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
 
 @Named
 public @interface TestNamed

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestScopeType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestScopeType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestScopeType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.xml.annotationtypes;
 
-import javax.context.ScopeType;
+import javax.enterprise.context.ScopeType;
 
 @ScopeType
 public @interface TestScopeType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -6,7 +6,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.Named;
+import javax.enterprise.inject.Named;
 
 @Retention(RUNTIME)
 @Target(TYPE)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.util.Set;
 
-import javax.inject.manager.Bean;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -28,8 +28,8 @@
    })
    public void testDeploymentDeclaration()
    {
-      Manager manager = getCurrentManager();
-      Set<Bean<Order>> beans = manager.resolveByType(Order.class);
+      BeanManager beanManager = getCurrentManager();
+      Set<Bean<Order>> beans = beanManager.getBeans(Order.class);
       
       assert !beans.isEmpty() : "There are no registered beans of type '" + Order.class + "'";
       assert beans.iterator().next().getDeploymentType().equals(TestDeploymentType.class) : "Deployment type of bean '" + Order.class.getName() + "' is not '" + TestDeploymentType.class.getName() + "'";

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/TestDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/TestDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/TestDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -35,7 +35,7 @@
    })
    public void testXmlBasedMetadata()
    {
-      assert getCurrentManager().resolveByType(Order.class).size() == 1 : "There is no one or more than one registered beans with type '" + Order.class + "'";
-      assert getCurrentManager().resolveByType(AnotherOrder.class).size() == 1 : "There is no one or more than one registered beans with type '" + AnotherOrder.class + "'";
+      assert getCurrentManager().getBeans(Order.class).size() == 1 : "There is no one or more than one registered beans with type '" + Order.class + "'";
+      assert getCurrentManager().getBeans(AnotherOrder.class).size() == 1 : "There is no one or more than one registered beans with type '" + AnotherOrder.class + "'";
    }
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/NamespaceAggregationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/NamespaceAggregationTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/NamespaceAggregationTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -30,7 +30,7 @@
    })
    public void testNamespaceAggregation()
    {
-      assert getCurrentManager().resolveByType(Cow.class).size() == 1;
+      assert getCurrentManager().getBeans(Cow.class).size() == 1;
    }
    
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/TestDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/TestDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/TestDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.xml.namespace.aggregation.foo;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @DeploymentType
 public @interface TestDeploymentType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/copy/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/copy/AnotherDeploymentType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/copy/AnotherDeploymentType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/multipleTypes/MultipleTypesInAggregatedNamespacesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/multipleTypes/MultipleTypesInAggregatedNamespacesTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/multipleTypes/MultipleTypesInAggregatedNamespacesTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -31,7 +31,7 @@
    })
    public void testNamespaceAggregation()
    {
-      assert getCurrentManager().resolveByType(Cow.class).size() == 1;
+      assert getCurrentManager().getBeans(Cow.class).size() == 1;
    }
    
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -5,12 +5,12 @@
 import java.util.Date;
 import java.util.Set;
 
-import javax.context.RequestScoped;
 import javax.ejb.TimerHandle;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Event;
-import javax.inject.AnnotationLiteral;
-import javax.inject.manager.Bean;
-import javax.inject.manager.Manager;
 import javax.interceptor.InvocationContext;
 import javax.persistence.EntityManager;
 import javax.sql.DataSource;
@@ -39,8 +39,8 @@
    })
    public void testJavaEePkg()
    {
-      Manager manager = getCurrentManager();
-      Set<Bean<Order>> beans = manager.resolveByType(Order.class, bindings);
+      BeanManager beanManager = getCurrentManager();
+      Set<Bean<Order>> beans = beanManager.getBeans(Order.class, bindings);
       
       assert beans.size() == 1;
       

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/Order.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/Order.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,8 +2,8 @@
 
 import java.util.Date;
 
-import javax.context.RequestScoped;
 import javax.ejb.TimerHandle;
+import javax.enterprise.context.RequestScoped;
 import javax.event.Event;
 import javax.interceptor.InvocationContext;
 import javax.persistence.EntityManager;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/TestBindingType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/TestBindingType.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/TestBindingType.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerAddress.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerAddress.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerAddress.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerName.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerName.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerName.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PrimitiveTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PrimitiveTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PrimitiveTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -17,7 +17,7 @@
 
 package org.jboss.jsr299.tck.tests.xml.namespace.javatypes;
 
-import javax.inject.AnnotationLiteral;
+import javax.enterprise.inject.AnnotationLiteral;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PurchaseOrder.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PurchaseOrder.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PurchaseOrder.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2,7 +2,7 @@
 
 import java.util.ArrayList;
 
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 
 @RequestScoped
 class PurchaseOrder

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.xml.resource.resource;
 
-import javax.inject.AnnotationLiteral;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.BeanManager;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -29,8 +29,8 @@
    })
    public void testXMLDeclarationOfResource()
    {
-      Manager manager = getCurrentManager().getInstanceByType(Manager.class, new AnnotationLiteral<Another>() {});
-      assert manager != null : "@Another Manager not found";
-      assert manager.equals(getCurrentManager()): "Wrong manager found";
+      BeanManager beanManager = getCurrentManager().getInstanceByType(BeanManager.class, new AnnotationLiteral<Another>() {});
+      assert beanManager != null : "@Another Manager not found";
+      assert beanManager.equals(getCurrentManager()): "Wrong manager found";
    }
 }

Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/beans.xml	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/beans.xml	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 <Beans xmlns="urn:java:ee"
        xmlns:app="urn:java:org.jboss.jsr299.tck.tests.implementation.simple.resource.resource"
-       xmlns:m="urn:java:javax.inject.manager">
+       xmlns:m="urn:java:javax.enterprise.inject.spi">
           
    <m:Manager>
       <Resource>

Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 <Beans xmlns="urn:java:ee"
 	xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes"
-	xmlns:manager="urn:java:javax.inject.manager">
+	xmlns:manager="urn:java:javax.enterprise.inject.spi">
 	<dd:TestBindingType>
 		<BindingType />
 	</dd:TestBindingType>

Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml	2009-05-26 12:53:17 UTC (rev 2712)
@@ -1,6 +1,6 @@
 <Beans xmlns="urn:java:ee"
        xmlns:app="urn:java:org.jboss.jsr299.tck.tests.xml.resource.resource"
-       xmlns:m="urn:java:javax.inject.manager">
+       xmlns:m="urn:java:javax.enterprise.inject.spi">
           
    <m:Manager>
       <Resource>

Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml	2009-05-26 12:53:17 UTC (rev 2712)
@@ -2345,11 +2345,11 @@
   
   <section id="5.6" title="Injection point metadata">
     <assertion id="a">
-      <text>The |javax.inject.manager.InjectionPoint.getBean()| method returns the Bean object representing the bean that defines the injection point</text>
+      <text>The |javax.enterprise.inject.spi.InjectionPoint.getBean()| method returns the Bean object representing the bean that defines the injection point</text>
     </assertion>
     
     <assertion id="ba">
-      <text>The |javax.inject.manager.InjectionPoint.getType()| method returns the declared type of the injection point.</text>
+      <text>The |javax.enterprise.inject.spi.InjectionPoint.getType()| method returns the declared type of the injection point.</text>
     </assertion>
     
     <assertion id="bb">
@@ -2357,43 +2357,43 @@
     </assertion>
     
     <assertion id="bc">
-      <text>The |javax.inject.manager.InjectionPoint.getBindings()| method returns the declared bindings of the injection point.</text>
+      <text>The |javax.enterprise.inject.spi.InjectionPoint.getBindings()| method returns the declared bindings of the injection point.</text>
     </assertion>
     
     <assertion id="ca">
-      <text>The |javax.inject.manager.InjectionPoint.getMember()| method returns the |Field| object in the case of field injection</text>
+      <text>The |javax.enterprise.inject.spi.InjectionPoint.getMember()| method returns the |Field| object in the case of field injection</text>
     </assertion>
     
     <assertion id="cb">
-      <text>The |javax.inject.manager.InjectionPoint.getMember()| method returns the |Method| object in the case of method parameter injection</text>
+      <text>The |javax.enterprise.inject.spi.InjectionPoint.getMember()| method returns the |Method| object in the case of method parameter injection</text>
     </assertion>
     
     <assertion id="cc">
-      <text>The |javax.inject.manager.InjectionPoint.getMember()| method returns the |Constructor| object in the case of constructor parameter injection</text>
+      <text>The |javax.enterprise.inject.spi.InjectionPoint.getMember()| method returns the |Constructor| object in the case of constructor parameter injection</text>
     </assertion>
     
     <assertion id="da">
-      <text>The |javax.inject.manager.InjectionPoint.getAnnotation()| method returns annotations of the field in the case of field injection</text>
+      <text>The |javax.enterprise.inject.spi.InjectionPoint.getAnnotation()| method returns annotations of the field in the case of field injection</text>
     </assertion>
     
     <assertion id="db">
-      <text>The |javax.inject.manager.InjectionPoint.getAnnotation()| method returns annotations of the parameter in the case of method parameter</text>
+      <text>The |javax.enterprise.inject.spi.InjectionPoint.getAnnotation()| method returns annotations of the parameter in the case of method parameter</text>
     </assertion>
     
     <assertion id="dc">
-      <text>The |javax.inject.manager.InjectionPoint.getAnnotation()| method returns annotations annotations of the parameter in the case of constructor parameter injection.</text>
+      <text>The |javax.enterprise.inject.spi.InjectionPoint.getAnnotation()| method returns annotations annotations of the parameter in the case of constructor parameter injection.</text>
     </assertion>
     
     <assertion id="dd">
-      <text>The |javax.inject.manager.InjectionPoint.getAnnotations()| method returns annotations of the field in the case of field injection</text>
+      <text>The |javax.enterprise.inject.spi.InjectionPoint.getAnnotations()| method returns annotations of the field in the case of field injection</text>
     </assertion>
     
     <assertion id="de">
-      <text>The |javax.inject.manager.InjectionPoint.getAnnotations()| method returns annotations of the parameter in the case of method parameter</text>
+      <text>The |javax.enterprise.inject.spi.InjectionPoint.getAnnotations()| method returns annotations of the parameter in the case of method parameter</text>
     </assertion>
     
     <assertion id="df">
-      <text>The |javax.inject.manager.InjectionPoint.getAnnotations()| method returns annotations annotations of the parameter in the case of constructor parameter injection.</text>
+      <text>The |javax.enterprise.inject.spi.InjectionPoint.getAnnotations()| method returns annotations annotations of the parameter in the case of constructor parameter injection.</text>
     </assertion>
     
     <assertion id="dg">

Modified: tck/trunk/interceptor/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java
===================================================================
--- tck/trunk/interceptor/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/interceptor/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -5,11 +5,11 @@
 import java.util.Set;
 
 import javax.context.CreationalContext;
-import javax.inject.manager.Bean;
+import javax.enterprise.inject.spi.Bean;
 import javax.inject.manager.InjectionPoint;
 import javax.inject.manager.Manager;
 
-public abstract class ForwardingBean<T> extends Bean<T>
+public abstract class ForwardingBean<T> implements Bean<T>
 {
    
    protected ForwardingBean(Manager manager)

Modified: tck/trunk/pom.xml
===================================================================
--- tck/trunk/pom.xml	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/pom.xml	2009-05-26 12:53:17 UTC (rev 2712)
@@ -111,7 +111,7 @@
          <dependency>
             <groupId>org.jboss.webbeans</groupId>
             <artifactId>jsr299-api</artifactId>
-            <version>1.0.0.PREVIEW1</version>
+            <version>1.0.0-SNAPSHOT</version>
          </dependency>
          <dependency>
             <groupId>org.jboss.jsr299.tck</groupId>

Modified: tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java
===================================================================
--- tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -5,11 +5,11 @@
 import java.util.Set;
 
 import javax.context.CreationalContext;
-import javax.inject.manager.Bean;
+import javax.enterprise.inject.spi.Bean;
 import javax.inject.manager.InjectionPoint;
 import javax.inject.manager.Manager;
 
-public abstract class ForwardingBean<T> extends Bean<T>
+public abstract class ForwardingBean<T> implements Bean<T>
 {
    
    protected ForwardingBean(Manager manager)

Modified: tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2009-05-26 12:45:33 UTC (rev 2711)
+++ tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2009-05-26 12:53:17 UTC (rev 2712)
@@ -9,7 +9,7 @@
 import javax.context.RequestScoped;
 import javax.inject.AnnotationLiteral;
 import javax.inject.CreationException;
-import javax.inject.manager.Bean;
+import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;