[webbeans-commits] Webbeans SVN: r3618 - in tck/trunk: impl and 206 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Sun Aug 30 15:52:03 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-08-30 15:51:56 -0400 (Sun, 30 Aug 2009)
New Revision: 3618
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/Database.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptorBinding.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/Default.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorBinding.java
Modified:
tck/trunk/impl/pom.xml
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DummyContext.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/GetWithNoCreationalContextTest.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/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/application/ApplicationContextTest.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/TestFilter.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/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/ConversationTimeoutTest.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/Storm.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/FoxFarm.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxHole.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/Pet.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Room.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/Transactional.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/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/HelsinkiNonSerializable.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/Joensuu.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/Sleeping.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Television.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/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/CityDecorator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/CityDecorator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/British.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Maarianhamina_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/British.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Maarianhamina_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/BrokenDecorator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/BrokenDecorator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/BrokenDecorator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/Espoo_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBinding.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/InterceptorType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBinding.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BrokenInterceptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBinding.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BrokenInterceptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/InterceptorType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/FooScoped.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/Loviisa_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/Forssa_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/Vantaa_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/Peraseinajoki.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.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/TestFilter.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/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/SessionContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/TestFilter.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/CowShed.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Meta.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/CowShed.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/CowShed.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/CowShed.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/CowShed.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/CowShed.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooImpl.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/MockLogger.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/PigStyImpl.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/FishStereotype.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/bean/custom/CatBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/House.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/Bar.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Barn.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/Chunky.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/Order.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/Synchronous.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/Whitefish.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/Hairless.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/Skinny.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/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/FishStereotype.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/ScopeDefinitionTest.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/enterprise/FooScoped.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/broken/nonEmptyNamed/NonEmptyNamedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/Asynchronous.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/StereotypeWithEmptyNamed.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/FishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/BeforeBeanDiscoveryObserver.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/DisabledBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.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/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/BeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/InitializerBean_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/BeanWithInjection.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/BeforeBeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/BeforeBeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/ManagerObserver.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/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/AnimalAssessment.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventEmitter.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/NonRuntimeBindingType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Wild.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/BlackRumpedWaxbill_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/AustralianTerrier_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/TuneSelect.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/DogWhisperer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Lifted.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Restored.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Role.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/Honors.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/Registration.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/Role.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/Spun.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/NotEnabled.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Pomeranian.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Role.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Secret.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/DogAgent.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/Pomeranian.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/Tame.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/BindingTypeB.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/DuplicateBindingTypesWhenResolvingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.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/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SecuritySensor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SystemTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/Violent.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/DogHouse.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/Dog.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/CatBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/DogHouse.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/InjectionPointDecorator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Terrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/BirdCage.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Cat.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Dog.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/DogProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Noisy.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Preferred.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/PreferredDogProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Quiet.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/DefaultValidatorFactoryInjectedBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/DefaultValidatorInjectedBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/PrincipalInjectedBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/UserTransactionInjectedBean.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/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/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.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/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/Heidelburg.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Important.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/newBean/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/ExplicitConstructorSessionBean.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/NewEnterpriseBeanTest.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/EnterpriseBeanRemoveMethodTest.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/ChickenHutch.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/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/Capercaillie_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/Grouse_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.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/initializer/staticInitializer/StaticInitializerTest.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/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/OtherSpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Pet.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/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/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.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/lifecycle/BlackWidowConsumer.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/Null.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.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/Static.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaConsumer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Tame.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/Working.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.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/ProducerMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/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/LightYellow.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/lifecycle/BrownRecluse.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Delicious.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Fail.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/FirstBorn.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/Pet.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PreferredSpiderProducer.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/simple/definition/ClovenHoved.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/Turkey.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.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/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.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/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/Goose.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/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/InitializerSimpleBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewLionConsumer.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/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Bean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Lazy.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ManagedBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/Greeting.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/GreetingBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.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/persistenceContext/ResourceProducer.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/ManagedBean.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/Yard.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/FarmEquipment.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/FarmYard_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/Yard.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/Farmer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/Landowner.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.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/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/broken/indirectOverride/Expensive.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Shop.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Expensive.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Shop.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/School.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Expensive.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Shop.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.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/SimpleBeanSpecializationTest.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/SpecializingBeanExtendsEnterpriseBeanTest.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/SpecializingBeanImplementsInterfaceOnly.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.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/Landowner.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Logged.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Missile.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileBinding.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Secure.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Transactional.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/FooBinding.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/Foo.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/Transactional.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Deadly.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Fast.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Slow.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/Expensive_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/Expensive_Broken.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/Plaice.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/Sole.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/Sole.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/Example.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/ExampleWebsite_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Air.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Bird.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Car.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Food.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/House.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Petrol.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Pig.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Planet.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/SelfConsumingDependent1.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/SelfConsumingNormal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/SelfConsumingNormal1.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Space.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/InjectionPointBean_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FishFarm.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FishFarm.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/Number_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/InjectionPointBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/Farm_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Bean_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Small.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.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/ObtainsInstanceBean.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/builtin/BuiltinInstanceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/Farm.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Game.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Salmon.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/el/integration/Sheep.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/SpiderNest.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/any/Customer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Farm.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/FarmInterceptor.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/non/contextual/Farm.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TagLibraryListener.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestFilter.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestListener.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestServlet.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestTagHandler.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPoint.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPointService.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/injection/nullableBean/NullableBeanTest.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/Cat.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/InjectableReferenceTest.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/LoggerConsumer.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/injectionpoint/TransientFieldInjectionPointBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/Cat_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectionPoint.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectionPoint.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/typesafe/resolution/Chunky.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/CrabSpider.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DaddyLongLegs.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/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/Max.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Min.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Number.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/Whitefish.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/Game.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/Farm.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/Cat.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/InjectedBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Bird.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Cat.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/CatProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Chicken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Dog.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/EnabledPolicyStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/EnabledSheepProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Horse.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/NotEnabledPolicyStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/NotEnabledSheepProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Wild.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/Cat.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/Mock.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/Cat.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/Dog.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/EnabledEjb.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/NotEnabledEjb.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/byname/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/not/policy/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/enterprise/beans.xml
tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
tck/trunk/impl/src/main/resources/webbeans.sig
tck/trunk/pom.xml
Log:
initial work on switch to 330 annotations
Modified: tck/trunk/impl/pom.xml
===================================================================
--- tck/trunk/impl/pom.xml 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/pom.xml 2009-08-30 19:51:56 UTC (rev 3618)
@@ -103,6 +103,11 @@
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>inject-api</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</dependency>
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,9 +17,9 @@
protected abstract Bean<T> delegate();
- public Set<Annotation> getBindings()
+ public Set<Annotation> getQualifiers()
{
- return delegate().getBindings();
+ return delegate().getQualifiers();
}
public Set<InjectionPoint> getInjectionPoints()
@@ -32,9 +32,9 @@
return delegate().getName();
}
- public Class<? extends Annotation> getScopeType()
+ public Class<? extends Annotation> getScope()
{
- return delegate().getScopeType();
+ return delegate().getScope();
}
public Set<Type> getTypes()
Deleted: 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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.literals;
-
-import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.Current;
-
-/**
- * Annotation literal for @Current
- *
- * @author Pete Muir
- */
-public class CurrentLiteral extends AnnotationLiteral<Current> implements Current {}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DummyContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DummyContext.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DummyContext.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -18,7 +18,7 @@
return get(contextual, null);
}
- public Class<? extends Annotation> getScopeType()
+ public Class<? extends Annotation> getScope()
{
return DummyScoped.class;
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -5,9 +5,9 @@
import javax.enterprise.context.spi.Context;
import javax.enterprise.context.spi.Contextual;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,10 +3,10 @@
import javax.enterprise.context.SessionScoped;
import javax.enterprise.context.spi.Contextual;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyContextual.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -24,7 +24,7 @@
{
}
- public Set<Annotation> getBindings()
+ public Set<Annotation> getQualifiers()
{
return Collections.emptySet();
}
@@ -39,7 +39,7 @@
return "my-session-bean";
}
- public Class<? extends Annotation> getScopeType()
+ public Class<? extends Annotation> getScope()
{
return SessionScoped.class;
}
@@ -89,7 +89,7 @@
return MySessionBean.class;
}
- public boolean isPolicy()
+ public boolean isAlternative()
{
return false;
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanA.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,14 +3,14 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@SessionScoped
public class SimpleBeanA implements Serializable
{
private static final long serialVersionUID = 1L;
- @Current @SessionScoped
+ @Inject @SessionScoped
private SimpleBeanZ z;
public SimpleBeanZ getZ()
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanB.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,14 +3,14 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@SessionScoped
public class SimpleBeanB implements Serializable
{
private static final long serialVersionUID = 1L;
- @Current @SessionScoped
+ @Inject @SessionScoped
private SimpleBeanZ z;
public SimpleBeanZ getZ()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.context.application;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Resource;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,8 +2,8 @@
import java.io.IOException;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -13,7 +13,7 @@
{
private static final long serialVersionUID = 1L;
- @Current
+ @Inject
private BeanManager jsr299Manager;
@Override
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -20,8 +20,8 @@
import java.io.IOException;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -38,7 +38,7 @@
private static final long serialVersionUID = 1L;
- @Current
+ @Inject
private BeanManager jsr299Manager;
@Override
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/TestFilter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/TestFilter.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/TestFilter.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,8 +3,8 @@
import java.io.IOException;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -14,7 +14,7 @@
public class TestFilter implements Filter
{
- @Current
+ @Inject
private BeanManager jsr299Manager;
public void destroy()
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/BirdFeederService.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,8 +2,8 @@
import javax.ejb.Stateless;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.jws.WebMethod;
import javax.jws.WebService;
@@ -11,7 +11,7 @@
@WebService
public class BirdFeederService implements FeederService
{
- @Current
+ @Inject
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/FMSModelIII.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -6,9 +6,9 @@
import javax.ejb.Timer;
import javax.ejb.TimerService;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.Instance;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
@Stateless
public class FMSModelIII implements FMS
@@ -18,10 +18,10 @@
@Resource
private TimerService timerService;
- @Current
+ @Inject
private BeanManager beanManager;
- @Current
+ @Inject
private Instance<SimpleApplicationBean> simpleApplicationBeanInstance;
private static boolean applicationScopeActive = false;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,9 +2,10 @@
import javax.enterprise.context.Conversation;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.literals.AnyLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
@@ -20,7 +21,7 @@
public void beforeMethod()
{
super.beforeMethod();
- Conversation conversation = getInstanceByType(Conversation.class);
+ Conversation conversation = getInstanceByType(Conversation.class, new AnyLiteral());
if (conversation.isLongRunning())
{
conversation.end();
@@ -31,7 +32,7 @@
@SpecAssertion(section = "6.7.4", id = "f")
public void testConversationBeginMakesConversationLongRunning()
{
- Conversation conversation = getInstanceByType(Conversation.class);
+ Conversation conversation = getInstanceByType(Conversation.class, new AnyLiteral());
assert conversation.isTransient();
conversation.begin();
assert conversation.isLongRunning();
@@ -41,7 +42,7 @@
@SpecAssertion(section = "6.7.5", id = "r")
public void testBeginAlreadyLongRunningConversationThrowsException()
{
- Conversation conversation = getInstanceByType(Conversation.class);
+ Conversation conversation = getInstanceByType(Conversation.class, new AnyLiteral());
assert conversation.isTransient();
conversation.begin();
conversation.begin();
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,11 +4,12 @@
import javax.enterprise.context.Conversation;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.literals.AnyLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
@@ -24,21 +25,21 @@
@SpecAssertion(section = "6.7.4", id = "e")
public void testDefaultConversationIsTransient()
{
- assert !getInstanceByType(Conversation.class).isLongRunning();
+ assert !getInstanceByType(Conversation.class, new AnyLiteral()).isLongRunning();
}
@Test(groups = { "contexts" })
@SpecAssertion(section = "6.7.5", id = "iaa")
public void testBeanWithTypeConversation()
{
- assert getBeans(Conversation.class).size() == 1;
+ assert getBeans(Conversation.class, new AnyLiteral()).size() == 1;
}
@Test(groups = { "contexts" })
@SpecAssertion(section = "6.7.5", id = "ib")
public void testBeanWithRequestScope()
{
- assert getBeans(Conversation.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ assert getBeans(Conversation.class, new AnyLiteral()).iterator().next().getScope().equals(RequestScoped.class);
}
@Test(groups = { "contexts" })
@@ -46,9 +47,9 @@
public void testBeanWithBindingCurrent()
{
boolean found = false;
- for (Annotation binding : getBeans(Conversation.class).iterator().next().getBindings())
+ for (Annotation binding : getBeans(Conversation.class, new AnyLiteral()).iterator().next().getQualifiers())
{
- if (binding.annotationType().equals(Current.class))
+ if (binding.annotationType().equals(Default.class))
{
found = true;
}
@@ -60,7 +61,7 @@
@SpecAssertion(section = "6.7.5", id = "l")
public void testTransientConversationHasNullId()
{
- Conversation conversation = getInstanceByType(Conversation.class);
+ Conversation conversation = getInstanceByType(Conversation.class, new AnyLiteral());
assert !conversation.isLongRunning();
assert conversation.getId() == null;
}
@@ -69,7 +70,7 @@
@SpecAssertion(section = "6.7.5", id = "ie")
public void testBeanWithNameJavaxEnterpriseContextConversation()
{
- assert getBeans(Conversation.class).iterator().next().getName().equals("javax.enterprise.context.conversation");
+ assert getBeans(Conversation.class, new AnyLiteral()).iterator().next().getName().equals("javax.enterprise.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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,10 +2,10 @@
import javax.enterprise.context.Conversation;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,10 +2,10 @@
import javax.enterprise.context.Conversation;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,10 +2,10 @@
import javax.enterprise.context.Conversation;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,10 +2,10 @@
import javax.enterprise.context.Conversation;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,9 +4,12 @@
import javax.annotation.PreDestroy;
import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
+import javax.inject.Named;
-public @Named @ConversationScoped class Cloud implements Serializable
+ at Named @Default
+ at ConversationScoped
+public class Cloud implements Serializable
{
/**
*
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/CloudController.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.context.conversation.client;
import javax.enterprise.context.Conversation;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Named;
+import javax.inject.Inject;
+import javax.inject.Named;
public @Named class CloudController
{
- @Current Conversation conversation;
+ @Inject Conversation conversation;
public String getBeginConversation()
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,8 +4,8 @@
import java.io.ObjectOutputStream;
import javax.enterprise.context.Conversation;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,7 @@
private static final long serialVersionUID = 2984756941080790899L;
- @Current
+ @Inject
private BeanManager beanManager;
@Override
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Storm.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,8 +4,8 @@
import javax.enterprise.context.Conversation;
import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Named;
+import javax.inject.Inject;
+import javax.inject.Named;
@Named
@ConversationScoped
@@ -17,7 +17,7 @@
*/
private static final long serialVersionUID = -1513633490356967202L;
- at Current Conversation conversation;
+ @Inject Conversation conversation;
private String strength;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,13 +3,13 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.Dependent;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
@ApplicationScoped
class ApplicationHorseStable
{
- @Current
+ @Inject
private BeanManager beanManager;
private static boolean dependentContextActive = false;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -152,7 +152,7 @@
@SpecAssertion(section = "6.2", id = "ab")
public void testContextScopeType()
{
- assert getCurrentManager().getContext(Dependent.class).getScopeType().equals(Dependent.class);
+ assert getCurrentManager().getContext(Dependent.class).getScope().equals(Dependent.class);
}
@Test(groups = { "contexts" })
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Farm.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,13 +1,13 @@
package org.jboss.jsr299.tck.tests.context.dependent;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@RequestScoped
class Farm
{
- @Current Stable stable;
+ @Inject Stable stable;
public void open() {};
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Fox.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,9 +2,10 @@
import javax.annotation.PreDestroy;
import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
+import javax.inject.Named;
- at Dependent @Named
+ at Dependent @Named @Default
class Fox
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxFarm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxFarm.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxFarm.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,16 +1,15 @@
package org.jboss.jsr299.tck.tests.context.dependent;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class FoxFarm
{
- @Current public Fox fox;
+ @Inject public Fox fox;
public Fox constructorFox;
- @Initializer
- public FoxFarm(@Current Fox fox)
+ @Inject
+ public FoxFarm(Fox fox)
{
this.constructorFox = fox;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxHole.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxHole.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxHole.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,16 +1,16 @@
package org.jboss.jsr299.tck.tests.context.dependent;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Any;
+import javax.inject.Inject;
class FoxHole
{
- @Current public Fox fox;
+ @Inject public Fox fox;
public Fox initializerFox;
- @Initializer
- public void init(@Current Fox fox)
+ @Inject
+ public void init(Fox fox)
{
this.initializerFox = 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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxRun.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,18 +1,19 @@
package org.jboss.jsr299.tck.tests.context.dependent;
import javax.annotation.PreDestroy;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+import javax.inject.Named;
- at Named("foxRun")
+ at Named("foxRun") @Default
class FoxRun
{
private static boolean destroyed = false;
- @Current
+ @Inject
public Fox fox;
- @Current
+ @Inject
public Fox anotherFox;
@PreDestroy
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,9 +3,8 @@
import javax.annotation.PreDestroy;
import javax.enterprise.context.Dependent;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
@Dependent
class HorseStable
@@ -14,8 +13,8 @@
private static HorseStable instanceThatObservedEvent = null;
private static boolean destroyed = false;
- @Initializer
- public HorseStable(@Current BeanManager beanManager)
+ @Inject
+ public HorseStable(BeanManager beanManager)
{
dependentContextActive = beanManager.getContext(Dependent.class).isActive();
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Pet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Pet.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Pet.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
public @interface Pet
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Room.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Room.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Room.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Room
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +1,13 @@
package org.jboss.jsr299.tck.tests.context.dependent;
import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Named;
@Dependent
@Named
+ at Default
public class SensitiveFox
{
private static 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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,14 +2,14 @@
import javax.annotation.PreDestroy;
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;
+import javax.inject.Inject;
class SpiderProducer
{
- @Current
+ @Inject
private BeanManager beanManager;
private static boolean dependentContextActive = false;
@@ -17,7 +17,7 @@
private static SpiderProducer instanceUsedForDisposal = null;
- @Produces @Pet public Tarantula produceTarantula(@Current Tarantula spider)
+ @Produces @Pet public Tarantula produceTarantula(Tarantula spider)
{
dependentContextActive = beanManager.getContext(Dependent.class).isActive();
return spider;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Stable.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.context.dependent;
import javax.annotation.PreDestroy;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class Stable
{
- @Current Horse horse;
+ @Inject Horse horse;
public static boolean destroyed;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Transactional.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Transactional.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Transactional.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at InterceptorBindingType
+ at InterceptorBinding
@interface Transactional
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -20,9 +20,9 @@
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Farm.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,14 +2,14 @@
import javax.ejb.Stateful;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@RequestScoped @Stateful
public class Farm implements FarmLocal
{
- @Current Stable stable;
+ @Inject Stable stable;
public void open() {};
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Fox.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -6,11 +6,12 @@
import javax.ejb.Stateful;
import javax.enterprise.context.ContextNotActiveException;
import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.inject.Named;
- at Dependent @Named @Stateful
+ at Dependent @Named @Default @Stateful
public class Fox implements FoxLocal
{
@@ -18,7 +19,7 @@
private static int destroyCount = 0;
private static boolean dependentContextActiveDuringPostConstruct = false;
- @Current
+ @Inject
private BeanManager beanManager;
@PostConstruct
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/FoxRun.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,8 +3,8 @@
import javax.annotation.PreDestroy;
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Named;
+import javax.inject.Inject;
+import javax.inject.Named;
@Named("foxRun") @Stateful
public class FoxRun implements FoxRunLocal
@@ -12,10 +12,10 @@
private static boolean destroyed = false;
- @Current
+ @Inject
public FoxLocal fox;
- @Current
+ @Inject
public FoxLocal anotherFox;
@PreDestroy
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,13 +2,13 @@
import javax.ejb.Stateful;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@RequestScoped @Stateful
public class House implements HouseLocal
{
- @Current RoomLocal room;
+ @Inject RoomLocal room;
public RoomLocal open()
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Room.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,13 +2,13 @@
import javax.annotation.PreDestroy;
import javax.ejb.Stateful;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@Stateful
public class Room implements RoomLocal
{
- @Current TableLocal table;
+ @Inject TableLocal table;
public TableLocal getTable()
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Stable.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,7 +3,7 @@
import java.io.Serializable;
import javax.annotation.PreDestroy;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class Stable implements Serializable
{
@@ -13,7 +13,7 @@
*/
private static final long serialVersionUID = -5240670259345637799L;
- at Current Horse horse;
+ @Inject Horse horse;
public static boolean destroyed;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Big.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Big
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityBinding.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -8,9 +8,9 @@
import java.lang.annotation.Target;
import javax.enterprise.context.Dependent;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
- at InterceptorBindingType
+ at InterceptorBinding
@Dependent
@Target({TYPE, METHOD})
@Retention(RUNTIME)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/HelsinkiNonSerializable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/HelsinkiNonSerializable.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/HelsinkiNonSerializable.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.context.passivating;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
- at Policy
+ at Alternative
class HelsinkiNonSerializable
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Hyvinkaa.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,13 +3,13 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@SuppressWarnings("serial")
@SessionScoped
class Hyvinkaa implements Serializable
{
@SuppressWarnings("unused")
- @Current
+ @Inject
private transient Violation reference;
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Joensuu.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,14 +3,14 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@SuppressWarnings("serial")
@SessionScoped
class Joensuu implements Serializable
{
@SuppressWarnings("unused")
- @Current
+ @Inject
private transient Violation reference;
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/NumberConsumer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,13 +1,13 @@
package org.jboss.jsr299.tck.tests.context.passivating;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@RequestScoped
class NumberConsumer
{
- @Current int number;
+ @Inject int number;
public void ping(){};
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -102,7 +102,7 @@
private <T> boolean testSerialize(Bean<T> bean) throws IOException, ClassNotFoundException
{
getCurrentManager().addBean(bean);
- T instance = getCurrentManager().getContext(bean.getScopeType()).get(bean);
+ T instance = getCurrentManager().getContext(bean.getScope()).get(bean);
byte[] data = serialize(instance);
T resurrected = (T) deserialize(data);
assert resurrected != null;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Salo_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,7 +3,7 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@SessionScoped
class Salo_Broken extends City implements Serializable
@@ -11,7 +11,7 @@
private static final long serialVersionUID = 5500591077418621816L;
@SuppressWarnings("unused")
- @Current
+ @Inject
private transient Violation reference;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Sleeping.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Sleeping.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Sleeping.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Sleeping
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Television.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Television.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Television.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.context.passivating;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
- at Policy
+ at Alternative
class Television
{
public void turnOn() {}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Vaasa.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,12 +3,12 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@SuppressWarnings("serial")
@SessionScoped
class Vaasa implements Serializable
{
@SuppressWarnings("unused")
- @Current private HelsinkiLocal ejb;
+ @Inject private HelsinkiLocal ejb;
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.context.passivating;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
- at Policy
+ at Alternative
class Violation
{
public void ping()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -5,8 +5,7 @@
import javax.decorator.Decorates;
import javax.decorator.Decorator;
import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
@SuppressWarnings("serial")
@Decorator
@@ -14,8 +13,8 @@
{
@Decorates @Any CityInterface city;
- @Initializer
- public CityDecorator(@Current NonPassivating nonPassivating) {}
+ @Inject
+ public CityDecorator(NonPassivating nonPassivating) {}
public void foo()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/CityDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/CityDecorator.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/CityDecorator.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -5,8 +5,7 @@
import javax.decorator.Decorates;
import javax.decorator.Decorator;
import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
@SuppressWarnings("serial")
@Decorator
@@ -14,8 +13,8 @@
{
@Decorates @Any CityInterface city;
- @Initializer
- public void init(@Current NonPassivating nonPassivating) {}
+ @Inject
+ public void init(NonPassivating nonPassivating) {}
public void foo()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/CityDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/CityDecorator.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/CityDecorator.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -5,7 +5,7 @@
import javax.decorator.Decorates;
import javax.decorator.Decorator;
import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@SuppressWarnings("serial")
@Decorator
@@ -13,7 +13,7 @@
{
@Decorates @Any CityInterface city;
- @Current NonPassivating nonPassivating;
+ @Inject NonPassivating nonPassivating;
public void foo()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/British.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/British.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/British.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,10 +9,10 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
- at BindingType
+ at Qualifier
@Target( { FIELD, PARAMETER, METHOD, TYPE })
@Retention(RUNTIME)
@interface British
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Maarianhamina_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Maarianhamina_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Maarianhamina_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,12 +2,13 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
+import javax.inject.Inject;
@Stateful
public class Maarianhamina_Broken implements MaarianHaminaLocal_Broken
{
@SuppressWarnings("unused")
- @British Cow cow;
+ @Inject @British Cow cow;
@Remove
public void bye() {
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/British.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/British.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/British.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,10 +9,10 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
- at BindingType
+ at Qualifier
@Target( { FIELD, PARAMETER, METHOD, TYPE })
@Retention(RUNTIME)
@interface British
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Maarianhamina_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Maarianhamina_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Maarianhamina_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,12 +2,13 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
+import javax.inject.Inject;
@Stateful
public class Maarianhamina_Broken implements MaarianHaminaLocal_Broken
{
@SuppressWarnings("unused")
- @British Cow cow;
+ @Inject @British Cow cow;
@Remove
public void bye() {
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,13 +1,12 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor;
-import javax.enterprise.inject.Current;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
@Interceptor
class BrokenInterceptor
{
- public BrokenInterceptor(@Current District district) {}
+ public BrokenInterceptor(District district) {}
public Object intercept(InvocationContext ctx) throws Exception
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/BrokenDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/BrokenDecorator.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/BrokenDecorator.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,14 +4,13 @@
import javax.decorator.Decorates;
import javax.decorator.Decorator;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
@Decorator
class BrokenDecorator implements EspooLocal_Broken, Serializable
{
@Decorates EspooLocal_Broken espooLocal;
- @Initializer
- public BrokenDecorator(@Current District district) {}
+ @Inject
+ public BrokenDecorator(District district) {}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/BrokenDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/BrokenDecorator.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/BrokenDecorator.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,14 +4,13 @@
import javax.decorator.Decorates;
import javax.decorator.Decorator;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
@Decorator
class BrokenDecorator implements EspooLocal_Broken, Serializable
{
@Decorates EspooLocal_Broken espooLocal;
- @Initializer
- public void init(@Current District district) {}
+ @Inject
+ public void init(District district) {}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,15 +1,14 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
@Interceptor
class BrokenInterceptor
{
- @Initializer
- public void init(@Current District district) {}
+ @Inject
+ public void init(District district) {}
public Object intercept(InvocationContext ctx) throws Exception
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/BrokenDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/BrokenDecorator.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/BrokenDecorator.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,12 +4,12 @@
import javax.decorator.Decorates;
import javax.decorator.Decorator;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@Decorator
class BrokenDecorator implements EspooLocal_Broken, Serializable
{
@Decorates EspooLocal_Broken espooLocal;
- @Current District district;
+ @Inject District district;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,13 +1,13 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
@Interceptor
class BrokenInterceptor
{
- @Current District district;
+ @Inject District district;
public Object intercept(InvocationContext ctx) throws Exception
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/Espoo_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/Espoo_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/Espoo_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,13 +3,13 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@Stateful
@SessionScoped
class Espoo_Broken implements EspooLocal_Broken
{
- @Current
+ @Inject
District district;
@Remove
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBinding.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBinding.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,17 +1,17 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.METHOD;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Inherited
- at InterceptorBindingType
+ at InterceptorBinding
@InterceptorType
@Target({TYPE, METHOD})
@Retention(RUNTIME)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
@@ -8,7 +8,7 @@
@Interceptor @InterceptorType
class BrokenInterceptor
{
- public BrokenInterceptor(@Current Violation violation) {}
+ public BrokenInterceptor(@Default Violation violation) {}
@AroundInvoke
public Object invoke(InvocationContext ctx) throws Exception
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/InterceptorType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/InterceptorType.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/InterceptorType.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -7,11 +7,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Target({TYPE, METHOD})
@Retention(RUNTIME)
- at InterceptorBindingType
+ at InterceptorBinding
@interface InterceptorType
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBinding.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBinding.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,17 +1,17 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.METHOD;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Inherited
- at InterceptorBindingType
+ at InterceptorBinding
@InterceptorType
@Target({TYPE, METHOD})
@Retention(RUNTIME)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BrokenInterceptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BrokenInterceptor.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BrokenInterceptor.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,6 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
@@ -9,8 +8,8 @@
@Interceptor @InterceptorType
class BrokenInterceptor
{
- @Initializer
- public void init(@Current Violation violation) {}
+ @Inject
+ public void init(Violation violation) {}
@AroundInvoke
public Object invoke(InvocationContext ctx) throws Exception
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBinding.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBinding.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,17 +1,17 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInjectedField;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.METHOD;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Inherited
- at InterceptorBindingType
+ at InterceptorBinding
@InterceptorType
@Target({TYPE, METHOD})
@Retention(RUNTIME)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BrokenInterceptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BrokenInterceptor.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BrokenInterceptor.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInjectedField;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
@@ -8,7 +8,7 @@
@Interceptor @InterceptorType
class BrokenInterceptor
{
- @Current Violation violation;
+ @Inject Violation violation;
@AroundInvoke
public Object invoke(InvocationContext ctx) throws Exception
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/InterceptorType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/InterceptorType.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/InterceptorType.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -7,11 +7,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Target({TYPE, METHOD})
@Retention(RUNTIME)
- at InterceptorBindingType
+ at InterceptorBinding
@interface InterceptorType
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/FooScoped.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/FooScoped.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/FooScoped.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,12 +9,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.context.ScopeType;
+import javax.enterprise.context.NormalScope;
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@Documented
- at ScopeType(passivating = true)
+ at NormalScope(passivating = true)
@interface FooScoped
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/Loviisa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/Loviisa_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/Loviisa_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,8 +3,7 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
@SessionScoped
class Loviisa_Broken extends City implements Serializable
@@ -14,8 +13,8 @@
public Loviisa_Broken() {
}
- @Initializer
- public Loviisa_Broken(@Current Violation reference) {
+ @Inject
+ public Loviisa_Broken(Violation reference) {
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/Forssa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/Forssa_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/Forssa_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,8 +3,7 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
@SessionScoped
class Forssa_Broken implements Serializable
@@ -14,8 +13,8 @@
public Forssa_Broken() {
}
- @Initializer
- public Forssa_Broken(@Current Violation reference) {
+ @Inject
+ public Forssa_Broken(Violation reference) {
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingManagedBeanWithNonPassivatingInitializerMethod;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingManagedBeanWithNonPassivatingInjcetedField;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/Vantaa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/Vantaa_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/Vantaa_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,14 +3,14 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@SessionScoped
class Vantaa_Broken implements Serializable
{
private static final long serialVersionUID = -1686562136639336613L;
- @Current
+ @Inject
private Violation reference;
public Violation getReference()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingProducerMethodWithNonPassivatingParameter;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/Peraseinajoki.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/Peraseinajoki.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/Peraseinajoki.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,14 +1,13 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingProducerMethodWithNonPassivatingParameter;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.Produces;
class Peraseinajoki extends City
{
@Produces @SessionScoped
- public Violation2 create(@Current Violation reference)
+ public Violation2 create(Violation reference)
{
return new Violation2();
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,13 +3,13 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@Stateful
@SessionScoped
class Espoo_Broken implements EspooLocal_Broken
{
- @Current
+ @Inject
District district;
@Remove
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,8 +2,8 @@
import java.io.IOException;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -13,7 +13,7 @@
{
private static final long serialVersionUID = 1L;
- @Current
+ @Inject
private BeanManager jsr299Manager;
@Override
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -20,8 +20,8 @@
import java.io.IOException;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -38,7 +38,7 @@
private static final long serialVersionUID = 1L;
- @Current
+ @Inject
private BeanManager jsr299Manager;
@Override
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/TestFilter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/TestFilter.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/TestFilter.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,8 +3,8 @@
import java.io.IOException;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -14,7 +14,7 @@
public class TestFilter implements Filter
{
- @Current
+ @Inject
private BeanManager jsr299Manager;
public void destroy()
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/FMSModelIII.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -6,8 +6,8 @@
import javax.ejb.Timer;
import javax.ejb.TimerService;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
@Stateless
public class FMSModelIII implements FMS
@@ -17,7 +17,7 @@
@Resource
private TimerService timerService;
- @Current
+ @Inject
private BeanManager beanManager;
private static boolean requestScopeActive = false;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -19,8 +19,8 @@
import java.io.IOException;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -36,7 +36,7 @@
{
private static final long serialVersionUID = 1L;
- @Current
+ @Inject
private BeanManager jsr299Manager;
@Override
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,8 +2,8 @@
import java.io.IOException;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -13,7 +13,7 @@
{
private static final long serialVersionUID = 1L;
- @Current
+ @Inject
private BeanManager jsr299Manager;
@Override
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -20,8 +20,8 @@
import java.io.IOException;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -38,7 +38,7 @@
private static final long serialVersionUID = 1L;
- @Current
+ @Inject
private BeanManager jsr299Manager;
@Override
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.context.session;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Resource;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/TestFilter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/TestFilter.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/TestFilter.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,8 +3,8 @@
import java.io.IOException;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -14,7 +14,7 @@
public class TestFilter implements Filter
{
- @Current
+ @Inject
private BeanManager jsr299Manager;
public void destroy()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/CowShed.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/CowShed.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/CowShed.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
/**
* @author pmuir
@@ -25,11 +25,11 @@
public class CowShed
{
- @Current Logger logger;
+ @Inject Logger logger;
- @Current Foo foo;
+ @Inject Foo foo;
- @Current Bar bar;
+ @Inject Bar bar;
public void milk()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -24,7 +24,7 @@
import javax.decorator.Decorates;
import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.Decorator;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -106,8 +106,8 @@
assert decorator.getInjectionPoints().iterator().next().getType().equals(Logger.class);
assert decorator.getInjectionPoints().iterator().next().getAnnotated().isAnnotationPresent(Decorates.class);
assert decorator.getDelegateType().equals(Logger.class);
- assert decorator.getDelegateBindings().size() == 1;
- assert annotationSetMatches(decorator.getDelegateBindings(), Current.class);
+ assert decorator.getDelegateQualifiers().size() == 1;
+ assert annotationSetMatches(decorator.getDelegateQualifiers(), Default.class);
}
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Meta.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Meta.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Meta.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Meta
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition.broken.enabledDecoratorIsNotDecorator;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/CowShed.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/CowShed.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/CowShed.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition.inject.broken.delegateProducerMethod;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
/**
* @author pmuir
@@ -27,7 +27,7 @@
public static final String MESSAGE = "cowShed";
- @Current Logger logger;
+ @Inject Logger logger;
public void milk()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/CowShed.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/CowShed.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/CowShed.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateConstructor;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
/**
* @author pmuir
@@ -27,7 +27,7 @@
public static final String MESSAGE = "cowShed";
- @Current Logger logger;
+ @Inject Logger logger;
public void milk()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -18,7 +18,7 @@
import javax.decorator.Decorates;
import javax.decorator.Decorator;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
/**
@@ -33,7 +33,7 @@
private static Logger constructor;
- @Initializer
+ @Inject
public TimestampLogger(@Decorates Logger logger)
{
constructor = logger;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/CowShed.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/CowShed.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/CowShed.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,8 +16,9 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateField;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
+
/**
* @author pmuir
*
@@ -27,7 +28,7 @@
public static final String MESSAGE = "cowShed";
- @Current Logger logger;
+ @Inject Logger logger;
public void milk()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/CowShed.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/CowShed.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/CowShed.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,8 +16,9 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateInitializerMethod;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
+
/**
* @author pmuir
*
@@ -27,7 +28,7 @@
public static final String MESSAGE = "cowShed";
- @Current Logger logger;
+ @Inject Logger logger;
public void milk()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -18,7 +18,7 @@
import javax.decorator.Decorates;
import javax.decorator.Decorator;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
/**
@@ -33,7 +33,7 @@
private static Logger initializerMethod;
- @Initializer
+ @Inject
public void setLogger(@Decorates Logger logger)
{
initializerMethod = logger;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/CowShed.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/CowShed.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/CowShed.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.invocation;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
/**
* @author pmuir
@@ -27,14 +27,14 @@
public static final String MESSAGE = "cowShed";
- @Current Logger logger;
+ @Inject Logger logger;
public void milk()
{
logger.log(MESSAGE);
}
- @Current Foo foo;
+ @Inject Foo foo;
public void washDown()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -18,8 +18,8 @@
import javax.decorator.Decorates;
import javax.decorator.Decorator;
-import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
/**
* @author pmuir
@@ -31,7 +31,7 @@
private static InjectionPoint injectionPoint;
- @Initializer
+ @Inject
public void setInjectionPoint(InjectionPoint injectionPoint)
{
FooDecorator1.injectionPoint = injectionPoint;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -18,8 +18,8 @@
import javax.decorator.Decorates;
import javax.decorator.Decorator;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
/**
* @author pmuir
@@ -31,7 +31,7 @@
private static InjectionPoint injectionPoint;
- @Current InjectionPoint ip;
+ @Inject InjectionPoint ip;
public static InjectionPoint getInjectionPoint()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooImpl.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooImpl.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooImpl.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,8 +16,8 @@
*/
package org.jboss.jsr299.tck.tests.decorators.invocation;
-import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
/**
* @author pmuir
@@ -32,7 +32,7 @@
{
}
- @Initializer
+ @Inject
public FooImpl(InjectionPoint injectionPoint)
{
FooImpl.injectionPoint = injectionPoint;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/MockLogger.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/MockLogger.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/MockLogger.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.invocation;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
/**
* @author pmuir
@@ -25,7 +25,7 @@
public class MockLogger implements Logger
{
- @Initializer
+ @Inject
public void initialize()
{
initializeCalled = true;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/PigStyImpl.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/PigStyImpl.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/PigStyImpl.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.invocation;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
/**
* @author pmuir
@@ -25,14 +25,14 @@
public class PigStyImpl implements PigSty
{
- @Current Logger logger;
+ @Inject Logger logger;
public void clean()
{
logger.log(PigSty.MESSAGE);
}
- @Current Foo foo;
+ @Inject Foo foo;
public void washDown()
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -6,10 +6,10 @@
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
@@ -44,7 +44,7 @@
public void testBindingTypesNonEmpty()
{
assert getBeans(RedSnapper.class).size() == 1;
- assert getBeans(RedSnapper.class).iterator().next().getBindings().size() > 0;
+ assert getBeans(RedSnapper.class).iterator().next().getQualifiers().size() > 0;
}
@Test
@@ -57,7 +57,7 @@
public void testHasScopeType()
{
assert getBeans(RedSnapper.class).size() == 1;
- assert getBeans(RedSnapper.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ assert getBeans(RedSnapper.class).iterator().next().getScope().equals(RequestScoped.class);
}
@Test(groups = "producerMethod")
@@ -106,7 +106,7 @@
{
assert getBeans(Tarantula.class).size() == 1;
Bean<Tarantula> bean = getBeans(Tarantula.class).iterator().next();
- Tarantula tarantula = getCurrentManager().getContext(bean.getScopeType()).get(bean);
+ Tarantula tarantula = getCurrentManager().getContext(bean.getScope()).get(bean);
Spider spider = tarantula;
Animal animal = tarantula;
@@ -143,7 +143,7 @@
public void testMultipleStereotypes()
{
Bean<ComplicatedTuna> tunaBean = getBeans(ComplicatedTuna.class).iterator().next();
- assert tunaBean.getScopeType().equals(RequestScoped.class);
+ assert tunaBean.getScope().equals(RequestScoped.class);
assert tunaBean.getName().equals("complicatedTuna");
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -7,8 +7,8 @@
import java.lang.annotation.Target;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
+import javax.inject.Named;
@Stereotype
@Target( { TYPE })
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CatBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CatBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CatBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -13,7 +13,7 @@
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.InjectionPoint;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
public class CatBean implements Bean<Cat>, Extension
{
@@ -32,10 +32,10 @@
@SuppressWarnings("serial")
- public Set<Annotation> getBindings()
+ public Set<Annotation> getQualifiers()
{
getBindingsCalled = true;
- return new HashSet<Annotation>(){{ add(new CurrentLiteral());}};
+ return new HashSet<Annotation>(){{ add(new DefaultLiteral());}};
}
public Set<InjectionPoint> getInjectionPoints()
@@ -55,7 +55,7 @@
return new HashSet<Class<? extends Annotation>>();
}
- public Class<? extends Annotation> getScopeType()
+ public Class<? extends Annotation> getScope()
{
getScopeTypeCalled = true;
return Dependent.class;
@@ -86,7 +86,7 @@
return Cat.class;
}
- public boolean isPolicy()
+ public boolean isAlternative()
{
isPolicyCalled = true;
return false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/House.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/House.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/House.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.definition.bean.custom;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class House
{
@SuppressWarnings("unused")
- @Current private Cat cat;
+ @Inject private Cat cat;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/Bar.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/Bar.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/Bar.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.definition.bean.genericbroken;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class Bar
{
- @Current FooBroken fooBroken;
+ @Inject FooBroken fooBroken;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Barn.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Barn.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Barn.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,11 @@
package org.jboss.jsr299.tck.tests.definition.binding;
+import javax.inject.Inject;
+
class Barn
{
- @Tame
+ @Inject @Tame
public Tarantula petSpider;
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,7 +9,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
import org.jboss.jsr299.tck.literals.NewLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
@@ -29,9 +29,9 @@
public void testDefaultBindingDeclaredInJava()
{
Bean<Order> order = getBeans(Order.class).iterator().next();
- assert order.getBindings().size() == 2;
- assert order.getBindings().contains(new CurrentLiteral());
- assert order.getBindings().contains(new AnyLiteral());
+ assert order.getQualifiers().size() == 2;
+ assert order.getQualifiers().contains(new DefaultLiteral());
+ assert order.getQualifiers().contains(new AnyLiteral());
}
@Test
@@ -43,7 +43,7 @@
{
Bean<Order> order = getBeans(Order.class).iterator().next();
InjectionPoint injectionPoint = order.getInjectionPoints().iterator().next();
- assert injectionPoint.getBean().getBindings().contains(new CurrentLiteral());
+ assert injectionPoint.getBean().getQualifiers().contains(new DefaultLiteral());
}
@Test
@@ -60,8 +60,8 @@
};
assert getBeans(OrderProcessor.class, newOrderProcessor).size() == 1;
Bean<OrderProcessor> order = getBeans(OrderProcessor.class, newOrderProcessor).iterator().next();
- assert order.getBindings().size() == 1;
- assert order.getBindings().iterator().next().equals(newOrderProcessor);
+ assert order.getQualifiers().size() == 1;
+ assert order.getQualifiers().iterator().next().equals(newOrderProcessor);
}
@Test(groups = { "annotationDefinition", "rewrite" })
@@ -80,8 +80,8 @@
public void testBindingsDeclaredInJava()
{
Bean<Cat> cat = getBeans(Cat.class, new SynchronousBinding()).iterator().next();
- assert cat.getBindings().size() == 2;
- assert cat.getBindings().contains(new SynchronousBinding());
+ assert cat.getQualifiers().size() == 2;
+ assert cat.getQualifiers().contains(new SynchronousBinding());
}
@Test
@@ -91,7 +91,7 @@
public void testMultipleBindings()
{
Bean<?> model = getBeans(Cod.class, new ChunkyBinding(true), new WhitefishBinding()).iterator().next();
- assert model.getBindings().size() == 3;
+ assert model.getQualifiers().size() == 4;
}
@Test(groups = { "injection", "producerMethod" })
@@ -108,7 +108,7 @@
@SpecAssertion(section = "4.1", id = "aa")
public void testBindingDeclaredInheritedIsInherited() throws Exception
{
- Set<? extends Annotation> bindings = getBeans(BorderCollie.class, new HairyBinding(false)).iterator().next().getBindings();
+ Set<? extends Annotation> bindings = getBeans(BorderCollie.class, new HairyBinding(false)).iterator().next().getQualifiers();
assert bindings.size() == 2;
assert bindings.contains(new HairyBinding(false));
assert bindings.contains(new AnyLiteral());
@@ -118,9 +118,9 @@
@SpecAssertion(section = "4.1", id = "aaa")
public void testBindingNotDeclaredInheritedIsNotInherited()
{
- Set<? extends Annotation> bindings = getBeans(ShetlandPony.class).iterator().next().getBindings();
+ Set<? extends Annotation> bindings = getBeans(ShetlandPony.class).iterator().next().getQualifiers();
assert bindings.size() == 2;
- assert bindings.contains(new CurrentLiteral());
+ assert bindings.contains(new DefaultLiteral());
assert bindings.contains(new AnyLiteral());
}
@@ -128,7 +128,7 @@
@SpecAssertion(section = "4.1", id = "aa")
public void testBindingDeclaredInheritedIsBlockedByIntermediateClass()
{
- Set<? extends Annotation> bindings = getBeans(ClippedBorderCollie.class, new HairyBinding(true)).iterator().next().getBindings();
+ Set<? extends Annotation> bindings = getBeans(ClippedBorderCollie.class, new HairyBinding(true)).iterator().next().getQualifiers();
assert bindings.size() == 2;
Annotation hairyLiteral = new HairyBinding(true);
assert bindings.contains(hairyLiteral);
@@ -139,7 +139,7 @@
@SpecAssertion(section = "4.1", id = "ag")
public void testBindingDeclaredInheritedIsIndirectlyInherited()
{
- Set<? extends Annotation> bindings = getBeans(EnglishBorderCollie.class, new HairyBinding(false)).iterator().next().getBindings();
+ Set<? extends Annotation> bindings = getBeans(EnglishBorderCollie.class, new HairyBinding(false)).iterator().next().getQualifiers();
assert bindings.size() == 2;
assert bindings.contains(new HairyBinding(false));
}
@@ -148,9 +148,9 @@
@SpecAssertion(section = "4.1", id = "aga")
public void testBindingNotDeclaredInheritedIsNotIndirectlyInherited()
{
- Set<? extends Annotation> bindings = getBeans(MiniatureShetlandPony.class).iterator().next().getBindings();
+ Set<? extends Annotation> bindings = getBeans(MiniatureShetlandPony.class).iterator().next().getQualifiers();
assert bindings.size() == 2;
- assert bindings.contains(new CurrentLiteral());
+ assert bindings.contains(new DefaultLiteral());
assert bindings.contains(new AnyLiteral());
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Chunky.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface 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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cod.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.definition.binding;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Whitefish
@Chunky(realChunky=true)
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Hairy.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -11,12 +11,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@Inherited
@interface Hairy
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Order.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.definition.binding;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class Order
{
- @Initializer
+ @Inject
public Order(OrderProcessor processor) {}
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Produced.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Produced
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Species.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Species
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Synchronous.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { FIELD, PARAMETER, METHOD, TYPE })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface 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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Whitefish.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface 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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -31,7 +31,7 @@
@SpecAssertion(section = "4.1", id = "al")
public void testBindingDeclaredInheritedIsInherited() throws Exception
{
- Set<? extends Annotation> bindings = getBeans(BorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings();
+ Set<? extends Annotation> bindings = getBeans(BorderCollieLocal.class, new HairyBinding(false)).iterator().next().getQualifiers();
assert annotationSetMatches(bindings, Any.class, Hairy.class);
}
@@ -46,7 +46,7 @@
@SpecAssertion(section = "4.1", id = "ap")
public void testBindingDeclaredInheritedIsIndirectlyInherited()
{
- Set<? extends Annotation> bindings = getBeans(EnglishBorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings();
+ Set<? extends Annotation> bindings = getBeans(EnglishBorderCollieLocal.class, new HairyBinding(false)).iterator().next().getQualifiers();
assert annotationSetMatches(bindings, Any.class, Hairy.class);
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairless.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairless.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairless.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -11,12 +11,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@Inherited
@interface Hairless
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairy.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -11,13 +11,13 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@Inherited
@interface Hairy
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Skinny.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Skinny.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Skinny.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Skinny
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -7,8 +7,8 @@
import java.lang.annotation.Target;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
+import javax.inject.Named;
@Stereotype
@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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Haddock.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,9 @@
package org.jboss.jsr299.tck.tests.definition.name;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
+import javax.inject.Named;
- at Named
+ at Named @Default
class Haddock implements Animal
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Moose.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,9 @@
package org.jboss.jsr299.tck.tests.definition.name;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
+import javax.inject.Named;
- at Named("aMoose")
+ at Named("aMoose") @Default
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,10 +2,10 @@
import javax.enterprise.inject.spi.Bean;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScope.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,12 +9,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.context.ScopeType;
+import javax.enterprise.context.NormalScope;
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@Documented
- at ScopeType
+ at NormalScope
@interface AnotherScope
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,12 +9,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.context.ScopeType;
+import javax.enterprise.context.NormalScope;
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@Documented
- at ScopeType
+ at NormalScope
@interface AnotherScopeType
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -7,8 +7,8 @@
import java.lang.annotation.Target;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
+import javax.inject.Named;
@Stereotype
@Target( { TYPE })
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/NotInheritedScope.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,12 +9,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.context.ScopeType;
+import javax.enterprise.context.NormalScope;
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@Documented
- at ScopeType
+ at NormalScope
@interface NotInheritedScope
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -7,14 +7,14 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.Dependent;
+import javax.enterprise.context.NormalScope;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.ScopeType;
import javax.enterprise.inject.spi.Bean;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
@@ -28,7 +28,7 @@
{
assert getBeans(Mullet.class).size() == 1;
Bean<Mullet> bean = getBeans(Mullet.class).iterator().next();
- assert bean.getScopeType().equals(AnotherScopeType.class);
+ assert bean.getScope().equals(AnotherScopeType.class);
}
@Test(groups={"annotationDefinition"})
@@ -37,7 +37,7 @@
{
assert getBeans(Mullet.class).size() == 1;
Bean<Mullet> bean = getBeans(Mullet.class).iterator().next();
- Target target = bean.getScopeType().getAnnotation(Target.class);
+ Target target = bean.getScope().getAnnotation(Target.class);
List<ElementType> elements = Arrays.asList(target.value());
assert elements.contains(ElementType.TYPE);
assert elements.contains(ElementType.METHOD);
@@ -50,7 +50,7 @@
{
assert getBeans(Mullet.class).size() == 1;
Bean<Mullet> bean = getBeans(Mullet.class).iterator().next();
- assert bean.getScopeType().getAnnotation(ScopeType.class) != null;
+ assert bean.getScope().getAnnotation(NormalScope.class) != null;
}
@Test @SpecAssertion(section="2.4.3", id = "a")
@@ -58,7 +58,7 @@
{
assert getBeans(SeaBass.class).size() == 1;
Bean<SeaBass> bean = getBeans(SeaBass.class).iterator().next();
- assert bean.getScopeType().equals(RequestScoped.class);
+ assert bean.getScope().equals(RequestScoped.class);
}
@Test @SpecAssertion(section="2.4.4", id = "aa")
@@ -66,7 +66,7 @@
{
assert getBeans(Order.class).size() == 1;
Bean<Order> bean = getBeans(Order.class).iterator().next();
- assert bean.getScopeType().equals(Dependent.class);
+ assert bean.getScope().equals(Dependent.class);
}
@Test
@@ -77,8 +77,8 @@
public void testScopeSpecifiedAndStereotyped()
{
assert getBeans(Minnow.class).size() == 1;
- Bean<Minnow> bean = (Bean<Minnow>) getBeans(Minnow.class).iterator().next();
- assert bean.getScopeType().equals(RequestScoped.class);
+ Bean<Minnow> bean = getBeans(Minnow.class).iterator().next();
+ assert bean.getScope().equals(RequestScoped.class);
}
@Test @SpecAssertion(section="2.4.4", id = "da")
@@ -86,7 +86,7 @@
{
assert getBeans(Pollock.class).size() == 1;
Bean<Pollock> bean = getBeans(Pollock.class).iterator().next();
- assert bean.getScopeType().equals(Dependent.class);
+ assert bean.getScope().equals(Dependent.class);
}
@Test @SpecAssertion(section="2.4.4", id = "c")
@@ -94,7 +94,7 @@
{
assert getBeans(Grayling.class).size() == 1;
Bean<Grayling> bean = getBeans(Grayling.class).iterator().next();
- assert bean.getScopeType().equals(ApplicationScoped.class);
+ assert bean.getScope().equals(ApplicationScoped.class);
}
@Test
@@ -106,20 +106,20 @@
{
assert getBeans(RedSnapper.class).size() == 1;
Bean<RedSnapper> bean = getBeans(RedSnapper.class).iterator().next();
- assert bean.getScopeType().equals(RequestScoped.class);
+ assert bean.getScope().equals(RequestScoped.class);
}
@Test @SpecAssertion(section="4.1", id = "ba")
public void testScopeTypeDeclaredInheritedIsInherited() throws Exception
{
- assert getBeans(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ assert getBeans(BorderCollie.class).iterator().next().getScope().equals(RequestScoped.class);
}
@Test @SpecAssertion(section="4.1", id = "baa")
public void testScopeTypeNotDeclaredInheritedIsNotInherited()
{
assert getBeans(ShetlandPony.class).size() == 1;
- assert getBeans(ShetlandPony.class).iterator().next().getScopeType().equals(Dependent.class);
+ assert getBeans(ShetlandPony.class).iterator().next().getScope().equals(Dependent.class);
}
@Test @SpecAssertion(section="4.1", id = "ba")
@@ -132,14 +132,14 @@
public void testScopeTypeDeclaredInheritedIsBlockedByIntermediateScopeTypeNotMarkedInherited()
{
assert getBeans(GoldenLabrador.class).size() == 1;
- assert getBeans(GoldenLabrador.class).iterator().next().getScopeType().equals(Dependent.class);
+ assert getBeans(GoldenLabrador.class).iterator().next().getScope().equals(Dependent.class);
}
@Test
@SpecAssertion(section = "4.1", id = "bc")
public void testScopeTypeDeclaredInheritedIsIndirectlyInherited()
{
- assert getBeans(EnglishBorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ assert getBeans(EnglishBorderCollie.class).iterator().next().getScope().equals(RequestScoped.class);
}
@Test
@@ -147,7 +147,7 @@
public void testScopeTypeNotDeclaredInheritedIsNotIndirectlyInherited()
{
assert getBeans(MiniatureClydesdale.class).size() == 1;
- assert getBeans(MiniatureClydesdale.class).iterator().next().getScopeType().equals(Dependent.class);
+ assert getBeans(MiniatureClydesdale.class).iterator().next().getScope().equals(Dependent.class);
}
}
\ No newline at end of file
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -19,26 +19,26 @@
@SpecAssertion(section="4.1", id = "be")
public void testScopeTypeDeclaredInheritedIsInherited() throws Exception
{
- assert getBeans(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ assert getBeans(BorderCollieLocal.class).iterator().next().getScope().equals(RequestScoped.class);
}
@Test @SpecAssertion(section="4.1", id = "bea")
public void testScopeTypeNotDeclaredInheritedIsNotInherited() throws Exception
{
- assert !getBeans(SiameseLocal.class).iterator().next().getScopeType().equals(FooScoped.class);
+ assert !getBeans(SiameseLocal.class).iterator().next().getScope().equals(FooScoped.class);
}
@Test
@SpecAssertion(section = "4.1", id = "bh")
public void testScopeTypeDeclaredInheritedIsIndirectlyInherited()
{
- assert getBeans(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ assert getBeans(EnglishBorderCollieLocal.class).iterator().next().getScope().equals(RequestScoped.class);
}
@Test
@SpecAssertion(section = "4.1", id = "bha")
public void testScopeTypeNotDeclaredInheritedIsNotIndirectlyInherited()
{
- assert !getBeans(BengalTigerLocal.class).iterator().next().getScopeType().equals(FooScoped.class);
+ assert !getBeans(BengalTigerLocal.class).iterator().next().getScope().equals(FooScoped.class);
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/FooScoped.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/FooScoped.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/FooScoped.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,12 +9,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.context.ScopeType;
+import javax.enterprise.context.NormalScope;
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@Documented
- at ScopeType
+ at NormalScope
public @interface FooScoped
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -30,7 +30,7 @@
public void testStereotypeWithScopeType()
{
assert getBeans(Moose.class).size() == 1;
- assert getBeans(Moose.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ assert getBeans(Moose.class).iterator().next().getScope().equals(RequestScoped.class);
}
@Test
@@ -39,7 +39,7 @@
public void testStereotypeWithoutScopeType()
{
assert getBeans(Reindeer.class).size() == 1;
- assert getBeans(Reindeer.class).iterator().next().getScopeType().equals(Dependent.class);
+ assert getBeans(Reindeer.class).iterator().next().getScope().equals(Dependent.class);
}
@Test
@@ -50,7 +50,7 @@
public void testOneStereotypeAllowed()
{
Bean<LongHairedDog> bean = getBeans(LongHairedDog.class).iterator().next();
- assert bean.getScopeType().equals(RequestScoped.class);
+ assert bean.getScope().equals(RequestScoped.class);
}
@Test
@@ -61,8 +61,8 @@
assert getBeans(HighlandCow.class, TAME_LITERAL).size() == 1;
Bean<HighlandCow> highlandCow = getBeans(HighlandCow.class, TAME_LITERAL).iterator().next();
assert highlandCow.getName() == null;
- assert highlandCow.getBindings().contains(TAME_LITERAL);
- assert highlandCow.getScopeType().equals(RequestScoped.class);
+ assert highlandCow.getQualifiers().contains(TAME_LITERAL);
+ assert highlandCow.getScope().equals(RequestScoped.class);
}
@Test
@@ -71,14 +71,14 @@
public void testExplicitScopeOverridesMergedScopesFromMultipleStereotype()
{
assert getBeans(Springbok.class).size() == 1;
- assert getBeans(Springbok.class).iterator().next().getScopeType().equals(ApplicationScoped.class);
+ assert getBeans(Springbok.class).iterator().next().getScope().equals(ApplicationScoped.class);
}
@Test
@SpecAssertion(section = "4.1", id = "ab")
public void testStereotypeDeclaredInheritedIsInherited() throws Exception
{
- assert getBeans(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ assert getBeans(BorderCollie.class).iterator().next().getScope().equals(RequestScoped.class);
}
@Test
@@ -86,14 +86,14 @@
public void testStereotypeNotDeclaredInheritedIsNotInherited()
{
assert getBeans(ShetlandPony.class).size() == 1;
- assert getBeans(ShetlandPony.class).iterator().next().getScopeType().equals(Dependent.class);
+ assert getBeans(ShetlandPony.class).iterator().next().getScope().equals(Dependent.class);
}
@Test
@SpecAssertion(section = "4.1", id = "ah")
public void testStereotypeDeclaredInheritedIsIndirectlyInherited()
{
- assert getBeans(EnglishBorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ assert getBeans(EnglishBorderCollie.class).iterator().next().getScope().equals(RequestScoped.class);
}
@Test
@@ -101,21 +101,21 @@
public void testStereotypeNotDeclaredInheritedIsNotIndirectlyInherited()
{
assert getBeans(MiniatureClydesdale.class).size() == 1;
- assert getBeans(MiniatureClydesdale.class).iterator().next().getScopeType().equals(Dependent.class);
+ assert getBeans(MiniatureClydesdale.class).iterator().next().getScope().equals(Dependent.class);
}
@Test
@SpecAssertion(section = "4.1", id = "hhh")
public void testStereotypeScopeIsOverriddenByInheritedScope()
{
- assert getBeans(Chihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class);
+ assert getBeans(Chihuahua.class).iterator().next().getScope().equals(SessionScoped.class);
}
@Test
@SpecAssertion(section = "4.1", id = "hhi")
public void testStereotypeScopeIsOverriddenByIndirectlyInheritedScope()
{
- assert getBeans(MexicanChihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class);
+ assert getBeans(MexicanChihuahua.class).iterator().next().getScope().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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.definition.stereotype.broken.nonEmptyNamed;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -6,8 +6,8 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
+import javax.inject.Named;
@Stereotype
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/Asynchronous.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/Asynchronous.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/Asynchronous.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,12 +9,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Asynchronous
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.definition.stereotype.defaultNamed;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/StereotypeWithEmptyNamed.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/StereotypeWithEmptyNamed.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/StereotypeWithEmptyNamed.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -6,8 +6,8 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
+import javax.inject.Named;
@Stereotype
@Target( { TYPE })
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -22,41 +22,41 @@
@SpecAssertion(section = "4.1", id = "am")
public void testStereotypeDeclaredInheritedIsInherited() throws Exception
{
- assert getBeans(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ assert getBeans(BorderCollieLocal.class).iterator().next().getScope().equals(RequestScoped.class);
}
@Test
@SpecAssertion(section = "4.1", id = "ama")
public void testStereotypeNotDeclaredInheritedIsNotInherited() throws Exception
{
- assert !getBeans(BarracudaLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ assert !getBeans(BarracudaLocal.class).iterator().next().getScope().equals(RequestScoped.class);
}
@Test
@SpecAssertion(section = "4.1", id = "aq")
public void testStereotypeDeclaredInheritedIsIndirectlyInherited()
{
- assert getBeans(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ assert getBeans(EnglishBorderCollieLocal.class).iterator().next().getScope().equals(RequestScoped.class);
}
@Test
@SpecAssertion(section = "4.1", id = "aqa")
public void testStereotypeNotDeclaredInheritedIsNotIndirectlyInherited()
{
- assert !getBeans(TameBarracudaLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ assert !getBeans(TameBarracudaLocal.class).iterator().next().getScope().equals(RequestScoped.class);
}
@Test
@SpecAssertion(section = "4.1", id = "hhj")
public void testStereotypeScopeIsOverriddenByInheritedScope()
{
- assert getBeans(ChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class);
+ assert getBeans(ChihuahuaLocal.class).iterator().next().getScope().equals(SessionScoped.class);
}
@Test
@SpecAssertion(section = "4.1", id = "hhk")
public void testStereotypeScopeIsOverriddenByIndirectlyInheritedScope()
{
- assert getBeans(MexicanChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class);
+ assert getBeans(MexicanChihuahuaLocal.class).iterator().next().getScope().equals(SessionScoped.class);
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/FishStereotype.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/FishStereotype.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -5,7 +5,6 @@
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,14 +9,14 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@NamedRequestStereotype
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
- at Policy
+ at Alternative
@Inherited
@interface NamedRequestPolicyStereotype
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedStereotype.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedStereotype.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,8 +9,8 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
+import javax.inject.Named;
@Stereotype
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -49,8 +49,8 @@
Set<Bean<Horse>> beans = getBeans(Horse.class);
assert beans.size() == 1;
Bean<Horse> bean = beans.iterator().next();
- assert bean.getScopeType().equals(RequestScoped.class);
- assert bean.isPolicy();
+ assert bean.getScope().equals(RequestScoped.class);
+ assert bean.isAlternative();
assert bean.getName().equals("horse");
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/BeforeBeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/BeforeBeanDiscoveryObserver.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/BeforeBeanDiscoveryObserver.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -48,8 +48,8 @@
public void observe(@Observes BeforeBeanDiscovery beforeBeanDiscovery)
{
setObserved(true);
- beforeBeanDiscovery.addBindingType(Tame.class);
- beforeBeanDiscovery.addScopeType(EpochScoped.class, false, false);
+ beforeBeanDiscovery.addQualifier(Tame.class);
+ beforeBeanDiscovery.addScope(EpochScoped.class, false, false);
}
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessAuthorizationDecorator.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,7 +2,7 @@
import javax.decorator.Decorates;
import javax.decorator.Decorator;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@Decorator
class DataAccessAuthorizationDecorator implements DataAccess
@@ -10,7 +10,7 @@
@Decorates
DataAccess delegate;
- @Current
+ @Inject
User user;
public void save()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DisabledBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DisabledBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DisabledBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
- at Policy
+ at Alternative
class DisabledBean
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -68,7 +68,7 @@
assert BeforeBeanDiscoveryObserver.isObserved();
assert getBeans(RomanEmpire.class).size() == 1;
Bean<RomanEmpire> bean = getBeans(RomanEmpire.class).iterator().next();
- assert bean.getScopeType().equals(EpochScoped.class);
+ assert bean.getScope().equals(EpochScoped.class);
}
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,6 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
import javax.enterprise.inject.spi.BeanManager;
@@ -12,12 +11,12 @@
private static boolean afterBeanDiscoveryCalled = false;
private static boolean afterDeploymentValidationCalled = false;
- public void managerInitialized(@Observes AfterBeanDiscovery event, @Current BeanManager beanManager)
+ public void managerInitialized(@Observes AfterBeanDiscovery event, BeanManager beanManager)
{
afterBeanDiscoveryCalled = true;
}
- public void managerDeployed(@Observes AfterDeploymentValidation event, @Current BeanManager beanManager)
+ public void managerDeployed(@Observes AfterDeploymentValidation event, BeanManager beanManager)
{
assert afterBeanDiscoveryCalled : "AfterBeanDiscovery should have been called before AfterDeploymentValidation";
afterDeploymentValidationCalled = true;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.beanDiscoveryMethodThrowsException;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.IntegrationTest;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/BeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/BeanDiscoveryObserver.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/BeanDiscoveryObserver.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -7,6 +7,6 @@
{
public void afterBeanDiscovery(@Observes AfterBeanDiscovery event)
{
- assert false : "Deployment should have already failed because of the presence of an invalid @Initializer method";
+ assert false : "Deployment should have already failed because of the presence of an invalid @Inject method";
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringBeanDiscovery;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/InitializerBean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/InitializerBean_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/InitializerBean_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringBeanDiscovery;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class InitializerBean_Broken
{
- @Initializer
+ @Inject
public void initialize(@Observes String string)
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/BeanWithInjection.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/BeanWithInjection.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/BeanWithInjection.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringValidation;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class BeanWithInjection
{
- @Current protected NotABean pretendBean;
+ @Inject protected NotABean pretendBean;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.normalScope;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.IntegrationTest;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/BeforeBeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/BeforeBeanDiscoveryObserver.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/BeforeBeanDiscoveryObserver.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -29,7 +29,7 @@
public void observe(@Observes BeforeBeanDiscovery beforeBeanDiscovery)
{
- beforeBeanDiscovery.addScopeType(EpochScoped.class, true, false);
+ beforeBeanDiscovery.addScope(EpochScoped.class, true, false);
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.passivatingScope;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.IntegrationTest;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/BeforeBeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/BeforeBeanDiscoveryObserver.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/BeforeBeanDiscoveryObserver.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -29,7 +29,7 @@
public void observe(@Observes BeforeBeanDiscovery beforeBeanDiscovery)
{
- beforeBeanDiscovery.addScopeType(EpochScoped.class, false, true);
+ beforeBeanDiscovery.addScope(EpochScoped.class, false, true);
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/ManagerObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/ManagerObserver.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/ManagerObserver.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,6 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.useBeforeValidationFails;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
import javax.enterprise.inject.spi.BeanManager;
@@ -11,13 +10,13 @@
private static boolean managerInitialized = false;
private static boolean managerDeployed = false;
- public void managerInitialized(@Observes AfterBeanDiscovery event, @Current BeanManager beanManager)
+ public void managerInitialized(@Observes AfterBeanDiscovery event, BeanManager beanManager)
{
managerInitialized = true;
beanManager.fireEvent("An event that should not be fired");
}
- public void managerDeployed(@Observes AfterDeploymentValidation event, @Current BeanManager beanManager)
+ public void managerDeployed(@Observes AfterDeploymentValidation event, BeanManager beanManager)
{
managerDeployed = true;
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Role.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,11 +9,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { FIELD, PARAMETER, METHOD, TYPE })
@Retention(RUNTIME)
- at BindingType
+ at Qualifier
@interface Role
{
String value();
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/AnimalAssessment.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/AnimalAssessment.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/AnimalAssessment.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,14 +2,15 @@
import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
+import javax.inject.Inject;
class AnimalAssessment
{
- @Any Event<Animal> animalEvent;
+ @Inject @Any Event<Animal> animalEvent;
- @Tame Event<Animal> tameAnimalEvent;
+ @Inject @Tame Event<Animal> tameAnimalEvent;
- @Any @Wild Event<Animal> wildAnimalEvent;
+ @Inject @Any @Wild Event<Animal> wildAnimalEvent;
public void classifyAsTame(Animal animal)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -47,7 +47,6 @@
DiscerningObserver observer = getInstanceByType(DiscerningObserver.class);
observer.reset();
EventEmitter emitter = getInstanceByType(EventEmitter.class);
- assert emitter.isEventWithOnlyNonRuntimeBindingTypeNotInjected();
emitter.fireEvent();
assert observer.getNumTimesAnyBindingTypeEventObserved() == 1;
assert observer.getNumTimesNonRuntimeBindingTypeObserved() == 1;
@@ -75,12 +74,12 @@
public void testEventAlwaysHasAnyBinding()
{
Bean<Event<Animal>> animalEventBean = getUniqueBean(new TypeLiteral<Event<Animal>>() {}, new WildAnnotationLiteral());
- assert animalEventBean.getBindings().contains(new AnyLiteral());
+ assert animalEventBean.getQualifiers().contains(new AnyLiteral());
Bean<Event<Animal>> tameAnimalEventBean = getUniqueBean(new TypeLiteral<Event<Animal>>() {}, new TameAnnotationLiteral());
- assert tameAnimalEventBean.getBindings().contains(new AnyLiteral());
+ assert tameAnimalEventBean.getQualifiers().contains(new AnyLiteral());
Bean<Event<Animal>> wildAnimalEventBean = getUniqueBean(new TypeLiteral<Event<Animal>>() {}, new WildAnnotationLiteral());
- assert wildAnimalEventBean.getBindings().contains(new AnyLiteral());
+ assert wildAnimalEventBean.getQualifiers().contains(new AnyLiteral());
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventEmitter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventEmitter.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventEmitter.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,14 +2,15 @@
import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
+import javax.inject.Inject;
class EventEmitter
{
- @Any Event<String> stringEvent;
+ @Inject @Any Event<String> stringEvent;
- @Any @NonRuntimeBindingType Event<String> stringEventWithAnyAndNonRuntimeBindingType;
+ @Inject @Any @NonRuntimeBindingType Event<String> stringEventWithAnyAndNonRuntimeBindingType;
- @NonRuntimeBindingType Event<String> stringEventWithOnlyNonRuntimeBindingType;
+ @Inject @NonRuntimeBindingType Event<String> stringEventWithOnlyNonRuntimeBindingType;
public void fireEvent()
{
@@ -20,9 +21,4 @@
{
stringEventWithAnyAndNonRuntimeBindingType.fire("event");
}
-
- public boolean isEventWithOnlyNonRuntimeBindingTypeNotInjected()
- {
- return stringEventWithOnlyNonRuntimeBindingType == null;
- }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/NonRuntimeBindingType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/NonRuntimeBindingType.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/NonRuntimeBindingType.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -7,10 +7,10 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { FIELD, PARAMETER })
- at BindingType
+ at Qualifier
@Retention(RetentionPolicy.CLASS)
@interface NonRuntimeBindingType
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Tame.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Wild.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Wild.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Wild.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { FIELD, PARAMETER, METHOD, TYPE } )
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Wild
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/BlackRumpedWaxbill_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/BlackRumpedWaxbill_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/BlackRumpedWaxbill_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,9 +2,11 @@
import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
+import javax.inject.Inject;
class BlackRumpedWaxbill_Broken
{
@SuppressWarnings({"unchecked", "unused"})
- private @Any Event simpleEvent;
+ @Inject @Any
+ private Event simpleEvent;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -21,7 +21,7 @@
/**
* This class is not a bean since it does not have a default constructor
- * nor does it have a constructor annotated with {@link @Initializer}.
+ * nor does it have a constructor annotated with {@link @Inject}.
* As such, an observer method is not detected on this class.
*
* @author David Allen
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,9 +16,9 @@
*/
package org.jboss.jsr299.tck.tests.event.broken.observer.beanNotManaged;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -18,10 +18,10 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.isDisposer;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/AustralianTerrier_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/AustralianTerrier_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/AustralianTerrier_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.isInitializer;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.inject.Inject;
class AustralianTerrier_Broken
{
- public @Initializer void observesAfterBeanDiscovery(@Observes AfterBeanDiscovery discovery)
+ public @Inject void observesAfterBeanDiscovery(@Observes AfterBeanDiscovery discovery)
{
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -18,10 +18,10 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.isInitializer;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,10 +17,10 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.isProducer;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,11 +16,11 @@
*/
package org.jboss.jsr299.tck.tests.event.broken.observer.notBusinessMethod;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.tooManyParameters;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,5 @@
package org.jboss.jsr299.tck.tests.event.eventTypes;
-import javax.enterprise.inject.TypeLiteral;
-
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/TuneSelect.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/TuneSelect.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/TuneSelect.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,14 +2,15 @@
import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
+import javax.inject.Inject;
class TuneSelect<T>
{
- @Any Event<Artist<T>> soloArtistEvent;
+ @Inject @Any Event<Artist<T>> soloArtistEvent;
- @Any Event<Song> songEvent;
+ @Inject @Any Event<Song> songEvent;
- @Any Event<Broadcast> broadcastEvent;
+ @Inject @Any Event<Broadcast> broadcastEvent;
public void songPlaying(Song s)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/DogWhisperer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/DogWhisperer.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/DogWhisperer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,12 +2,15 @@
import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
+import javax.inject.Inject;
class DogWhisperer
{
- @Any @Tame @Role("Master") Event<TamingCommand> tamingEvent;
+ @Inject @Any @Tame @Role("Master")
+ Event<TamingCommand> tamingEvent;
- @Any Event<Praise> praiseEvent;
+ @Inject @Any
+ Event<Praise> praiseEvent;
public void issueTamingCommand()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -99,8 +99,8 @@
}
assert eventInjection != null;
- assert eventInjection.getBindings().size() == 1;
- assert eventInjection.getBindings().contains(new AnyLiteral());
+ assert eventInjection.getQualifiers().size() == 1;
+ assert eventInjection.getQualifiers().contains(new AnyLiteral());
CreationalContext<MiniBar> miniBarCc = getCurrentManager().createCreationalContext(miniBarBean);
MiniBar miniBar = miniBarBean.create(miniBarCc);
@@ -193,8 +193,8 @@
}
assert eventInjection != null;
- assert eventInjection.getBindings().size() == 1;
- assert eventInjection.getBindings().contains(new AnnotationLiteral<Lifted>() {});
+ assert eventInjection.getQualifiers().size() == 1;
+ assert eventInjection.getQualifiers().contains(new AnnotationLiteral<Lifted>() {});
CreationalContext<MiniBar> miniBarCc = getCurrentManager().createCreationalContext(miniBarBean);
MiniBar miniBar = miniBarBean.create(miniBarCc);
@@ -231,8 +231,8 @@
}
assert eventInjection != null;
- assert eventInjection.getBindings().size() == 1;
- assert eventInjection.getBindings().contains(new AnyLiteral());
+ assert eventInjection.getQualifiers().size() == 1;
+ assert eventInjection.getQualifiers().contains(new AnyLiteral());
CreationalContext<MiniBar> miniBarCc = getCurrentManager().createCreationalContext(miniBarBean);
MiniBar miniBar = miniBarBean.create(miniBarCc);
miniBar.stock();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Lifted.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Lifted.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Lifted.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Lifted
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -6,16 +6,17 @@
import javax.enterprise.event.Event;
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Any;
+import javax.inject.Inject;
class MiniBar
{
private Set<Item> items = new HashSet<Item>();
- @Any Event<MiniBar> miniBarEvent;
+ @Inject @Any Event<MiniBar> miniBarEvent;
- @Lifted Event<Item> itemLiftedEvent;
+ @Inject @Lifted Event<Item> itemLiftedEvent;
- @Any Event<Item> itemEvent;
+ @Inject @Any Event<Item> itemEvent;
Event<Item> getItemEvent()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Restored.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Restored.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Restored.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Restored
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Role.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Role.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Role.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,11 +9,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { FIELD, PARAMETER, METHOD, TYPE })
@Retention(RUNTIME)
- at BindingType
+ at Qualifier
@interface Role
{
String value();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Tame.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.event.fires.nonbinding;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,11 +2,12 @@
import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
+import javax.inject.Inject;
class OwlFinch_Broken
{
- @Any
+ @Inject @Any
private Event<String> simpleEvent;
public void methodThatFiresEvent()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/Honors.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/Honors.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/Honors.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Honors
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -7,11 +7,11 @@
import javax.enterprise.event.Event;
import javax.enterprise.inject.TypeLiteral;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.literals.AnyLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.literals.AnyLiteral;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
@@ -48,10 +48,10 @@
@SpecAssertion(section = "10.1", id = "i")
public void testImplicitEventHasAnyBinding()
{
- assert getUniqueBean(STUDENT_REGISTERED_EVENT_LITERAL).getBindings().contains(new AnyLiteral());
- assert getUniqueBean(COURSE_FULL_EVENT_LITERAL).getBindings().contains(new AnyLiteral());
- assert getUniqueBean(AWARD_EVENT_LITERAL).getBindings().contains(new AnyLiteral());
- assert getUniqueBean(AWARD_EVENT_LITERAL, new HonorsLiteral()).getBindings().contains(new AnyLiteral());
+ assert getUniqueBean(STUDENT_REGISTERED_EVENT_LITERAL).getQualifiers().contains(new AnyLiteral());
+ assert getUniqueBean(COURSE_FULL_EVENT_LITERAL).getQualifiers().contains(new AnyLiteral());
+ assert getUniqueBean(AWARD_EVENT_LITERAL).getQualifiers().contains(new AnyLiteral());
+ assert getUniqueBean(AWARD_EVENT_LITERAL, new HonorsLiteral()).getQualifiers().contains(new AnyLiteral());
assert getUniqueBean(AWARD_EVENT_LITERAL, new AnyLiteral(), new HonorsLiteral()) == getUniqueBean(AWARD_EVENT_LITERAL, new HonorsLiteral());
}
@@ -59,7 +59,7 @@
@SpecAssertion(section = "10.3.2", id = "d")
public void testImplicitEventHasDependentScope()
{
- assert getUniqueBean(STUDENT_REGISTERED_EVENT_LITERAL).getScopeType().equals(Dependent.class);
+ assert getUniqueBean(STUDENT_REGISTERED_EVENT_LITERAL).getScope().equals(Dependent.class);
}
@Test(groups = "events")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/Registration.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/Registration.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/Registration.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,15 +2,16 @@
import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class Registration
{
- private @Any Event<StudentRegisteredEvent> studentRegisteredEvent;
+ @Inject @Any private Event<StudentRegisteredEvent> studentRegisteredEvent;
private Event<CourseFullEvent> courseFullEvent;
- public @Initializer Registration(Event<CourseFullEvent> courseFullEvent)
+ @Inject
+ public Registration(Event<CourseFullEvent> courseFullEvent)
{
this.courseFullEvent = courseFullEvent;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -7,7 +7,7 @@
import javax.enterprise.inject.spi.ObserverMethod;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -75,8 +75,8 @@
Set<ObserverMethod<?, StockPrice>> observers = getCurrentManager().resolveObserverMethods(new StockPrice());
assert observers.size() == 1;
ObserverMethod<?, ?> observerMethod = observers.iterator().next();
- assert observerMethod.getObservedBindings().size() == 1;
- assert observerMethod.getObservedBindings().contains(new CurrentLiteral());
+ assert observerMethod.getObservedQualifiers().size() == 1;
+ assert observerMethod.getObservedQualifiers().contains(new DefaultLiteral());
}
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/Role.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/Role.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/Role.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,9 +9,9 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
- at BindingType
+ at Qualifier
@Retention(RUNTIME)
@Target( { FIELD, PARAMETER, METHOD, TYPE })
@interface Role
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,9 +2,9 @@
import javax.enterprise.event.Observes;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -18,9 +18,9 @@
import javax.enterprise.event.ObserverException;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/Tame.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/Spun.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/Spun.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/Spun.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Spun
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/NotEnabled.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/NotEnabled.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/NotEnabled.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -23,11 +23,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
- at Policy
+ at Alternative
@Target( { TYPE, METHOD })
@Retention(RUNTIME)
@interface NotEnabled
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Pomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Pomeranian.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Pomeranian.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.observer.resolve;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Named("Teddy")
class Pomeranian
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Role.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Role.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Role.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,11 +9,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { FIELD, PARAMETER, METHOD, TYPE })
@Retention(RUNTIME)
- at BindingType
+ at Qualifier
@interface Role
{
String value();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Secret.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Secret.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Secret.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Secret
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Tame.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,9 +17,9 @@
package org.jboss.jsr299.tck.tests.event.observer.runtimeException;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/Tame.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/DogAgent.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/DogAgent.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/DogAgent.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -7,21 +7,23 @@
import javax.ejb.EJBException;
import javax.ejb.Stateless;
import javax.ejb.TransactionManagement;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.inject.Named;
import javax.transaction.UserTransaction;
@Stateless
@TransactionManagement(BEAN)
@RunAs("Bubba")
@Named
+ at Default
public class DogAgent implements Agent
{
@Resource
private UserTransaction userTransaction;
- @Current
+ @Inject
private BeanManager jsr299Manager;
public void sendInTransaction(Object event)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/Pomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/Pomeranian.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/Pomeranian.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -18,7 +18,7 @@
import javax.ejb.TransactionManagement;
import javax.enterprise.context.SessionScoped;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
import javax.transaction.SystemException;
import javax.transaction.UserTransaction;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/Tame.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface 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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeA.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface BindingTypeA
{
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeB.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface BindingTypeB
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeC.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface BindingTypeC
{
public String value();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,9 +2,9 @@
import javax.enterprise.event.Observes;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,10 +2,10 @@
import javax.enterprise.event.Observes;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -5,9 +5,9 @@
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.ObserverMethod;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,10 +4,10 @@
import javax.enterprise.event.Observes;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,9 +2,9 @@
import javax.enterprise.event.Observes;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SecuritySensor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SecuritySensor.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SecuritySensor.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,8 +2,9 @@
import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
+import javax.inject.Inject;
class SecuritySensor
{
- @Any Event<SecurityEvent> securityEvent;
+ @Inject @Any Event<SecurityEvent> securityEvent;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SystemTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SystemTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SystemTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface SystemTest
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/Violent.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/Violent.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/Violent.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Violent
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/DogHouse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/DogHouse.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/DogHouse.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.extensions.annotated;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class DogHouse
{
- @Current
+ @Inject
protected Dog dog;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/Tame.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/Dog.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/Dog.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/Dog.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.extensions.annotated.broken.processInjectionTargetThrowsException;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class Dog
{
- @Current
+ @Inject
private DogBone dogBone;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -25,7 +25,7 @@
import javax.enterprise.inject.spi.Bean;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -62,7 +62,7 @@
{
Set<Bean<?>> beans = getCurrentManager().getBeans(SimpleBean.class);
assert beans.size() == 1;
- assert beans.iterator().next().getBindings().contains(new CurrentLiteral());
+ assert beans.iterator().next().getQualifiers().contains(new DefaultLiteral());
}
@Test(expectedExceptions = IllegalArgumentException.class)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/Tame.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -33,11 +33,9 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.ScopeType;
import javax.enterprise.context.SessionScoped;
import javax.enterprise.inject.AmbiguousResolutionException;
import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.BindingType;
import javax.enterprise.inject.InjectionException;
import javax.enterprise.inject.Specializes;
import javax.enterprise.inject.spi.AnnotatedType;
@@ -45,6 +43,7 @@
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.PassivationCapable;
import javax.enterprise.inject.stereotype.Stereotype;
+import javax.inject.Qualifier;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.RetentionLiteral;
@@ -115,10 +114,10 @@
// Should also check a custom bindingtype
public void testDetermineBindingType()
{
- assert getCurrentManager().isBindingType(Tame.class);
- assert !getCurrentManager().isBindingType(AnimalStereotype.class);
- assert !getCurrentManager().isBindingType(ApplicationScoped.class);
- assert !getCurrentManager().isBindingType(Transactional.class);
+ assert getCurrentManager().isQualifier(Tame.class);
+ assert !getCurrentManager().isQualifier(AnimalStereotype.class);
+ assert !getCurrentManager().isQualifier(ApplicationScoped.class);
+ assert !getCurrentManager().isQualifier(Transactional.class);
}
@Test(groups="rewrite")
@@ -126,10 +125,10 @@
@SpecAssertion(section = "11.3.14", id = "ab")
public void testDetermineScopeType()
{
- assert getCurrentManager().isScopeType(ApplicationScoped.class);
- assert !getCurrentManager().isScopeType(Tame.class);
- assert !getCurrentManager().isScopeType(AnimalStereotype.class);
- assert !getCurrentManager().isScopeType(Transactional.class);
+ assert getCurrentManager().isScope(ApplicationScoped.class);
+ assert !getCurrentManager().isScope(Tame.class);
+ assert !getCurrentManager().isScope(AnimalStereotype.class);
+ assert !getCurrentManager().isScope(Transactional.class);
}
@Test(groups="rewrite")
@@ -197,21 +196,19 @@
assert metaAnnotations.contains(new AnnotationLiteral<Target>() {});
assert metaAnnotations.contains(new AnnotationLiteral<Retention>() {});
assert metaAnnotations.contains(new AnnotationLiteral<Documented>() {});
- assert metaAnnotations.contains(new AnnotationLiteral<BindingType>() {});
+ assert metaAnnotations.contains(new AnnotationLiteral<Qualifier>() {});
}
@Test(groups = {"rewrite"})
@SpecAssertion(section = "11.3.14", id = "ag")
// Should also check a custom defined scope
- public void testGetScopeType()
+ public void testgetScope()
{
- ScopeType requestScopeType = getCurrentManager().getScopeDefinition(RequestScoped.class);
- assert requestScopeType.normal();
- assert !requestScopeType.passivating();
+ assert getCurrentManager().isNormalScope(RequestScoped.class);
+ assert !getCurrentManager().isPassivatingScope(RequestScoped.class);
- ScopeType sessionScopeType = getCurrentManager().getScopeDefinition(SessionScoped.class);
- assert sessionScopeType.normal();
- assert sessionScopeType.passivating();
+ assert getCurrentManager().isNormalScope(SessionScoped.class);
+ assert getCurrentManager().isPassivatingScope(SessionScoped.class);
}
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/CatBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/CatBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/CatBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -13,16 +13,16 @@
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.PassivationCapable;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
class CatBean implements Bean<Cat>, PassivationCapable
{
public static final CatBean bean = new CatBean();
@SuppressWarnings("serial")
- public Set<Annotation> getBindings()
+ public Set<Annotation> getQualifiers()
{
- return new HashSet<Annotation>(){{ add(new CurrentLiteral());}};
+ return new HashSet<Annotation>(){{ add(new DefaultLiteral());}};
}
public Class<? extends Annotation> getDeploymentType()
@@ -44,7 +44,7 @@
return new HashSet<Class<? extends Annotation>>();
}
- public Class<? extends Annotation> getScopeType()
+ public Class<? extends Annotation> getScope()
{
return Dependent.class;
}
@@ -70,7 +70,7 @@
return Cat.class;
}
- public boolean isPolicy()
+ public boolean isAlternative()
{
return false;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/DogHouse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/DogHouse.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/DogHouse.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.extensions.beanManager;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class DogHouse
{
- @Current
+ @Inject
private Terrier dog;
public Terrier getDog()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/InjectionPointDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/InjectionPointDecorator.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/InjectionPointDecorator.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -28,9 +28,9 @@
return injectionPoint.getBean();
}
- public Set<Annotation> getBindings()
+ public Set<Annotation> getQualifiers()
{
- return injectionPoint.getBindings();
+ return injectionPoint.getQualifiers();
}
public Member getMember()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Tame.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Terrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Terrier.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Terrier.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.extensions.beanManager;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
class Terrier extends Dog
{
- @Current
+ @Inject
private InjectionPoint injectedMetadata;
public InjectionPoint getInjectedMetadata()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at InterceptorBindingType
+ at InterceptorBinding
@interface Transactional
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/BirdCage.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/BirdCage.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/BirdCage.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.extensions.producer;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class BirdCage
{
- @Current
+ @Inject
protected Bird bird;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Cat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Cat.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Cat.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,16 +1,15 @@
package org.jboss.jsr299.tck.tests.extensions.producer;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class Cat
{
private static boolean initializerCalled;
- @Current
+ @Inject
protected CatFoodDish foodDish;
- @Initializer
+ @Inject
public Cat(LitterBox litterBox)
{
initializerCalled = true;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Dog.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Dog.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Dog.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,8 +2,7 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class Dog
@@ -16,7 +15,7 @@
public static final String DEFAULT_COLOR = "Brown";
private String color = DEFAULT_COLOR;
- @Current
+ @Inject
private DogBone dogBone;
public Dog()
@@ -29,8 +28,8 @@
this.color = color;
}
- @Initializer
- public void init(@Current DogBed dogBed)
+ @Inject
+ public void init(DogBed dogBed)
{
Dog.dogBed = dogBed;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/DogProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/DogProducer.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/DogProducer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.extensions.producer;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
@@ -13,7 +12,7 @@
private Dog quietDog = new Dog(DOG_COLOR);
@Produces @Noisy
- public Dog produceNoisyDog(@Current DogBed dogBed)
+ public Dog produceNoisyDog(DogBed dogBed)
{
noisyDogProducerCalled = true;
return new Dog();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Noisy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Noisy.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Noisy.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Noisy
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Preferred.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Preferred.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Preferred.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Preferred
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/PreferredDogProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/PreferredDogProducer.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/PreferredDogProducer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.extensions.producer;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.Specializes;
@@ -24,7 +23,7 @@
}
@Override @Produces @Noisy
- public Dog produceNoisyDog(@Current DogBed dogBed)
+ public Dog produceNoisyDog(DogBed dogBed)
{
return new Dog(DOG_COLOR);
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Quiet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Quiet.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Quiet.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Quiet
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/DefaultValidatorFactoryInjectedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/DefaultValidatorFactoryInjectedBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/DefaultValidatorFactoryInjectedBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.implementation.builtin;
import javax.ejb.Stateful;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
import javax.validation.ValidatorFactory;
/**
@@ -28,7 +28,7 @@
public class DefaultValidatorFactoryInjectedBean implements DefaultValidatorFactoryInjectedBeanLocal
{
- @Current transient ValidatorFactory defaultValidatorFactory;
+ @Inject transient ValidatorFactory defaultValidatorFactory;
public ValidatorFactory getDefaultValidatorFactory()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/DefaultValidatorInjectedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/DefaultValidatorInjectedBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/DefaultValidatorInjectedBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.implementation.builtin;
import javax.ejb.Stateful;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
import javax.validation.Validator;
/**
@@ -28,7 +28,7 @@
public class DefaultValidatorInjectedBean implements DefaultValidatorInjectedBeanLocal
{
- @Current transient Validator defaultValidator;
+ @Inject transient Validator defaultValidator;
public Validator getDefaultValidator()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/PrincipalInjectedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/PrincipalInjectedBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/PrincipalInjectedBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -20,8 +20,8 @@
import java.util.HashMap;
import javax.ejb.Stateful;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
@@ -37,7 +37,7 @@
static final String DEFAULT_JAAS_CONFIG_NAME = "default";
- @Current Instance<Principal> principal;
+ @Inject Instance<Principal> principal;
public Principal getPrincipal()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/UserTransactionInjectedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/UserTransactionInjectedBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/UserTransactionInjectedBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.implementation.builtin;
import javax.ejb.Stateful;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
import javax.transaction.UserTransaction;
/**
@@ -28,7 +28,7 @@
public class UserTransactionInjectedBean implements UserTransactionInjectedBeanLocal
{
- @Current transient UserTransaction userTransaction;
+ @Inject transient UserTransaction userTransaction;
public UserTransaction getUserTransaction()
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Deadliest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Deadliest
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -51,7 +51,7 @@
{
Bean<Tarantula> tarantula = getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next();
CreationalContext<Tarantula> creationalContext = getCurrentManager().createCreationalContext(tarantula);
- Tarantula instance = getCurrentManager().getContext(tarantula.getScopeType()).get(tarantula);
+ Tarantula instance = getCurrentManager().getContext(tarantula.getScope()).get(tarantula);
tarantula.destroy(instance, creationalContext);
assert !DisposalNonBean.isSpiderDestroyed();
}
@@ -73,7 +73,7 @@
{
Bean<Tarantula> tarantula = getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next();
CreationalContext<Tarantula> creationalContext = getCurrentManager().createCreationalContext(tarantula);
- Tarantula instance = getCurrentManager().getContext(tarantula.getScopeType()).get(tarantula);
+ Tarantula instance = getCurrentManager().getContext(tarantula.getScope()).get(tarantula);
tarantula.destroy(instance, creationalContext);
assert SpiderProducer.isDeadliestSpiderDestroyed();
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
@@ -28,7 +27,7 @@
SpiderProducer.tameSpiderDestroyed = true;
}
- public static void destroyDeadliestSpider(@Disposes @Deadliest Tarantula spider, @Current Tarantula anotherSpider)
+ public static void destroyDeadliestSpider(@Disposes @Deadliest Tarantula spider, Tarantula anotherSpider)
{
assert spider != anotherSpider;
SpiderProducer.deadliestSpiderDestroyed = true;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed;
import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
class SpiderProducer_Broken
{
@@ -13,7 +13,7 @@
return new Spider();
}
- @Initializer
+ @Inject
public static void destorySpider(@Disposes Spider spider)
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.methodOnSessionBean;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.IntegrationTest;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.multiParams;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.observesUnallowed;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithConversationScope;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithApplicationScope;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithConversationScope;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithRequestScope;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithSessionScope;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -32,7 +32,7 @@
public void testStatelessMustBeDependentScoped()
{
assert getBeans(GiraffeLocal.class).size() == 1;
- assert getBeans(GiraffeLocal.class).iterator().next().getScopeType().equals(Dependent.class);
+ assert getBeans(GiraffeLocal.class).iterator().next().getScope().equals(Dependent.class);
}
@Test(groups = { "enterpriseBeans" })
@@ -100,7 +100,7 @@
public void testBeanWithScopeAnnotation()
{
Bean<LionLocal> lionBean = getBeans(LionLocal.class).iterator().next();
- assert lionBean.getScopeType().equals(RequestScoped.class);
+ assert lionBean.getScope().equals(RequestScoped.class);
}
@Test(groups = "enterpriseBeans")
@@ -117,7 +117,7 @@
public void testBeanWithStereotype()
{
Bean<PolarBearLocal> polarBearBean = getBeans(PolarBearLocal.class).iterator().next();
- assert polarBearBean.getScopeType().equals(RequestScoped.class);
+ assert polarBearBean.getScope().equals(RequestScoped.class);
assert polarBearBean.getName().equals("polarBear");
}
@@ -127,7 +127,7 @@
{
Annotation tame = new AnnotationLiteral<Tame>(){};
Bean<ApeLocal> apeBean = getBeans(ApeLocal.class, tame).iterator().next();
- assert apeBean.getBindings().contains(tame);
+ assert apeBean.getQualifiers().contains(tame);
}
@Test(groups = "enterpriseBeans")
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -19,10 +19,10 @@
import javax.enterprise.inject.spi.Bean;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,11 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.definition;
import javax.ejb.Stateless;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
+import javax.inject.Named;
@Stateless
- at Named("Monkey")
+ at Named("Monkey") @Default
class Monkey implements MonkeyLocal
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,11 +3,12 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
+import javax.inject.Named;
@Stateful
@ApplicationScoped
- at Named
+ at Named @Default
class Pitbull extends Dog implements PitbullLocal, DogLocal, DogRemote
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,8 +9,8 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
+import javax.inject.Named;
@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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Heidelburg.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Heidelburg.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Heidelburg.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,7 +4,7 @@
import javax.annotation.PreDestroy;
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@Stateful
@Important
@@ -12,7 +12,7 @@
{
private String name;
- @Current
+ @Inject
private GrossStadt grossStadt;
@PostConstruct
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Important.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Important.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Important.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -11,7 +11,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
/**
* @author Dan Allen
@@ -19,7 +19,7 @@
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@Inherited
public @interface Important {
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -5,7 +5,7 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@Stateful
@RequestScoped
@@ -13,7 +13,7 @@
{
private String name;
- @Current
+ @Inject
private GrossStadt grossStadt;
@PostConstruct
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,13 +4,13 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@Stateful
@Dependent
public class LandgraffenSchloss implements Schloss
{
- @Current
+ @Inject
private GrossStadt biggerCity;
@PreDestroy
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,13 +2,12 @@
import javax.annotation.PostConstruct;
import javax.ejb.Stateless;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
@Stateless
public class Mainz implements AlteStadt
{
- @Current
+ @Inject
private RoemerPassage placeOfInterest;
private GutenbergMuseum anotherPlaceOfInterest;
@@ -27,8 +26,8 @@
name = placeOfInterest.getName();
}
- @Initializer
- public void initializeBean(@Current GutenbergMuseum pointOfInterest)
+ @Inject
+ public void initializeBean(GutenbergMuseum pointOfInterest)
{
this.anotherPlaceOfInterest = pointOfInterest;
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,12 +2,12 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@Stateful
public class Marburg implements UniStadt
{
- @Current
+ @Inject
private Schloss theCastle;
@Remove
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,8 +9,8 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
+import javax.inject.Named;
@Stereotype
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/ExplicitConstructorSessionBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/ExplicitConstructorSessionBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/ExplicitConstructorSessionBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,8 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
import javax.ejb.Stateless;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.New;
+import javax.inject.Inject;
import org.jboss.jsr299.tck.literals.NewLiteral;
@@ -23,8 +22,8 @@
}
};
- @Initializer
- public ExplicitConstructorSessionBean(@Current SimpleBean bean)
+ @Inject
+ public ExplicitConstructorSessionBean(SimpleBean bean)
{
constructorCalls++;
injectedSimpleBean = bean;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/InitializerSimpleBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,18 +4,20 @@
import javax.ejb.Stateful;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Initializer;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+import javax.inject.Named;
@Stateful
@SessionScoped
@Named("Charlie")
+ at Default
public class InitializerSimpleBean implements Serializable, InitializerSimpleBeanLocal
{
private static final long serialVersionUID = 1L;
private static int initializerCalls = 0;
- @Initializer
+ @Inject
public void initializer()
{
initializerCalls++;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -11,7 +11,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -36,7 +36,7 @@
Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, WrappedEnterpriseBeanLocal.NEW);
assert beans.size() == 1;
newEnterpriseBean = beans.iterator().next();
- assert Dependent.class.equals(newEnterpriseBean.getScopeType());
+ assert Dependent.class.equals(newEnterpriseBean.getScope());
}
@Test(groups = { "new" })
@@ -46,8 +46,8 @@
Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, WrappedEnterpriseBeanLocal.NEW);
assert beans.size() == 1;
newEnterpriseBean = beans.iterator().next();
- assert newEnterpriseBean.getBindings().size() == 1;
- assert newEnterpriseBean.getBindings().iterator().next().annotationType().equals(New.class);
+ assert newEnterpriseBean.getQualifiers().size() == 1;
+ assert newEnterpriseBean.getQualifiers().iterator().next().annotationType().equals(New.class);
}
@Test(groups = { "new" })
@@ -66,8 +66,8 @@
{
Bean<MonkeyLocal> monkeyBean = getBeans(MonkeyLocal.class).iterator().next();
Bean<MonkeyLocal> newMonkeyBean = getBeans(MonkeyLocal.class, MonkeyLocal.NEW).iterator().next();
- assert monkeyBean.getScopeType().equals(RequestScoped.class);
- assert newMonkeyBean.getScopeType().equals(Dependent.class);
+ assert monkeyBean.getScope().equals(RequestScoped.class);
+ assert newMonkeyBean.getScope().equals(Dependent.class);
assert monkeyBean.getName().equals("monkey");
assert newMonkeyBean.getName() == null;
}
@@ -88,26 +88,26 @@
{
Bean<OrderLocal> orderBean = getBeans(OrderLocal.class).iterator().next();
Bean<OrderLocal> newOrderBean = getBeans(OrderLocal.class, OrderLocal.NEW).iterator().next();
- assert orderBean.getBindings().size() == 2;
- assert orderBean.getBindings().contains(new CurrentLiteral());
- assert orderBean.getBindings().contains(new AnyLiteral());
+ assert orderBean.getQualifiers().size() == 2;
+ assert orderBean.getQualifiers().contains(new DefaultLiteral());
+ assert orderBean.getQualifiers().contains(new AnyLiteral());
assert getBeans(OrderLocal.class, OrderLocal.NEW).size() == 1;
- assert newOrderBean.getBindings().size() == 1;
- assert newOrderBean.getBindings().iterator().next().annotationType().equals(New.class);
+ assert newOrderBean.getQualifiers().size() == 1;
+ assert newOrderBean.getQualifiers().iterator().next().annotationType().equals(New.class);
assert orderBean.getTypes().equals(newOrderBean.getTypes());
Bean<LionLocal> lionBean = getBeans(LionLocal.class, TAME_LITERAL).iterator().next();
Bean<LionLocal> newLionBean = getBeans(LionLocal.class, LionLocal.NEW).iterator().next();
assert getBeans(LionLocal.class, TAME_LITERAL).size() == 1;
- assert lionBean.getBindings().size() == 2;
- assert lionBean.getBindings().contains(TAME_LITERAL);
- assert lionBean.getBindings().contains(new AnyLiteral());
+ assert lionBean.getQualifiers().size() == 2;
+ assert lionBean.getQualifiers().contains(TAME_LITERAL);
+ assert lionBean.getQualifiers().contains(new AnyLiteral());
assert getBeans(LionLocal.class, LionLocal.NEW).size() == 1;
- assert newLionBean.getBindings().size() == 1;
- assert newLionBean.getBindings().iterator().next().annotationType().equals(New.class);
+ assert newLionBean.getQualifiers().size() == 1;
+ assert newLionBean.getQualifiers().iterator().next().annotationType().equals(New.class);
assert lionBean.getTypes().equals(newLionBean.getTypes());
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,7 +3,7 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Named;
+import javax.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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,13 +3,14 @@
import javax.annotation.PreDestroy;
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
@Stateful
public class DependentSessionBean implements DependentSessionInterface
{
- @Current
+ @Inject
private StateKeeper stateKeeper;
@Remove
@@ -19,7 +20,7 @@
}
@Remove
- public void anotherRemoveWithParameters(String reason, @Current BeanManager manager)
+ public void anotherRemoveWithParameters(String reason, @Default BeanManager manager)
{
stateKeeper.setRemoveCalled(true);
assert manager == null;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,10 +4,10 @@
import javax.enterprise.inject.spi.Bean;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/AndalusianChicken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.initializer;
import javax.ejb.Stateless;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
@Stateless
public class AndalusianChicken implements LocalChicken
@@ -13,7 +13,7 @@
{
}
- @Initializer
+ @Inject
public void nonBusinessMethod()
{
nonBusinessMethodCalled = true;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenHutch.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.implementation.initializer;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class ChickenHutch
{
@@ -8,13 +8,13 @@
public Fox fox;
public Chicken chicken;
- @Initializer
+ @Inject
public void setFox(Fox fox)
{
this.fox = fox;
}
- @Initializer
+ @Inject
public void setChicken(Chicken chicken)
{
this.chicken = chicken;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Preferred.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,11 +9,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Retention(RUNTIME)
@Target({TYPE, METHOD, FIELD, PARAMETER})
- at BindingType
+ at Qualifier
@interface Preferred
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PremiumChickenHutch.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.implementation.initializer;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class PremiumChickenHutch
{
private ChickenInterface chicken;
- @Initializer
+ @Inject
public void setChicken(@Preferred ChickenInterface chicken)
{
this.chicken = chicken;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChickenHutch.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.implementation.initializer;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class StandardChickenHutch
{
private ChickenInterface chicken;
- @Initializer
+ @Inject
public void setChicken(@StandardVariety ChickenInterface chicken)
{
this.chicken = chicken;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardVariety.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -9,11 +9,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Retention(RUNTIME)
@Target({TYPE, METHOD, FIELD, PARAMETER})
- at BindingType
+ at Qualifier
@interface StandardVariety
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.implementation.initializer.broken.methodAnnotatedProduces;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.implementation.initializer.broken.methodAnnotatedProduces;
-import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
class Pheasant_Broken
{
- @Initializer
+ @Inject
@Produces
public void setName(String name)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/Capercaillie_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/Capercaillie_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/Capercaillie_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedDisposes;
import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class Capercaillie_Broken
{
- @Initializer
+ @Inject
public void setName(String name, @Disposes ChickenHutch chickenHutch)
{
// No-op
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedDisposes;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/Grouse_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/Grouse_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/Grouse_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,13 +1,13 @@
package org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedObserves;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class Grouse_Broken
{
- @Initializer
+ @Inject
public void setName(String name, @Observes DangerCall dangerCall)
{
// No-op
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedObserves;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/Dottrel_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.implementation.initializer.staticInitializer;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class Dottrel_Broken
{
- @Initializer
+ @Inject
public static void setName(String name)
{
// No-op
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.initializer.staticInitializer;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AsAnimal.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface AsAnimal
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.Produces;
+import javax.inject.Named;
public class BlackWidowProducer
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Foo
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class FunnelWeaverSpiderConsumer
{
- @Current
+ @Inject
private FunnelWeaver<Spider> injectedSpider;
public FunnelWeaver<Spider> getInjectedSpider()
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.producer.field.definition;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.Produces;
+import javax.inject.Named;
class OtherSpiderProducer
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Pet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Pet.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Pet.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
public @interface Pet
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -8,7 +8,7 @@
import javax.enterprise.inject.spi.Bean;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -56,9 +56,9 @@
})
public void testDefaultBindingType()
{
- Set<Bean<Tarantula>> tarantulaBeans = getBeans(Tarantula.class, new CurrentLiteral());
+ Set<Bean<Tarantula>> tarantulaBeans = getBeans(Tarantula.class);
assert tarantulaBeans.size() == 2;
- assert tarantulaBeans.iterator().next().getBindings().contains(new CurrentLiteral());
+ assert tarantulaBeans.iterator().next().getQualifiers().contains(new DefaultLiteral());
}
@Test(groups = "producerField")
@@ -126,8 +126,8 @@
Set<Bean<Tarantula>> tarantulaBeans = getBeans(Tarantula.class, TAME_LITERAL);
assert tarantulaBeans.size() == 1;
Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next();
- assert tarantulaModel.getBindings().size() == 3;
- assert tarantulaModel.getBindings().contains(TAME_LITERAL);
+ assert tarantulaModel.getQualifiers().size() == 3;
+ assert tarantulaModel.getQualifiers().contains(TAME_LITERAL);
}
@Test(groups = "producerField")
@@ -137,7 +137,7 @@
Set<Bean<Tarantula>> tarantulaBeans = getBeans(Tarantula.class, TAME_LITERAL, FOO_LITERAL);
assert !tarantulaBeans.isEmpty();
Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next();
- assert tarantulaModel.getScopeType().equals(RequestScoped.class);
+ assert tarantulaModel.getScope().equals(RequestScoped.class);
}
@Test(groups = "producerField")
@@ -181,7 +181,7 @@
Set<Bean<Tarantula>> tarantulaBeans = getBeans(Tarantula.class, STATIC_LITERAL);
assert !tarantulaBeans.isEmpty();
Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next();
- assert tarantulaModel.getScopeType().equals(RequestScoped.class);
+ assert tarantulaModel.getScope().equals(RequestScoped.class);
}
@Test(groups = "producerField")
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -26,8 +26,8 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
+import javax.inject.Named;
/**
* 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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Static.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Static
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.broken.parameterizedReturnTypeWithWildcard;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Foo.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Foo
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,7 +17,9 @@
package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
+import javax.inject.Inject;
+
/**
* This simple bean contains an injection point to receive the value of a
* producer field in another bean.
@@ -27,7 +29,7 @@
*/
public class BlackWidowConsumer
{
- @Tame
+ @Inject @Tame
private BlackWidow injectedSpider;
public BlackWidow getInjectedSpider()
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Broken
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Null.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Null
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -19,6 +19,8 @@
import java.io.Serializable;
+import javax.inject.Inject;
+
/**
* Simple bean that has an injection point for a spider
*
@@ -29,7 +31,7 @@
{
private static final long serialVersionUID = 1L;
- @Null @Broken
+ @Inject @Null @Broken
private BlackWidow injectedSpider;
public BlackWidow getInjectedSpider()
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -26,8 +26,8 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
+import javax.inject.Named;
/**
* 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/Static.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Static.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Static.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Static
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaConsumer.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaConsumer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,7 +17,9 @@
package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
+import javax.inject.Inject;
+
/**
* This bean contains an injection point for a Tarantula that must be provided
* by the container via a (static) producer field.
@@ -27,7 +29,7 @@
*/
public class StaticTarantulaConsumer
{
- @Static
+ @Inject @Static
private Tarantula consumedTarantula;
public Tarantula getConsumedTarantula()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Tame.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaConsumer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,7 +17,9 @@
package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
+import javax.inject.Inject;
+
/**
* This bean contains an injection point for a Tarantula that must be provided
* by the container via a (static) producer field.
@@ -27,7 +29,7 @@
*/
public class TarantulaConsumer
{
- @Tame
+ @Inject @Tame
private Tarantula consumedTarantula;
public Tarantula getConsumedTarantula()
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Working.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Working
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.enterprise.nonbusiness;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterAnnotatedDisposes;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterAnnotatedObserves;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Deadliest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Deadliest
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -11,7 +11,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -79,9 +79,9 @@
public void testDefaultBindingType() throws Exception
{
assert getCurrentManager().getBeans(Tarantula.class).size() == 1;
- assert getCurrentManager().getBeans(Tarantula.class).iterator().next().getBindings().size() == 2;
- assert getCurrentManager().getBeans(Tarantula.class).iterator().next().getBindings().contains(new CurrentLiteral());
- assert getCurrentManager().getBeans(Tarantula.class).iterator().next().getBindings().contains(new AnyLiteral());
+ assert getCurrentManager().getBeans(Tarantula.class).iterator().next().getQualifiers().size() == 2;
+ assert getCurrentManager().getBeans(Tarantula.class).iterator().next().getQualifiers().contains(new DefaultLiteral());
+ assert getCurrentManager().getBeans(Tarantula.class).iterator().next().getQualifiers().contains(new AnyLiteral());
}
@Test(groups = "producerMethod")
@@ -149,8 +149,8 @@
{
assert getBeans(Tarantula.class, TAME_LITERAL).size() == 1;
Bean<Tarantula> tarantula = getBeans(Tarantula.class, TAME_LITERAL).iterator().next();
- assert tarantula.getBindings().size() == 2;
- assert tarantula.getBindings().contains(TAME_LITERAL);
+ assert tarantula.getQualifiers().size() == 2;
+ assert tarantula.getQualifiers().contains(TAME_LITERAL);
}
@Test(groups = "producerMethod")
@@ -162,7 +162,7 @@
{
assert getBeans(DaddyLongLegs.class, TAME_LITERAL).size() == 1;
Bean<DaddyLongLegs> daddyLongLegs = getBeans(DaddyLongLegs.class, TAME_LITERAL).iterator().next();
- assert daddyLongLegs.getScopeType().equals(RequestScoped.class);
+ assert daddyLongLegs.getScope().equals(RequestScoped.class);
}
@Test(groups = "producerMethod")
@@ -206,7 +206,7 @@
{
assert getBeans(WolfSpider.class, TAME_LITERAL).size() == 1;
Bean<WolfSpider> wolfSpider = getBeans(WolfSpider.class, TAME_LITERAL).iterator().next();
- assert wolfSpider.getScopeType().equals(RequestScoped.class);
+ assert wolfSpider.getScope().equals(RequestScoped.class);
}
@Test
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,8 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.Produces;
+import javax.inject.Named;
class SpiderProducer
{
@@ -16,7 +15,7 @@
}
@Produces @Deadliest public Tarantula producesDeadliestTarantula(@Tame Tarantula tameTarantula,
- @Current Tarantula tarantula)
+ Tarantula tarantula)
{
return tameTarantula.getDeathsCaused() >= tarantula.getDeathsCaused() ?
tameTarantula : tarantula;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Yummy.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Yummy
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface LightYellow
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Yummy.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Yummy
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/BrownRecluse.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,12 +1,11 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.BeanManager;
class BrownRecluse
{
- public @Produces @FirstBorn SpiderEgg layAnEgg(@Current BeanManager beanManager)
+ public @Produces @FirstBorn SpiderEgg layAnEgg(BeanManager beanManager)
{
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/Delicious.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Delicious.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Delicious.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
public @interface Delicious
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Fail.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Fail.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Fail.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
public @interface Fail
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/FirstBorn.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/FirstBorn.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/FirstBorn.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
public @interface FirstBorn
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Null.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Null
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Pet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Pet.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Pet.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
public @interface Pet
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PreferredSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PreferredSpiderProducer.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PreferredSpiderProducer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.Specializes;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
@Specializes
class PreferredSpiderProducer extends SpiderProducer
{
- @Current private Web web;
+ @Inject private Web web;
private static Web injectedWeb;
private static Tarantula tarantulaCreated;
private static Tarantula tarantulaDestroyed;
@@ -32,7 +32,7 @@
return null;
}
- public void destroyTarantula(@Disposes @Pet Tarantula spider, @Current BeanManager beanManager)
+ public void destroyTarantula(@Disposes @Pet Tarantula spider, BeanManager beanManager)
{
tarantulaDestroyed = spider;
injectedWeb = web;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -109,7 +109,7 @@
Bean<PotatoChip> potatoChipBean = null;
for (Bean<PotatoChip> candidate : getBeans(PotatoChip.class))
{
- if (candidate.getScopeType().equals(RequestScoped.class))
+ if (candidate.getScope().equals(RequestScoped.class))
{
potatoChipBean = candidate;
break;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Request.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Request
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ClovenHoved.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface ClovenHoved
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Sheep.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.simple.definition;
-import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
class Sheep
{
@@ -13,7 +13,7 @@
@Produces @ClovenHoved public static Double bar = 5.5;
- @Initializer
+ @Inject
public Sheep(@ClovenHoved String foo, @ClovenHoved Double bar)
{
if (foo.equals(Sheep.foo) && bar.equals(Sheep.bar))
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Turkey.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.simple.definition;
-import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
class Turkey
{
@@ -17,7 +17,7 @@
}
- @Initializer
+ @Inject
public Turkey(String foo, Integer bar)
{
if (foo.equals(Turkey.foo) && bar.equals(Turkey.bar))
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasDisposesParameter;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasDisposesParameter;
import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class DisposingConstructor
{
- @Initializer
+ @Inject
public DisposingConstructor(@Disposes Duck duck)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasObservesParameter;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasObservesParameter;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class ObservingConstructor
{
- @Initializer
+ @Inject
public ObservingConstructor(@Observes Duck duck)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.simple.definition.dependentWithPublicField;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,16 +1,16 @@
package org.jboss.jsr299.tck.tests.implementation.simple.definition.tooManyInitializerAnnotatedConstructors;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class Goose_Broken
{
- @Initializer
+ @Inject
public Goose_Broken(String foo)
{
}
- @Initializer
+ @Inject
public Goose_Broken(String foo, Double bar)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.simple.definition.tooManyInitializerAnnotatedConstructors;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Duck.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
-import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
class Duck
@@ -15,7 +15,7 @@
public static boolean constructedCorrectly = false;
- @Initializer
+ @Inject
public Duck(String foo, @Synchronous Integer bar)
{
if (foo.equals(Duck.foo) && bar.equals(Duck.synchronousBar))
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Farm.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,7 +4,7 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class Farm
{
@@ -14,7 +14,7 @@
public int initialStaff;
public String location;
- @Current
+ @Inject
FarmOffice farmOffice;
@PostConstruct
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishPond.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,8 +2,7 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class FishPond
{
@@ -13,10 +12,10 @@
public Goose goose;
- @Current
+ @Inject
public Salmon salmon;
- @Initializer
+ @Inject
public FishPond(Goldfish goldfish, Goose goose)
{
this.goldfish = goldfish;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -7,8 +7,8 @@
import java.lang.annotation.Target;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
+import javax.inject.Named;
@Stereotype
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Goose.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Goose.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Goose.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,11 @@
package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
+import javax.inject.Inject;
+
public class Goose
{
- @Synchronous
+ @Inject @Synchronous
private Egg currentEgg;
public Egg getCurrentEgg()
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Synchronous.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Synchronous
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class TunaFarm
{
@SuppressWarnings("unused")
- @Current
+ @Inject
public Tuna tuna;
public Tuna notInjectedTuna = new Tuna();
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,8 +10,8 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
+import javax.inject.Named;
@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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/ExplicitContructorSimpleBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,13 +3,14 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
import javax.enterprise.inject.New;
+import javax.inject.Named;
import org.jboss.jsr299.tck.literals.NewLiteral;
@SessionScoped
- at Named("Fred")
+ at Named("Fred") @Default
class ExplicitContructorSimpleBean implements Serializable
{
private static final long serialVersionUID = 1L;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/InitializerSimpleBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,15 +3,15 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
import javax.enterprise.inject.New;
+import javax.inject.Inject;
+import javax.inject.Named;
import org.jboss.jsr299.tck.literals.NewLiteral;
@SessionScoped
- at Named("Charlie")
+ at Named("Charlie") @Default
class InitializerSimpleBean implements Serializable
{
@@ -28,10 +28,10 @@
private static final long serialVersionUID = 1L;
private static int initializerCalls = 0;
- @Current
+ @Inject
protected Order order;
- @Initializer
+ @Inject
public void initializer()
{
initializerCalls++;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewLionConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewLionConsumer.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewLionConsumer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,6 +17,7 @@
package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean;
import javax.enterprise.inject.New;
+import javax.inject.Inject;
/**
* @author pmuir
@@ -25,7 +26,7 @@
public class NewLionConsumer
{
- @New Lion lion;
+ @Inject @New Lion lion;
public Lion getLion()
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -12,7 +12,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -37,7 +37,7 @@
Set<Bean<ExplicitContructorSimpleBean>> beans = getBeans(ExplicitContructorSimpleBean.class, ExplicitContructorSimpleBean.NEW);
assert beans.size() == 1;
Bean<ExplicitContructorSimpleBean> newSimpleBean = beans.iterator().next();
- assert Dependent.class.equals(newSimpleBean.getScopeType());
+ assert Dependent.class.equals(newSimpleBean.getScope());
}
@Test(groups = { "new" })
@@ -47,8 +47,8 @@
Set<Bean<ExplicitContructorSimpleBean>> beans = getBeans(ExplicitContructorSimpleBean.class, ExplicitContructorSimpleBean.NEW);
assert beans.size() == 1;
Bean<ExplicitContructorSimpleBean> newSimpleBean = beans.iterator().next();
- assert newSimpleBean.getBindings().size() == 1;
- assert newSimpleBean.getBindings().iterator().next().annotationType().equals(New.class);
+ assert newSimpleBean.getQualifiers().size() == 1;
+ assert newSimpleBean.getQualifiers().iterator().next().annotationType().equals(New.class);
}
@Test(groups = { "new" })
@@ -66,10 +66,10 @@
public void testNewBeanHasNoStereotypes()
{
Bean<Fox> foxBean = getBeans(Fox.class).iterator().next();
- assert foxBean.getScopeType().equals(RequestScoped.class);
+ assert foxBean.getScope().equals(RequestScoped.class);
assert foxBean.getName().equals("fox");
Bean<Fox> newFoxBean = getBeans(Fox.class, Fox.NEW).iterator().next();
- assert newFoxBean.getScopeType().equals(Dependent.class);
+ assert newFoxBean.getScope().equals(Dependent.class);
assert newFoxBean.getName() == null;
}
@@ -123,21 +123,21 @@
public void testForEachSimpleBeanANewBeanExists()
{
assert getCurrentManager().getBeans(Order.class).size() == 1;
- assert getCurrentManager().getBeans(Order.class).iterator().next().getBindings().size() == 2;
- assert getCurrentManager().getBeans(Order.class).iterator().next().getBindings().contains(new CurrentLiteral());
+ assert getCurrentManager().getBeans(Order.class).iterator().next().getQualifiers().size() == 2;
+ assert getCurrentManager().getBeans(Order.class).iterator().next().getQualifiers().contains(new DefaultLiteral());
assert getBeans(Order.class, Order.NEW).size() == 1;
- assert getBeans(Order.class, Order.NEW).iterator().next().getBindings().size() == 1;
- assert getBeans(Order.class, Order.NEW).iterator().next().getBindings().iterator().next().annotationType().equals(New.class);
+ assert getBeans(Order.class, Order.NEW).iterator().next().getQualifiers().size() == 1;
+ assert getBeans(Order.class, Order.NEW).iterator().next().getQualifiers().iterator().next().annotationType().equals(New.class);
assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).size() == 1;
- assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).iterator().next().getBindings().size() == 2;
- assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).iterator().next().getBindings().contains(TAME_LITERAL);
- assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).iterator().next().getBindings().contains(new AnyLiteral());
+ assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).iterator().next().getQualifiers().size() == 2;
+ assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).iterator().next().getQualifiers().contains(TAME_LITERAL);
+ assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).iterator().next().getQualifiers().contains(new AnyLiteral());
assert getBeans(Lion.class, Lion.NEW).size() == 1;
- assert getBeans(Lion.class, Lion.NEW).iterator().next().getBindings().size() == 1;
- assert getBeans(Lion.class, Lion.NEW).iterator().next().getBindings().iterator().next().annotationType().equals(New.class);
+ assert getBeans(Lion.class, Lion.NEW).iterator().next().getQualifiers().size() == 1;
+ assert getBeans(Lion.class, Lion.NEW).iterator().next().getQualifiers().iterator().next().annotationType().equals(New.class);
}
@Test(groups = { "new" })
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Bean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Bean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Bean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -6,7 +6,7 @@
import javax.ejb.Stateful;
import javax.ejb.TransactionManagement;
import javax.ejb.TransactionManagementType;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
import javax.transaction.SystemException;
import javax.transaction.UserTransaction;
@@ -17,7 +17,7 @@
{
private int knocks = 0;
- private @Current Monitor monitor;
+ private @Inject Monitor monitor;
private @Resource UserTransaction transaction;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanLocal.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanLocal.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,6 @@
package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb;
import javax.ejb.Local;
-import javax.ejb.Remote;
@Local
public interface BeanLocal extends AnotherInterface
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Lazy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Lazy.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Lazy.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Lazy
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ManagedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ManagedBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ManagedBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,12 @@
package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb;
+import javax.inject.Inject;
+
class ManagedBean
{
- private @Lazy BeanLocal myEjb;
+ @Inject @Lazy
+ private BeanLocal myEjb;
public BeanLocal getMyEjb()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/Greeting.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/Greeting.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/Greeting.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
public @interface Greeting
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/GreetingBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/GreetingBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/GreetingBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,11 @@
package org.jboss.jsr299.tck.tests.implementation.simple.resource.env;
+import javax.inject.Inject;
+
class GreetingBean
{
- private @Greeting String phrase;
+ @Inject @Greeting
+ private String phrase;
public String greet()
{
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/Database.java (from rev 3616, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/Default.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/Database.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/Database.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+public @interface Database
+{
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/Default.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/Default.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/Default.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.BindingType;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at BindingType
-public @interface Default
-{
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,13 +1,16 @@
package org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext;
+import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
class ManagedBean
{
- private @Default EntityManager persistenceContext;
+ @Inject @Database
+ private EntityManager persistenceContext;
- private @Default EntityManagerFactory persistenceUnit;
+ @Inject @Database
+ private EntityManagerFactory persistenceUnit;
public EntityManager getPersistenceContext()
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -65,11 +65,11 @@
})
public void testBeanTypesAndBindingTypesOfPersistenceContext()
{
- Bean<EntityManager> managedBeanBean = getBeans(EntityManager.class, new AnnotationLiteral<Default>() {}).iterator().next();
+ Bean<EntityManager> managedBeanBean = getBeans(EntityManager.class, new AnnotationLiteral<Database>() {}).iterator().next();
assert managedBeanBean.getTypes().size() == 2;
assert managedBeanBean.getTypes().contains(Object.class);
assert managedBeanBean.getTypes().contains(EntityManager.class);
- assert managedBeanBean.getBindings().size() == 2;
- assert annotationSetMatches(managedBeanBean.getBindings(), Any.class, Default.class);
+ assert managedBeanBean.getQualifiers().size() == 2;
+ assert annotationSetMatches(managedBeanBean.getQualifiers(), Any.class, Database.class);
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ResourceProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ResourceProducer.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ResourceProducer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -8,9 +8,11 @@
class ResourceProducer
{
- private @Produces @Default @PersistenceUnit EntityManagerFactory persistenceUnit;
+ @Produces @Database @PersistenceUnit
+ private EntityManagerFactory persistenceUnit;
- private @Produces @Default @PersistenceContext EntityManager persistenceContext;
+ @Produces @Database @PersistenceContext
+ private EntityManager persistenceContext;
/**
* @return the persistenceContext
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/Another.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Another
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ManagedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ManagedBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ManagedBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,12 @@
package org.jboss.jsr299.tck.tests.implementation.simple.resource.resource;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
class ManagedBean
{
- private @Another BeanManager beanManager;
+ @Inject @Another
+ private BeanManager beanManager;
public BeanManager getBeanManager()
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -5,6 +5,7 @@
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.spi.Bean;
+import javax.inject.Named;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
@@ -35,8 +36,8 @@
assert getCurrentManager().getBeans(LazyFarmerLocal.class, LANDOWNER_LITERAL).size() == 1;
Bean<LazyFarmerLocal> bean = getBeans(LazyFarmerLocal.class, LANDOWNER_LITERAL).iterator().next();
assert getCurrentManager().getBeans(LazyFarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(FarmerLocal.class);
- assert getCurrentManager().getBeans(LazyFarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 3;
- assert annotationSetMatches( getCurrentManager().getBeans(LazyFarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class, Any.class);
+ assert getCurrentManager().getBeans(LazyFarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getQualifiers().size() == 4;
+ assert annotationSetMatches( getCurrentManager().getBeans(LazyFarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getQualifiers(), Landowner.class, Lazy.class, Any.class, Named.class);
}
@Test
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise;
-import javax.enterprise.inject.Named;
+import javax.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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Farmer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise;
import javax.ejb.Stateful;
-import javax.enterprise.inject.Named;
+import javax.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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Landowner.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Landowner
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Lazy.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Lazy
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Yard.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise;
import javax.ejb.Stateful;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Named("backyard")
@Stateful
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsNothing;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsSimpleBean;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/FarmEquipment.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/FarmEquipment.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/FarmEquipment.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsSimpleBean;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Named("plough")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.implementInterfaceAndExtendsNothing;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/FarmYard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/FarmYard_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/FarmYard_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.sameName;
import javax.ejb.Stateful;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.Specializes;
+import javax.inject.Named;
@Specializes
@Stateful
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/Yard.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/Yard.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/Yard.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.sameName;
import javax.ejb.Stateful;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Named("backyard")
@Stateful
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/Farmer.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/Farmer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean;
import javax.ejb.Stateful;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Landowner
@Named
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/Landowner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/Landowner.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/Landowner.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Landowner
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean;
-import org.jboss.test.audit.annotations.SpecAssertion;
-import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two.TwoSpecializingBeansForOneSpecializedTest;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Expensive.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Expensive
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,6 +4,7 @@
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Any;
+import javax.inject.Named;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
@@ -30,8 +31,8 @@
public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
{
assert getCurrentManager().getBeans(Necklace.class, EXPENSIVE_LITERAL, SPARKLY_LITERAL).size() == 1;
- assert getCurrentManager().getBeans(Necklace.class, EXPENSIVE_LITERAL, SPARKLY_LITERAL).iterator().next().getBindings().size() == 3;
- assert annotationSetMatches( getCurrentManager().getBeans(Necklace.class, EXPENSIVE_LITERAL, SPARKLY_LITERAL).iterator().next().getBindings(), Expensive.class, Sparkly.class, Any.class);
+ assert getCurrentManager().getBeans(Necklace.class, EXPENSIVE_LITERAL, SPARKLY_LITERAL).iterator().next().getQualifiers().size() == 4;
+ assert annotationSetMatches( getCurrentManager().getBeans(Necklace.class, EXPENSIVE_LITERAL, SPARKLY_LITERAL).iterator().next().getQualifiers(), Expensive.class, Sparkly.class, Any.class, Named.class);
assert getBeans(Necklace.class, new AnnotationLiteral<Sparkly>(){}).size() == 1;
assert getBeans(Necklace.class, new AnnotationLiteral<Sparkly>(){}).iterator().next().getName().equals("expensiveGift");
Product product = getInstanceByType(Product.class,EXPENSIVE_LITERAL, SPARKLY_LITERAL);
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Shop.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.Produces;
+import javax.inject.Named;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Sparkly.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Sparkly
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Expensive.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Expensive.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Expensive.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Expensive
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Shop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Shop.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/Shop.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.Produces;
+import javax.inject.Named;
class Shop
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Expensive.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Expensive.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Expensive.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Expensive
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Shop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Shop.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/Shop.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializesStaticMethod;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.Produces;
+import javax.inject.Named;
class Shop
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializesStaticMethod;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializingAndSpecializedBeanHaveName;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.Specializes;
+import javax.inject.Named;
class HighSchool_Broken extends School
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/School.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/School.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/School.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializingAndSpecializedBeanHaveName;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.Produces;
+import javax.inject.Named;
class School
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Expensive.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Expensive.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Expensive.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Expensive
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Shop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Shop.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/Shop.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.Produces;
+import javax.inject.Named;
class Shop
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean;
-import org.jboss.test.audit.annotations.SpecAssertion;
-import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two.TwoSpecializingBeansForOneSpecializedTest;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Farmer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple;
-import javax.enterprise.inject.Named;
+import javax.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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Landowner.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Landowner
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Lazy.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Lazy
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -5,11 +5,12 @@
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.spi.Bean;
+import javax.inject.Named;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
@@ -37,8 +38,8 @@
assert getBeans(LazyFarmer.class, LANDOWNER_LITERAL).size() == 1;
Bean<?> bean = getBeans(LazyFarmer.class, LANDOWNER_LITERAL).iterator().next();
assert bean.getTypes().contains(Farmer.class);
- assert bean.getBindings().size() == 3;
- assert annotationSetMatches(bean.getBindings(), Landowner.class, Lazy.class, Any.class);
+ assert bean.getQualifiers().size() == 4;
+ assert annotationSetMatches(bean.getQualifiers(), Landowner.class, Lazy.class, Any.class, Named.class);
}
@Test
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb;
import javax.ejb.Stateful;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Named("plough")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names;
-import javax.enterprise.inject.Named;
import javax.enterprise.inject.Specializes;
+import javax.inject.Named;
@Specializes
@Named
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/Yard.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Named("backyard")
class Yard
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Farmer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Landowner
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Landowner.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Landowner
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two;
-import org.jboss.test.audit.annotations.SpecAssertion;
-import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean.TwoBeansSpecializeTheSameBeanTest;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,13 +10,13 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
@MissileBinding
- at InterceptorBindingType
+ at InterceptorBinding
@interface Atomic
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -230,7 +230,7 @@
public void testStereotypeInterceptorBindings()
{
Bean<SecureTransaction> bean = getBeans(SecureTransaction.class).iterator().next();
- assert bean.getBindings().contains(Logged.class);
+ assert bean.getQualifiers().contains(Logged.class);
}
@Test(groups = "ri-broken")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Logged.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Logged.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Logged.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -8,12 +8,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Target( { TYPE, METHOD })
@Retention(RUNTIME)
@Documented
- at InterceptorBindingType
+ at InterceptorBinding
@interface Logged
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Missile.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Missile.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Missile.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,12 +1,11 @@
package org.jboss.jsr299.tck.tests.interceptors.definition;
-import javax.enterprise.inject.Initializer;
-import javax.interceptor.Interceptors;
+import javax.inject.Inject;
@MissileBinding
class Missile
{
- @Initializer
+ @Inject
public void init() { }
public void fire() { }
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileBinding.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileBinding.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at InterceptorBindingType
+ at InterceptorBinding
@interface MissileBinding
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Secure.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Secure.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Secure.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at InterceptorBindingType
+ at InterceptorBinding
@interface Secure
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Transactional.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Transactional.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Transactional.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at InterceptorBindingType
+ at InterceptorBinding
@interface Transactional
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/FooBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/FooBinding.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/FooBinding.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at InterceptorBindingType
+ at InterceptorBinding
@interface FooBinding
{
String value();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/Foo.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/Foo.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/Foo.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.broken.invalidLifecycleInterceptor;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class Foo
{
- @Transactional @Initializer void init()
+ @Transactional @Inject void init()
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/Transactional.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/Transactional.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/Transactional.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -8,12 +8,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Target( { TYPE, METHOD })
@Retention(RUNTIME)
@Documented
- at InterceptorBindingType
+ at InterceptorBinding
@interface Transactional
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at InterceptorBindingType
+ at InterceptorBinding
@interface Transactional
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at InterceptorBindingType
+ at InterceptorBinding
@interface Transactional
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Deadly.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Deadly.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Deadly.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Deadly
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Fast.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Fast.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Fast.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Fast
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Slow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Slow.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Slow.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Slow
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.binding.members.annotation;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/Expensive_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/Expensive_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/Expensive_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -25,9 +25,9 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
- at BindingType
+ at Qualifier
@Retention(RUNTIME)
@Target( { METHOD, FIELD, PARAMETER, TYPE })
@interface Expensive_Broken
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.binding.members.array;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/Expensive_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/Expensive_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/Expensive_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,18 +16,18 @@
*/
package org.jboss.jsr299.tck.tests.lookup.binding.members.array;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.BindingType;
-
+import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
- at BindingType
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Qualifier
@Retention(RUNTIME)
@Target( { METHOD, FIELD, PARAMETER, TYPE })
@interface Expensive_Broken {
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Cod.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.lookup.byname;
-import javax.enterprise.inject.Named;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
+import javax.inject.Named;
@Named("whitefish")
- at Policy
+ at Alternative
class Cod implements Animal
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.lookup.byname;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Named("whitefish")
@Whitefish
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Salmon.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.lookup.byname;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Named("fish")
class Salmon implements Animal
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Sole.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.lookup.byname;
-import javax.enterprise.inject.Named;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
+import javax.inject.Named;
@Named("fish")
- at Policy
+ at Alternative
class Sole implements Animal
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Whitefish.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Whitefish
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Cod.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Named("whitefish")
class Cod
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Sole.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Named("whitefish")
class Sole
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/Example.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/Example.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/Example.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.byname.duplicatePrefixResolution;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Named("example")
class Example
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/ExampleWebsite_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/ExampleWebsite_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/ExampleWebsite_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.byname.duplicatePrefixResolution;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Named("example.com")
class ExampleWebsite_Broken
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Air.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Air.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Air.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.lookup.circular;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
@ApplicationScoped
class Air
@@ -12,7 +12,7 @@
}
- @Initializer
+ @Inject
public Air(Bird bird)
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Bird.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Bird.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Bird.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.lookup.circular;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
@ApplicationScoped
@SuppressWarnings("unused")
@@ -15,7 +15,7 @@
}
- @Initializer
+ @Inject
public Bird(Air air)
{
this.air = air;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Car.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Car.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Car.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,14 +1,14 @@
package org.jboss.jsr299.tck.tests.lookup.circular;
import javax.annotation.PostConstruct;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class Car
{
public static boolean success;
- @Current Petrol petrol;
+ @Inject Petrol petrol;
public Car()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,9 +16,9 @@
*/
package org.jboss.jsr299.tck.tests.lookup.circular;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Food.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Food.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Food.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,7 +2,7 @@
import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@ApplicationScoped
class Food
@@ -10,7 +10,7 @@
public static boolean success;
- @Current Pig pig;
+ @Inject Pig pig;
public Food()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/House.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/House.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/House.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.lookup.circular;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
@ApplicationScoped
class House
@@ -10,7 +10,7 @@
// For serialization
public House() {}
- @Initializer
+ @Inject
public House(House house)
{
house.ping();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Petrol.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Petrol.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Petrol.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,7 +2,7 @@
import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@ApplicationScoped
class Petrol
@@ -10,7 +10,7 @@
public static boolean success;
- @Current Car car;
+ @Inject Car car;
public Petrol()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Pig.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Pig.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Pig.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,7 +2,7 @@
import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@ApplicationScoped
class Pig
@@ -10,7 +10,7 @@
public static boolean success;
- @Current Food food;
+ @Inject Food food;
public Pig()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Planet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Planet.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Planet.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.lookup.circular;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
@SuppressWarnings("unused")
class Planet
@@ -8,7 +8,7 @@
private Space space;
- @Initializer
+ @Inject
public Planet(Space space)
{
this.space = space;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/SelfConsumingDependent1.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/SelfConsumingDependent1.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/SelfConsumingDependent1.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface SelfConsumingDependent1
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/SelfConsumingNormal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/SelfConsumingNormal.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/SelfConsumingNormal.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface SelfConsumingNormal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/SelfConsumingNormal1.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/SelfConsumingNormal1.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/SelfConsumingNormal1.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface SelfConsumingNormal1
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Space.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Space.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Space.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.lookup.circular;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
@ApplicationScoped
class Space
@@ -10,7 +10,7 @@
// For serialization
public Space() {}
- @Initializer
+ @Inject
public Space(Planet planet)
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.array;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/InjectionPointBean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/InjectionPointBean_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/InjectionPointBean_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,9 +16,9 @@
*/
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.array;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
public class InjectionPointBean_Broken
{
- @Current String[] array;
+ @Inject String[] array;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalClass;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FishFarm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FishFarm.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FishFarm.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,11 +16,11 @@
*/
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalClass;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class FishFarm
{
- @Current Tuna_Broken tuna;
+ @Inject Tuna_Broken tuna;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalMethod;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FishFarm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FishFarm.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FishFarm.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,9 +16,9 @@
*/
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalMethod;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class FishFarm
{
- @Current Tuna_Broken tuna;
+ @Inject Tuna_Broken tuna;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/Number_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/Number_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/Number_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,12 +16,12 @@
*/
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.primitive;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class Number_Broken
{
@SuppressWarnings("unused")
- @Current private int number;
+ @Inject private int number;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.primitive;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/InjectionPointBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/InjectionPointBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/InjectionPointBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,9 +16,9 @@
*/
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.privateConstructor;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class InjectionPointBean
{
- @Current Unproxyable_Broken foo;
+ @Inject Unproxyable_Broken foo;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.privateConstructor;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.dependency.resolution.broken.ambiguous;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/Farm_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/Farm_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/Farm_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,11 +16,11 @@
*/
package org.jboss.jsr299.tck.tests.lookup.dependency.resolution.broken.ambiguous;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class Farm_Broken
{
@SuppressWarnings("unused")
- @Current private Animal animal;
+ @Inject private Animal animal;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Bean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Bean_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Bean_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,13 +16,13 @@
*/
package org.jboss.jsr299.tck.tests.lookup.dependency.resolution.broken.unsatisfied;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@SuppressWarnings("unused")
class Bean_Broken
{
- @Small
+ @Inject @Small
private Vanilla vanilla;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Small.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Small.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Small.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -25,11 +25,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
- at BindingType
+ at Qualifier
@interface Small
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.dependency.resolution.broken.unsatisfied;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -26,7 +26,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -58,7 +58,7 @@
public void testDuplicateBindingsThrowsException()
{
ObtainsInstanceBean injectionPoint = getInstanceByType(ObtainsInstanceBean.class);
- injectionPoint.getAnyPaymentProcessor().select(new CurrentLiteral(), new CurrentLiteral());
+ injectionPoint.getAnyPaymentProcessor().select(new DefaultLiteral(), new DefaultLiteral());
}
@Test(expectedExceptions = IllegalArgumentException.class)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,11 +4,12 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
class ObtainsInstanceBean
{
- @PayBy(CHEQUE) Instance<AsynchronousPaymentProcessor> paymentProcessor;
- @Any Instance<PaymentProcessor> anyPaymentProcessor;
+ @Inject @PayBy(CHEQUE) Instance<AsynchronousPaymentProcessor> paymentProcessor;
+ @Inject @Any Instance<PaymentProcessor> anyPaymentProcessor;
public Instance<AsynchronousPaymentProcessor> getPaymentProcessor()
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayBy.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface PayBy
{
public static enum PaymentMethod { CASH, CHEQUE, CREDIT_CARD };
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -21,10 +21,10 @@
import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.Bean;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
@@ -39,7 +39,7 @@
@SpecAssertion(section = "5.7.2", id = "d")
public void testScopeOfBuiltinInstance() {
Bean<Instance<Cow>> bean = getBeans(new TypeLiteral<Instance<Cow>>() {}).iterator().next();
- assert Dependent.class.equals(bean.getScopeType());
+ assert Dependent.class.equals(bean.getScope());
}
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/Farm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/Farm.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/Farm.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.lookup.dynamic.builtin;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
class Farm extends AbstractAnimal
{
- @Current
+ @Inject
private Instance<Animal> animal;
- @Current
+ @Inject
private Instance<AbstractAnimal> abstractAnimal;
- @Current
+ @Inject
private Instance<Cow> cow;
public Instance<Animal> getAnimal()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Game.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Game.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Game.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.lookup.el;
-import javax.enterprise.inject.Initializer;
-import javax.enterprise.inject.Named;
+import javax.inject.Inject;
+import javax.inject.Named;
@Named
public class Game
{
- @Initializer
+ @Inject
public void initialize(Counter counter) {
counter.add();
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Salmon.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Salmon.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Salmon.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +1,12 @@
package org.jboss.jsr299.tck.tests.lookup.el;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
+import javax.inject.Named;
- at Named
+ at Named @Default
@RequestScoped
-class Salmon
+public class Salmon
{
private int age = 0;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/TunaFarm.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,14 +1,14 @@
package org.jboss.jsr299.tck.tests.lookup.el;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Named;
+import javax.inject.Inject;
+import javax.inject.Named;
@Named
class TunaFarm
{
@SuppressWarnings("unused")
- @Current
+ @Inject
public Tuna tuna;
public Tuna notInjectedTuna = new Tuna();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/Sheep.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/Sheep.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/Sheep.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.lookup.el.integration;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Named
public class Sheep
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/FoxRun.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,14 +1,14 @@
package org.jboss.jsr299.tck.tests.lookup.injection;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class FoxRun
{
- @Current
+ @Inject
public Fox fox;
- @Current
+ @Inject
public Fox anotherFox;
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/HenHouse.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.lookup.injection;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
public class HenHouse
{
- @Current
+ @Inject
public Fox fox;
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderNest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,13 +1,13 @@
package org.jboss.jsr299.tck.tests.lookup.injection;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
class SpiderNest
{
public Integer numberOfSpiders;
- @Initializer
+ @Inject
public SpiderNest(Integer numberOfSpiders)
{
this.numberOfSpiders = numberOfSpiders;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/TunaFarm.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.lookup.injection;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class TunaFarm
{
@SuppressWarnings("unused")
- @Current
+ @Inject
public Tuna tuna;
public Tuna notInjectedTuna = new Tuna();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/any/Customer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/any/Customer.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/any/Customer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,9 @@
package org.jboss.jsr299.tck.tests.lookup.injection.any;
import javax.enterprise.inject.Any;
+import javax.inject.Inject;
class Customer
{
- @Any Drink drink;
+ @Inject @Any Drink drink;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Farm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Farm.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Farm.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,13 +2,13 @@
import javax.annotation.PostConstruct;
import javax.ejb.Stateless;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
import javax.interceptor.Interceptors;
@Stateless
public class Farm implements FarmLocal
{
- @Current private Sheep sheep;
+ @Inject private Sheep sheep;
private boolean injectionPerformedCorrectly = false;
@Interceptors(FarmInterceptor.class)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/FarmInterceptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/FarmInterceptor.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/FarmInterceptor.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,13 +1,13 @@
package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
public class FarmInterceptor
{
- @Current
+ @Inject
private Sheep sheep;
@AroundInvoke
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/HenHouse.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
public class HenHouse
{
- @Current
+ @Inject
public Fox fox;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/Farm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/Farm.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/Farm.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,11 +16,12 @@
*/
package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
+
public class Farm
{
- @Current
+ @Inject
private Sheep sheep;
public boolean isSheepInjected() {
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TagLibraryListener.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TagLibraryListener.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TagLibraryListener.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
public class TagLibraryListener implements ServletContextListener
{
- @Current
+ @Inject
private Sheep sheep;
public void contextDestroyed(ServletContextEvent sce)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestFilter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestFilter.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestFilter.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,7 +2,7 @@
import java.io.IOException;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -14,7 +14,7 @@
public class TestFilter implements Filter
{
- @Current
+ @Inject
private Sheep sheep;
private boolean injectionPerformedCorrectly = false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestListener.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestListener.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestListener.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
public class TestListener implements ServletContextListener
{
- @Current
+ @Inject
private Sheep sheep;
public void contextDestroyed(ServletContextEvent sce)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestServlet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestServlet.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestServlet.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,7 +2,7 @@
import java.io.IOException;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -11,7 +11,7 @@
public class TestServlet extends HttpServlet
{
- @Current
+ @Inject
private Sheep sheep;
private boolean injectionPerformedCorrectly = false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestTagHandler.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestTagHandler.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestTagHandler.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,7 +2,7 @@
import java.io.IOException;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.SimpleTagSupport;
@@ -12,7 +12,7 @@
public static final String SUCCESS = "It works.";
public static final String FAILURE = "It is broken.";
- @Current
+ @Inject
private Sheep sheep;
@Override
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPoint.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPoint.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPoint.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,13 +1,13 @@
package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
import javax.jws.WebMethod;
import javax.jws.WebService;
@WebService(name="SheepWS")
public class SheepWSEndPoint
{
- @Current
+ @Inject
private Sheep sheep;
@WebMethod
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPointService.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPointService.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPointService.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -4,6 +4,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.logging.Logger;
+
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouse_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.lookup.injection.nullableBean;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class FarmHouse_Broken
{
- @Current
+ @Inject
public int noOfBedrooms;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.lookup.injection.nullableBean;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,8 +16,8 @@
*/
package org.jboss.jsr299.tck.tests.lookup.injectionpoint;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
/**
* Test bean with injection point on the constructor of the bean
@@ -27,7 +27,7 @@
*/
class BeanWithInjectionPointMetadata
{
- @Current
+ @Inject
private InjectionPoint injectedMetadata;
public InjectionPoint getInjectedMetadata()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cat.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cat.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,14 +1,14 @@
package org.jboss.jsr299.tck.tests.lookup.injectionpoint;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
class Cat
{
- @Current private InjectionPoint injectionPoint;
+ @Inject private InjectionPoint injectionPoint;
- @Current private BeanManager beanManager;
+ @Inject private BeanManager beanManager;
public String hello() {
return "hello";
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,8 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.lookup.injectionpoint;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
/**
* Test bean to inject a bean using injection point metadata into a constructor
@@ -29,8 +28,8 @@
{
private BeanWithInjectionPointMetadata injectedBean;
- @Initializer
- public ConstructorInjectionPointBean(@Current BeanWithInjectionPointMetadata injectedBean)
+ @Inject
+ public ConstructorInjectionPointBean(BeanWithInjectionPointMetadata injectedBean)
{
this.injectedBean = injectedBean;
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -18,7 +18,7 @@
package org.jboss.jsr299.tck.tests.lookup.injectionpoint;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
/**
* Test bean to inject another bean which uses injection point metadata in a
@@ -30,7 +30,7 @@
@RequestScoped
class FieldInjectionPointBean
{
- @Current @AnimalStereotype
+ @Inject @AnimalStereotype
private BeanWithInjectionPointMetadata injectedBean;
public BeanWithInjectionPointMetadata getInjectedBean()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -22,7 +22,7 @@
import javax.enterprise.inject.spi.InjectionPoint;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -52,7 +52,7 @@
public void testGetInjectableReferenceOnBeanManager()
{
// Get an instance of the bean which has another bean injected into it
- FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class,new CurrentLiteral());
+ FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class);
BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
InjectionPoint ip = beanWithInjectionPoint.getInjectedMetadata();
assert ip != null;
@@ -74,7 +74,7 @@
InjectionPoint loggerInjectionPoint = null;
for (InjectionPoint ip : bean.getInjectionPoints())
{
- if (ip.getAnnotated().getTypeClosure().contains(Logger.class) && ip.getBindings().size() == 1 && ip.getBindings().contains(new CurrentLiteral()))
+ if (ip.getAnnotated().getTypeClosure().contains(Logger.class) && ip.getQualifiers().size() == 1 && ip.getQualifiers().contains(new DefaultLiteral()))
{
loggerInjectionPoint = ip;
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -23,14 +23,14 @@
import java.util.Set;
import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.AnnotatedField;
import javax.enterprise.inject.spi.AnnotatedParameter;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionPoint;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -59,7 +59,7 @@
{
// Get an instance of the bean which has another bean injected into it
- FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class,new CurrentLiteral());
+ FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class);
BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
assert beanWithInjectionPoint.getInjectedMetadata() != null;
@@ -73,7 +73,7 @@
public void testGetType()
{
// Get an instance of the bean which has another bean injected into it
- FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class,new CurrentLiteral());
+ FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class);
BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
assert beanWithInjectionPoint.getInjectedMetadata() != null;
assert beanWithInjectionPoint.getInjectedMetadata().getType().equals(BeanWithInjectionPointMetadata.class);
@@ -84,12 +84,12 @@
public void testGetBindingTypes()
{
// Get an instance of the bean which has another bean injected into it
- FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class,new CurrentLiteral());
+ FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class);
BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
assert beanWithInjectionPoint.getInjectedMetadata() != null;
- Set<Annotation> bindingTypes = beanWithInjectionPoint.getInjectedMetadata().getBindings();
+ Set<Annotation> bindingTypes = beanWithInjectionPoint.getInjectedMetadata().getQualifiers();
assert bindingTypes.size() == 1;
- assert Current.class.isAssignableFrom(bindingTypes.iterator().next().annotationType());
+ assert Default.class.isAssignableFrom(bindingTypes.iterator().next().annotationType());
}
@Test(groups = { "injectionPoint" })
@@ -97,7 +97,7 @@
public void testGetMemberField()
{
// Get an instance of the bean which has another bean injected into it
- FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class,new CurrentLiteral());
+ FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class);
BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
assert beanWithInjectionPoint.getInjectedMetadata() != null;
assert Field.class.isAssignableFrom(beanWithInjectionPoint.getInjectedMetadata().getMember().getClass());
@@ -108,7 +108,7 @@
public void testGetMemberMethod()
{
// Get an instance of the bean which has another bean injected into it
- MethodInjectionPointBean beanWithInjectedBean = getInstanceByType(MethodInjectionPointBean.class,new CurrentLiteral());
+ MethodInjectionPointBean beanWithInjectedBean = getInstanceByType(MethodInjectionPointBean.class);
BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
assert beanWithInjectionPoint.getInjectedMetadata() != null;
assert Method.class.isAssignableFrom(beanWithInjectionPoint.getInjectedMetadata().getMember().getClass());
@@ -116,7 +116,7 @@
// Since the type and bindings must correspond to the parameter, check
// them
assert beanWithInjectionPoint.getInjectedMetadata().getType().equals(BeanWithInjectionPointMetadata.class);
- assert beanWithInjectionPoint.getInjectedMetadata().getBindings().contains(new CurrentLiteral());
+ assert beanWithInjectionPoint.getInjectedMetadata().getQualifiers().contains(new DefaultLiteral());
}
@Test(groups = { "injectionPoint" })
@@ -124,7 +124,7 @@
public void testGetMemberConstructor()
{
// Get an instance of the bean which has another bean injected into it
- ConstructorInjectionPointBean beanWithInjectedBean = getInstanceByType(ConstructorInjectionPointBean.class,new CurrentLiteral());
+ ConstructorInjectionPointBean beanWithInjectedBean = getInstanceByType(ConstructorInjectionPointBean.class);
BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
assert beanWithInjectionPoint.getInjectedMetadata() != null;
assert Constructor.class.isAssignableFrom(beanWithInjectionPoint.getInjectedMetadata().getMember().getClass());
@@ -132,7 +132,7 @@
// Since the type and bindings must correspond to the parameter, check
// them
assert beanWithInjectionPoint.getInjectedMetadata().getType().equals(BeanWithInjectionPointMetadata.class);
- assert beanWithInjectionPoint.getInjectedMetadata().getBindings().contains(new CurrentLiteral());
+ assert beanWithInjectionPoint.getInjectedMetadata().getQualifiers().contains(new DefaultLiteral());
}
@Test(groups = { "injectionPoint" })
@@ -140,7 +140,7 @@
public void testGetAnnotatedField()
{
// Get an instance of the bean which has another bean injected into it
- FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class,new CurrentLiteral());
+ FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class);
BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
assert beanWithInjectionPoint.getInjectedMetadata() != null;
assert beanWithInjectionPoint.getInjectedMetadata().getAnnotated() instanceof AnnotatedField;
@@ -152,11 +152,11 @@
public void testGetAnnotatedParameter()
{
// Get an instance of the bean which has another bean injected into it
- MethodInjectionPointBean beanWithInjectedBean = getInstanceByType(MethodInjectionPointBean.class,new CurrentLiteral());
+ MethodInjectionPointBean beanWithInjectedBean = getInstanceByType(MethodInjectionPointBean.class);
BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
assert beanWithInjectionPoint.getInjectedMetadata() != null;
assert beanWithInjectionPoint.getInjectedMetadata().getAnnotated() instanceof AnnotatedParameter;
- assert beanWithInjectionPoint.getInjectedMetadata().getAnnotated().isAnnotationPresent(Current.class);
+ assert annotationSetMatches(beanWithInjectionPoint.getInjectedMetadata().getQualifiers(), Default.class);
}
@Test(groups = { "injectionPoint" })
@@ -164,7 +164,7 @@
public void testDependentScope()
{
assert getBeans(InjectionPoint.class).size() == 1;
- assert getBeans(InjectionPoint.class).iterator().next().getScopeType().equals(Dependent.class);
+ assert getBeans(InjectionPoint.class).iterator().next().getScope().equals(Dependent.class);
}
@Test(groups = { "injectionPoint" })
@@ -174,7 +174,7 @@
public void testApiTypeInjectionPoint()
{
// Get an instance of the bean which has another bean injected into it
- FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class,new CurrentLiteral());
+ FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class);
BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
assert beanWithInjectionPoint.getInjectedMetadata() != null;
assert InjectionPoint.class.isAssignableFrom(beanWithInjectionPoint.getInjectedMetadata().getClass());
@@ -187,18 +187,18 @@
public void testCurrentBinding()
{
// Get an instance of the bean which has another bean injected into it
- FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class,new CurrentLiteral());
+ FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class);
BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
assert beanWithInjectionPoint.getInjectedMetadata() != null;
- assert beanWithInjectionPoint.getInjectedMetadata().getBindings().contains(new CurrentLiteral());
+ assert beanWithInjectionPoint.getInjectedMetadata().getQualifiers().contains(new DefaultLiteral());
}
@Test(groups = { "injectionPoint" })
@SpecAssertion(section = "5.6.9", id = "dca")
public void testIsTransient()
{
- FieldInjectionPointBean bean1 = getInstanceByType(FieldInjectionPointBean.class,new CurrentLiteral());
- TransientFieldInjectionPointBean bean2 = getInstanceByType(TransientFieldInjectionPointBean.class,new CurrentLiteral());
+ FieldInjectionPointBean bean1 = getInstanceByType(FieldInjectionPointBean.class);
+ TransientFieldInjectionPointBean bean2 = getInstanceByType(TransientFieldInjectionPointBean.class);
InjectionPoint ip1 = bean1.getInjectedBean().getInjectedMetadata();
InjectionPoint ip2 = bean2.getInjectedBean().getInjectedMetadata();
assert !ip1.isTransient();
@@ -209,9 +209,9 @@
@SpecAssertion(section = "5.6.9", id="dba")
public void testIsDelegate()
{
- assert !getInstanceByType(FieldInjectionPointBean.class,new CurrentLiteral()).getInjectedBean().getInjectedMetadata().isDelegate();
+ assert !getInstanceByType(FieldInjectionPointBean.class).getInjectedBean().getInjectedMetadata().isDelegate();
- Cat cat = getInstanceByType(Cat.class, new CurrentLiteral());
+ Cat cat = getInstanceByType(Cat.class, new DefaultLiteral());
assert cat.hello().equals("hello world!");
assert cat.getBeanManager() != null;
assert cat.getInjectionPoint() != null;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/LoggerConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/LoggerConsumer.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/LoggerConsumer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.lookup.injectionpoint;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class LoggerConsumer
{
- @Current
+ @Inject
private Logger logger;
public Logger getLogger()
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,8 +17,7 @@
package org.jboss.jsr299.tck.tests.lookup.injectionpoint;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
/**
* Test bean to inject a bean using injection point metadata into a constructor
@@ -30,8 +29,8 @@
{
private BeanWithInjectionPointMetadata injectedBean;
- @Initializer
- public void methodWithInjectedMetadata(@Current BeanWithInjectionPointMetadata injectedBean)
+ @Inject
+ public void methodWithInjectedMetadata(BeanWithInjectionPointMetadata injectedBean)
{
this.injectedBean = injectedBean;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/TransientFieldInjectionPointBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/TransientFieldInjectionPointBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/TransientFieldInjectionPointBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -18,7 +18,7 @@
package org.jboss.jsr299.tck.tests.lookup.injectionpoint;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
/**
* Test bean to inject another bean which uses injection point metadata in a
@@ -30,7 +30,7 @@
@RequestScoped
class TransientFieldInjectionPointBean
{
- @Current @AnimalStereotype
+ @Inject @AnimalStereotype
private transient BeanWithInjectionPointMetadata injectedBean;
public BeanWithInjectionPointMetadata getInjectedBean()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/Cat_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/Cat_Broken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/Cat_Broken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,14 +17,13 @@
package org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.normal.scope;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
@SuppressWarnings("unused")
@RequestScoped
class Cat_Broken {
- @Current private InjectionPoint ip;
+ @Inject private InjectionPoint ip;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.normal.scope;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectionPoint.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectionPoint.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectionPoint.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -12,7 +12,7 @@
import javax.enterprise.inject.spi.InjectionPoint;
import org.jboss.jsr299.tck.literals.AnyLiteral;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
public class AmbiguousInjectionPoint implements InjectionPoint
{
@@ -22,7 +22,7 @@
public AmbiguousInjectionPoint(Bean<SimpleBean> bean)
{
this.bean = bean;
- bindings.add(new CurrentLiteral());
+ bindings.add(new DefaultLiteral());
bindings.add(new AnyLiteral());
}
@@ -36,7 +36,7 @@
return bean;
}
- public Set<Annotation> getBindings()
+ public Set<Annotation> getQualifiers()
{
return bindings;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectionPoint.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectionPoint.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectionPoint.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -12,7 +12,7 @@
import javax.enterprise.inject.spi.InjectionPoint;
import org.jboss.jsr299.tck.literals.AnyLiteral;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
public class UnsatisfiedInjectionPoint implements InjectionPoint
{
@@ -23,7 +23,7 @@
public UnsatisfiedInjectionPoint(Bean<SimpleBean> beanWithInjectionPoint)
{
this.bean = beanWithInjectionPoint;
- bindings.add(new CurrentLiteral());
+ bindings.add(new DefaultLiteral());
bindings.add(new AnyLiteral());
}
@@ -37,7 +37,7 @@
return bean;
}
- public Set<Annotation> getBindings()
+ public Set<Annotation> getQualifiers()
{
return bindings;
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/FishFarmOffice.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.lookup.manager;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
class FishFarmOffice
{
- @Current public BeanManager beanManager;
+ @Inject 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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -3,15 +3,14 @@
import java.io.Serializable;
import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
@@ -39,7 +38,7 @@
public void testManagerBeanIsDependentScoped()
{
Bean<BeanManager> beanManager = getBeans(BeanManager.class).iterator().next();
- assert beanManager.getScopeType().equals(Dependent.class);
+ assert beanManager.getScope().equals(Dependent.class);
}
@Test
@@ -47,7 +46,7 @@
public void testManagerBeanHasCurrentBinding()
{
Bean<BeanManager> beanManager = getBeans(BeanManager.class).iterator().next();
- assert beanManager.getBindings().contains(new AnnotationLiteral<Current>(){});
+ assert beanManager.getQualifiers().contains(new DefaultLiteral());
}
@Test
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Chunky.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface 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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cod.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Whitefish
@Chunky(realChunky=true)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/CrabSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/CrabSpider.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/CrabSpider.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
- at Policy
+ at Alternative
public class CrabSpider extends Spider
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DaddyLongLegs.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DaddyLongLegs.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DaddyLongLegs.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
- at Policy
+ at Alternative
class DaddyLongLegs extends Spider
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,19 +10,19 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
-import javax.enterprise.inject.NonBinding;
+import javax.enterprise.inject.Nonbinding;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Expensive
{
boolean veryExpensive();
- @NonBinding
+ @Nonbinding
int cost();
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FishILike.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface FishILike
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Haddock.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Named
@FishILike
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Max.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Max.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Max.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -24,11 +24,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
- at BindingType
+ at Qualifier
@interface Max {
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Min.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Min.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Min.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -25,11 +25,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
- at BindingType
+ at Qualifier
@interface Min {
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Number.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Number.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Number.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -24,11 +24,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
- at BindingType
+ at Qualifier
@interface Number {
}
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -28,7 +28,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.jsr299.tck.literals.DefaultLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -54,7 +54,7 @@
public void testResolveByType() throws Exception
{
- assert getBeans(Tuna.class, new CurrentLiteral()).size() == 1;
+ assert getBeans(Tuna.class, new DefaultLiteral()).size() == 1;
assert getBeans(Tuna.class).size() == 1;
@@ -198,7 +198,7 @@
@SpecAssertion(section = "5.2", id = "a")
public void testPolicyNotAvailableInNonDeploymentArchive() throws Exception
{
- Set<Bean<Spider>> spiders = getBeans(Spider.class, new CurrentLiteral());
+ Set<Bean<Spider>> spiders = getBeans(Spider.class);
Set<Type> types = new HashSet<Type>();
for (Bean<Spider> spider : spiders)
{
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Salmon.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@Named
@FishILike
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-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Whitefish.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
- at BindingType
+ at Qualifier
@interface Whitefish
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/Game.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/Game.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/Game.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.primitive;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
@SuppressWarnings("unused")
class Game
{
- @Current private int number;
+ @Inject private int number;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.primitive;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/Farm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/Farm.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/Farm.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.type.variable;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
@SuppressWarnings("unused")
class Farm
{
- @Initializer
+ @Inject
public <T extends Animal> void setAnimal(T animal)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.type.variable;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/Cat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/Cat.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/Cat.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,7 +2,7 @@
class Cat
{
- @InterceptorBinding
+ @CatInterceptorBinding
public String hello() {
return "hello";
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptor.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptor.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -5,7 +5,7 @@
import javax.interceptor.InvocationContext;
@Interceptor
- at InterceptorBinding
+ at CatInterceptorBinding
class CatInterceptor extends Cat
{
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptorBinding.java (from rev 3591, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorBinding.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptorBinding.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptorBinding.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.interceptor;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+ at Inherited
+ at InterceptorBinding
+ at Target( { TYPE, METHOD })
+ at Retention(RUNTIME)
+ at interface CatInterceptorBinding
+{
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorBinding.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorBinding.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,18 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.interceptor;
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import javax.interceptor.InterceptorBindingType;
-
- at Inherited
- at InterceptorBindingType
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at interface InterceptorBinding
-{
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/InjectedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/InjectedBean.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/InjectedBean.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -2,11 +2,11 @@
import java.util.HashMap;
-import javax.enterprise.inject.Current;
+import javax.inject.Inject;
class InjectedBean
{
- @Current
+ @Inject
private HashMap<? extends Number, ? super Integer> map;
public HashMap<? extends Number, ? super Integer> getMap()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Bird.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Bird.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Bird.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,11 +16,12 @@
*/
package org.jboss.jsr299.tck.tests.policy;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
+import javax.inject.Named;
@EnabledPolicyStereotype
@NotEnabledPolicyStereotype
- at Named
+ at Named @Default
class Bird implements Animal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Cat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Cat.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Cat.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,11 @@
*/
package org.jboss.jsr299.tck.tests.policy;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
+import javax.inject.Named;
@EnabledPolicyStereotype
- at Named
+ at Named @Default
class Cat implements Animal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/CatProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/CatProducer.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/CatProducer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.policy;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
import javax.enterprise.inject.Produces;
class CatProducer
@@ -26,7 +26,7 @@
public static final Cat wildCat = new Cat();
@Produces @Tame
- @Policy
+ @Alternative
public static final Cat cat = new Cat();
@Produces @Wild
@@ -35,7 +35,7 @@
}
@Produces @Tame
- @Policy
+ @Alternative
public Cat produce() {
return cat;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Chicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Chicken.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Chicken.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,9 +17,9 @@
package org.jboss.jsr299.tck.tests.policy;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
- at Policy
+ at Alternative
@RequestScoped
class Chicken implements Animal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Dog.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Dog.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Dog.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.policy;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@NotEnabledPolicyStereotype
@Named
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/EnabledPolicyStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/EnabledPolicyStereotype.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/EnabledPolicyStereotype.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -18,18 +18,18 @@
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
import javax.enterprise.inject.stereotype.Stereotype;
@RequestScoped
@Stereotype
- at Policy
+ at Alternative
@Target( { TYPE, METHOD })
@Retention(RUNTIME)
@interface EnabledPolicyStereotype
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/EnabledSheepProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/EnabledSheepProducer.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/EnabledSheepProducer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.policy;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
import javax.enterprise.inject.Produces;
- at Policy
+ at Alternative
class EnabledSheepProducer
{
@Produces @Wild
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Horse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Horse.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Horse.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,9 +17,9 @@
package org.jboss.jsr299.tck.tests.policy;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
- at Policy
+ at Alternative
@RequestScoped
public class Horse implements Animal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/NotEnabledPolicyStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/NotEnabledPolicyStereotype.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/NotEnabledPolicyStereotype.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -18,18 +18,18 @@
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
import javax.enterprise.inject.stereotype.Stereotype;
@RequestScoped
@Stereotype
- at Policy
+ at Alternative
@Target( { TYPE, METHOD })
@Retention(RUNTIME)
@interface NotEnabledPolicyStereotype
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/NotEnabledSheepProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/NotEnabledSheepProducer.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/NotEnabledSheepProducer.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.policy;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
import javax.enterprise.inject.Produces;
- at Policy
+ at Alternative
class NotEnabledSheepProducer
{
@Produces @Tame
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Tame.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Tame.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -25,11 +25,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
- at BindingType
+ at Qualifier
@interface Tame
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Wild.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Wild.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/Wild.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -25,11 +25,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
- at BindingType
+ at Qualifier
@interface Wild
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/Cat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/Cat.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/Cat.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.policy.broken.not.policy;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@RequestScoped
@Named
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/Mock.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/Mock.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/Mock.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -18,9 +18,9 @@
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/Cat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/Cat.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/Cat.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,10 +17,10 @@
package org.jboss.jsr299.tck.tests.policy.broken.same.type.twice;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
@RequestScoped
- at Policy
+ at Alternative
class Cat
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/Dog.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/Dog.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/Dog.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -17,12 +17,12 @@
package org.jboss.jsr299.tck.tests.policy.broken.same.type.twice;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Named;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
+import javax.inject.Named;
@RequestScoped
@Named
- at Policy
+ at Alternative
class Dog
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/EnabledEjb.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/EnabledEjb.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/EnabledEjb.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.policy.enterprise;
import javax.ejb.Stateless;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
@Stateless
- at Policy
+ at Alternative
class EnabledEjb implements EjbInterface
{
public String hello() {
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/NotEnabledEjb.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/NotEnabledEjb.java 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/NotEnabledEjb.java 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.policy.enterprise;
import javax.ejb.Stateless;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Alternative;
@Stateless
- at Policy
+ at Alternative
class NotEnabledEjb implements DisabledEjbInterface
{
public String hello() {
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/beans.xml 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/beans.xml 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,5 +1,5 @@
<beans>
- <policies>
+ <alternatives>
<class>org.jboss.jsr299.tck.tests.definition.stereotype.inheritance.NamedRequestPolicyStereotype</class>
- </policies>
+ </alternatives>
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/byname/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/byname/beans.xml 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/byname/beans.xml 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,5 +1,5 @@
<beans>
- <policies>
+ <alternatives>
<class>org.jboss.jsr299.tck.tests.lookup.byname.Sole</class>
- </policies>
+ </alternatives>
</beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/beans.xml 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/beans.xml 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans>
- <policies>
+ <alternatives>
<class>org.jboss.jsr299.tck.tests.policy.Chicken</class>
<class>org.jboss.jsr299.tck.tests.policy.EnabledSheepProducer</class>
<stereotype>org.jboss.jsr299.tck.tests.policy.EnabledPolicyStereotype</stereotype>
- </policies>
+ </alternatives>
</beans>
\ No newline at end of file
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/beans.xml 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/beans.xml 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans>
- <policies>
+ <alternatives>
<class>org.jboss.jsr299.tck.tests.policy.broken.incorrect.name.NonExistingClass</class>
- </policies>
+ </alternatives>
</beans>
\ No newline at end of file
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/beans.xml 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/beans.xml 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans>
- <policies>
+ <alternatives>
<stereotype>org.jboss.jsr299.tck.tests.policy.broken.incorrect.name.stereotype.Mock</stereotype>
- </policies>
+ </alternatives>
</beans>
\ No newline at end of file
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/not/policy/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/not/policy/beans.xml 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/not/policy/beans.xml 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans>
- <policies>
+ <alternatives>
<class>org.jboss.jsr299.tck.tests.policy.broken.not.policy.Cat</class>
- </policies>
+ </alternatives>
</beans>
\ No newline at end of file
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/beans.xml 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/beans.xml 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans>
- <policies>
+ <alternatives>
<stereotype>org.jboss.jsr299.tck.tests.policy.broken.not.policy.stereotype.Mock</stereotype>
- </policies>
+ </alternatives>
</beans>
\ No newline at end of file
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/beans.xml 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/beans.xml 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans>
- <policies>
+ <alternatives>
<class>org.jboss.jsr299.tck.tests.policy.broken.same.type.twice.Dog</class>
<class>org.jboss.jsr299.tck.tests.policy.broken.same.type.twice.Cat</class>
<class>org.jboss.jsr299.tck.tests.policy.broken.same.type.twice.Cat</class>
- </policies>
+ </alternatives>
</beans>
\ No newline at end of file
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/enterprise/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/enterprise/beans.xml 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/policy/enterprise/beans.xml 2009-08-30 19:51:56 UTC (rev 3618)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans>
- <policies>
+ <alternatives>
<class>org.jboss.jsr299.tck.tests.policy.enterprise.EnabledEjb</class>
- </policies>
+ </alternatives>
</beans>
\ No newline at end of file
Modified: tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-08-30 19:51:56 UTC (rev 3618)
@@ -340,19 +340,19 @@
<section id="2.6.1" title="Declaring a policy">
<assertion id="a">
- <text>A policy may be declared by annotating the bean class with the |@Policy| annotation.</text>
+ <text>A policy may be declared by annotating the bean class with the |@Alternative| annotation.</text>
</assertion>
<assertion id="b">
- <text>A policy may be declared by annotating a bean with a stereotype that declares a |@Policy| annotation.</text>
+ <text>A policy may be declared by annotating a bean with a stereotype that declares a |@Alternative| annotation.</text>
</assertion>
<assertion id="c">
- <text>A policy may be declared by annotating a producer method with a stereotype that declares a |@Policy| annotation.</text>
+ <text>A policy may be declared by annotating a producer method with a stereotype that declares a |@Alternative| annotation.</text>
</assertion>
<assertion id="d">
- <text>A policy may be declared by annotating a producer field with a stereotype that declares a |@Policy| annotation.</text>
+ <text>A policy may be declared by annotating a producer field with a stereotype that declares a |@Alternative| annotation.</text>
</assertion>
<assertion id="e">
@@ -453,9 +453,9 @@
</assertion>
</section>
- <section id="2.7.1.4" title="Declaring a @Policy stereotype">
+ <section id="2.7.1.4" title="Declaring a @Alternative stereotype">
<assertion id="a">
- <text>A stereotype may declare a @Policy annotation, which specifies that every bean with the stereotype is a policy.</text>
+ <text>A stereotype may declare a @Alternative annotation, which specifies that every bean with the stereotype is a policy.</text>
</assertion>
</section>
@@ -558,7 +558,7 @@
</assertion>
<assertion id="q">
- <text>A top-level Java class is only a managed bean if it has an appropriate constructor - a constructor annotated |@Initializer|.</text>
+ <text>A top-level Java class is only a managed bean if it has an appropriate constructor - a constructor annotated |@Inject|.</text>
</assertion>
</section>
@@ -602,16 +602,16 @@
<section id="3.1.4.1" title="Declaring a bean constructor">
<assertion id="a">
- <text>The bean constructor may be identified by annotating the constructor |@Initializer|</text>
+ <text>The bean constructor may be identified by annotating the constructor |@Inject|</text>
</assertion>
<assertion id="ba">
- <text>If a managed bean does not explicitly declare a constructor using |@Initializer|, the constructor that accepts no parameters is the bean constructor</text>
+ <text>If a managed bean does not explicitly declare a constructor using |@Inject|, the constructor that accepts no parameters is the bean constructor</text>
<note>Can't check implicit constructor</note>
</assertion>
<assertion id="ca">
- <text>If a managed bean has more than one constructor annotated |@Initializer|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+ <text>If a managed bean has more than one constructor annotated |@Inject|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
</assertion>
<assertion id="da">
@@ -867,7 +867,7 @@
</assertion>
<assertion id="ca">
- <text>If a producer method is annotated |@Initializer|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+ <text>If a producer method is annotated |@Inject|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
</assertion>
<assertion id="da">
@@ -969,7 +969,7 @@
</assertion>
<assertion id="da">
- <text>If a disposal method is annotated |@Initializer|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4 "Problems detected automatically by the container".</text>
+ <text>If a disposal method is annotated |@Inject|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4 "Problems detected automatically by the container".</text>
</assertion>
<assertion id="ea">
@@ -1260,7 +1260,7 @@
</assertion>
<assertion id="ab">
- <text>If a generic method of a bean is annotated |@Initializer|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+ <text>If a generic method of a bean is annotated |@Inject|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
</assertion>
<assertion id="ba">
@@ -1862,7 +1862,7 @@
</group>
<assertion id="g">
- <text>A policy is enabled for the bean deployment archive if any |@Policy| stereotype of the policy is listed.</text>
+ <text>A policy is enabled for the bean deployment archive if any |@Alternative| stereotype of the policy is listed.</text>
</assertion>
<assertion id="h">
@@ -1870,7 +1870,7 @@
</assertion>
<assertion id="i">
- <text>Each child <stereotype> element must specify the name of a |@Policy| stereotype annotation. If there is no annotation with the specified name, or the annotation is not a |@Policy| stereotype, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+ <text>Each child <stereotype> element must specify the name of a |@Alternative| stereotype annotation. If there is no annotation with the specified name, or the annotation is not a |@Alternative| stereotype, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>
</assertion>
<assertion id="j">
@@ -1944,14 +1944,14 @@
</assertion>
<group>
- <text>When resolving beans that are eligible for injection to an injection point, the container identifies the set of matching beans which are not interceptors or decorators and which are not a policy, or is an enabled policy of the bean deployment archive of the class that declares the injection point. For a custom implementation of the |Bean| interface defined in Section 11.1, "The Bean interface", the container calls |getTypes()| and |getBindings()| to determine the bean types and bindings.</text>
+ <text>When resolving beans that are eligible for injection to an injection point, the container identifies the set of matching beans which are not interceptors or decorators and which are not a policy, or is an enabled policy of the bean deployment archive of the class that declares the injection point. For a custom implementation of the |Bean| interface defined in Section 11.1, "The Bean interface", the container calls |getTypes()| and |getQualifiers()| to determine the bean types and bindings.</text>
<assertion id="na">
<text>Test |getTypes()| determines bean types.</text>
</assertion>
<assertion id="nb">
- <text>Test |getBindings()| determines bindings.</text>
+ <text>Test |getQualifiers()| determines bindings.</text>
</assertion>
</group>
</section>
@@ -2208,7 +2208,7 @@
<section id="5.6.3" title="Injection using the bean constructor">
<assertion id="a">
- <text>When the container instantiates a managed bean with a constructor annotated |@Initializer|, the container calls this constructor, passing an injectable reference to each parameter. If there is no constructor annotated |@Initializer|, the container calls the constructor with no parameters.</text>
+ <text>When the container instantiates a managed bean with a constructor annotated |@Inject|, the container calls this constructor, passing an injectable reference to each parameter. If there is no constructor annotated |@Inject|, the container calls the constructor with no parameters.</text>
</assertion>
</section>
@@ -2288,7 +2288,7 @@
</assertion>
<assertion id="bc">
- <text>The |javax.enterprise.inject.spi.InjectionPoint.getBindings()| method returns the declared bindings of the injection point.</text>
+ <text>The |javax.enterprise.inject.spi.InjectionPoint.getQualifiers()| method returns the declared bindings of the injection point.</text>
</assertion>
<assertion id="ca">
@@ -2522,7 +2522,7 @@
</assertion>
<assertion id="ab">
- <text>The method |getScopeType()| returns the scope type of the context object.</text>
+ <text>The method |getScope()| returns the scope type of the context object.</text>
</assertion>
<assertion id="ha">
@@ -2772,7 +2772,7 @@
</assertion>
<assertion id="e">
- <text>For a custom implementation of the |Bean| interface defined in Section 11.1, "The Bean interface", the container calls |getScopeType()| to determine the bean scope.</text>
+ <text>For a custom implementation of the |Bean| interface defined in Section 11.1, "The Bean interface", the container calls |getScope()| to determine the bean scope.</text>
</assertion>
</section>
@@ -2904,7 +2904,7 @@
</assertion>
<assertion id="fa">
- <text>A custom implementation of |Bean| is a passivation capable dependency if it implements |PassivationCapable| or if |getScopeType()| returns a normal scope type.</text>
+ <text>A custom implementation of |Bean| is a passivation capable dependency if it implements |PassivationCapable| or if |getScope()| returns a normal scope type.</text>
</assertion>
</section>
@@ -4298,7 +4298,7 @@
</assertion>
<assertion id="e">
- <text>If an observer method is annotated |@Initializer| the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+ <text>If an observer method is annotated |@Inject| the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
</assertion>
<assertion id="f">
@@ -4456,7 +4456,7 @@
</assertion>
<assertion id="ba">
- <text>|getTypes()|, |getBindings()|, |getScopeType()|, |getName()| and |getStereotypes()| must return the bean types, bindings, scope type, EL name and stereotypes of the bean, as defined in Chapter 2, Concepts.</text>
+ <text>|getTypes()|, |getQualifiers()|, |getScope()|, |getName()| and |getStereotypes()| must return the bean types, bindings, scope type, EL name and stereotypes of the bean, as defined in Chapter 2, Concepts.</text>
</assertion>
<assertion id="bb">
@@ -4565,11 +4565,11 @@
</assertion>
<assertion id="ba">
- <text>For a |Producer| that represents a class, |produce()| calls the constructor annotated |@Initializer| if it exists, or the constructor with no parameters otherwise, as defined in Section 5.6.3, "Injection using the bean constructor".</text>
+ <text>For a |Producer| that represents a class, |produce()| calls the constructor annotated |@Inject| if it exists, or the constructor with no parameters otherwise, as defined in Section 5.6.3, "Injection using the bean constructor".</text>
</assertion>
<assertion id="bb">
- <text>For a |Producer| that represents a class, |produce()| calls the constructor annotated |@Initializer| if it exists, or the constructor with no parameters otherwise, as defined in Section 5.6.3, "Injection using the bean constructor".</text>
+ <text>For a |Producer| that represents a class, |produce()| calls the constructor annotated |@Inject| if it exists, or the constructor with no parameters otherwise, as defined in Section 5.6.3, "Injection using the bean constructor".</text>
</assertion>
<assertion id="c">
Modified: tck/trunk/impl/src/main/resources/webbeans.sig
===================================================================
--- tck/trunk/impl/src/main/resources/webbeans.sig 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/impl/src/main/resources/webbeans.sig 2009-08-30 19:51:56 UTC (rev 3618)
@@ -189,7 +189,7 @@
meth public abstract <%0 extends java.lang.Object> {%%0} get(javax.enterprise.context.spi.Contextual<{%%0}>)
meth public abstract <%0 extends java.lang.Object> {%%0} get(javax.enterprise.context.spi.Contextual<{%%0}>,javax.enterprise.context.spi.CreationalContext<{%%0}>)
meth public abstract boolean isActive()
-meth public abstract java.lang.Class<? extends java.lang.annotation.Annotation> getScopeType()
+meth public abstract java.lang.Class<? extends java.lang.annotation.Annotation> getScope()
CLSS public abstract interface javax.enterprise.context.spi.Contextual<%0 extends java.lang.Object>
meth public abstract void destroy({javax.enterprise.context.spi.Contextual%0},javax.enterprise.context.spi.CreationalContext<{javax.enterprise.context.spi.Contextual%0}>)
@@ -411,9 +411,9 @@
meth public abstract boolean isNullable()
meth public abstract boolean isSerializable()
meth public abstract java.lang.Class<? extends java.lang.annotation.Annotation> getDeploymentType()
-meth public abstract java.lang.Class<? extends java.lang.annotation.Annotation> getScopeType()
+meth public abstract java.lang.Class<? extends java.lang.annotation.Annotation> getScope()
meth public abstract java.lang.String getName()
-meth public abstract java.util.Set<java.lang.annotation.Annotation> getBindings()
+meth public abstract java.util.Set<java.lang.annotation.Annotation> getQualifiers()
meth public abstract java.util.Set<java.lang.reflect.Type> getTypes()
meth public abstract java.util.Set<javax.enterprise.inject.spi.InjectionPoint> getInjectionPoints()
@@ -471,7 +471,7 @@
meth public abstract boolean isTransient()
meth public abstract java.lang.reflect.Member getMember()
meth public abstract java.lang.reflect.Type getType()
-meth public abstract java.util.Set<java.lang.annotation.Annotation> getBindings()
+meth public abstract java.util.Set<java.lang.annotation.Annotation> getQualifiers()
meth public abstract javax.enterprise.inject.spi.Annotated getAnnotated()
meth public abstract javax.enterprise.inject.spi.Bean<?> getBean()
Modified: tck/trunk/pom.xml
===================================================================
--- tck/trunk/pom.xml 2009-08-30 19:44:25 UTC (rev 3617)
+++ tck/trunk/pom.xml 2009-08-30 19:51:56 UTC (rev 3618)
@@ -99,10 +99,17 @@
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
</dependency>
+
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>inject-api</artifactId>
+ <version>1.0.0-PRD</version>
+ </dependency>
+
+ <dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.0.1B</version>
More information about the weld-commits
mailing list