[webbeans-commits] Webbeans SVN: r2711 - in ri/trunk: api/src/main/java/javax/decorator and 82 other directories.

Author: dallen6 Date: 2009-05-26 08:45:33 -0400 (Tue, 26 May 2009) New Revision: 2711 Added: ri/trunk/api/src/main/java/javax/enterprise/ ri/trunk/api/src/main/java/javax/enterprise/context/ ri/trunk/api/src/main/java/javax/enterprise/context/ApplicationScoped.java ri/trunk/api/src/main/java/javax/enterprise/context/ContextNotActiveException.java ri/trunk/api/src/main/java/javax/enterprise/context/Conversation.java ri/trunk/api/src/main/java/javax/enterprise/context/ConversationScoped.java ri/trunk/api/src/main/java/javax/enterprise/context/Dependent.java ri/trunk/api/src/main/java/javax/enterprise/context/RequestScoped.java ri/trunk/api/src/main/java/javax/enterprise/context/ScopeType.java ri/trunk/api/src/main/java/javax/enterprise/context/SessionScoped.java ri/trunk/api/src/main/java/javax/enterprise/context/spi/ ri/trunk/api/src/main/java/javax/enterprise/context/spi/Context.java ri/trunk/api/src/main/java/javax/enterprise/context/spi/Contextual.java ri/trunk/api/src/main/java/javax/enterprise/context/spi/CreationalContext.java ri/trunk/api/src/main/java/javax/enterprise/inject/ ri/trunk/api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java ri/trunk/api/src/main/java/javax/enterprise/inject/BindingType.java ri/trunk/api/src/main/java/javax/enterprise/inject/CreationException.java ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java ri/trunk/api/src/main/java/javax/enterprise/inject/Disposes.java ri/trunk/api/src/main/java/javax/enterprise/inject/IllegalProductException.java ri/trunk/api/src/main/java/javax/enterprise/inject/Initializer.java ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java ri/trunk/api/src/main/java/javax/enterprise/inject/Model.java ri/trunk/api/src/main/java/javax/enterprise/inject/Named.java ri/trunk/api/src/main/java/javax/enterprise/inject/New.java ri/trunk/api/src/main/java/javax/enterprise/inject/NonBinding.java ri/trunk/api/src/main/java/javax/enterprise/inject/Produces.java ri/trunk/api/src/main/java/javax/enterprise/inject/Stereotype.java ri/trunk/api/src/main/java/javax/enterprise/inject/TypeLiteral.java ri/trunk/api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java ri/trunk/api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/ ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Production.java ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Specializes.java ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Standard.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Bean.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Decorator.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InterceptionType.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Interceptor.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractDecorator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractInterceptor.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/BaseBean.java Removed: ri/trunk/api/src/main/java/javax/annotation/ ri/trunk/api/src/main/java/javax/context/ ri/trunk/api/src/main/java/javax/inject/AmbiguousDependencyException.java ri/trunk/api/src/main/java/javax/inject/AnnotationLiteral.java ri/trunk/api/src/main/java/javax/inject/BindingType.java ri/trunk/api/src/main/java/javax/inject/CreationException.java ri/trunk/api/src/main/java/javax/inject/Current.java ri/trunk/api/src/main/java/javax/inject/DeploymentType.java ri/trunk/api/src/main/java/javax/inject/Disposes.java ri/trunk/api/src/main/java/javax/inject/IllegalProductException.java ri/trunk/api/src/main/java/javax/inject/Initializer.java ri/trunk/api/src/main/java/javax/inject/Instance.java ri/trunk/api/src/main/java/javax/inject/New.java ri/trunk/api/src/main/java/javax/inject/Produces.java ri/trunk/api/src/main/java/javax/inject/Production.java ri/trunk/api/src/main/java/javax/inject/Specializes.java ri/trunk/api/src/main/java/javax/inject/Standard.java ri/trunk/api/src/main/java/javax/inject/TypeLiteral.java ri/trunk/api/src/main/java/javax/inject/UnproxyableDependencyException.java ri/trunk/api/src/main/java/javax/inject/UnsatisfiedDependencyException.java ri/trunk/api/src/main/java/javax/inject/manager/ ri/trunk/api/src/main/java/javax/webbeans/ Modified: ri/trunk/api/src/main/java/javax/decorator/Decorator.java ri/trunk/api/src/main/java/javax/event/Fires.java ri/trunk/api/src/main/java/javax/inject/Obtains.java ri/trunk/api/src/main/java/javax/interceptor/Interceptor.java ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/WebBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/ConnectionContextual.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageConsumerContextual.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageProducerContextual.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/SessionContextual.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InjectionPointBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/ManagerBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextualInstance.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/BeanStoreNamingScheme.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/PrefixBeanStoreNamingScheme.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/AbstractConversationManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/AnnotatedInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Exceptions.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/ConversationAwareViewHandler.java ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/FacesUrlTransformer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/FiresLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ObtainsLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/ScopeModel.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationPropagationFilter.java ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java ri/trunk/impl/src/main/resources/ee/namespace ri/trunk/osgi-bundle/pom.xml ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/BeanStore.java ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/manager/api/WebBeansManager.java ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/JpaServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/ForwardingJpaServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/AbstractResourceServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceServices.java ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEjBServices.java ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJpaServices.java ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockResourceServices.java ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Game.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Generator.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Mock.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Random.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/AnotherDeploymentType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Cow.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserver.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesApplicationContext.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesRequestContext.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tuna.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/XmlBootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Hound.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Salmon.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/SeaBass.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Sole.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/TarantulaProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tuna.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Whitefish.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Elephant.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Hound.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Panther.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Synchronous.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tiger.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Salmon.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/SeaBass.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Sole.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Tuna.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Whitefish.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Hound.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/Tuna.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplictionScopedObject.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScoped.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScopedTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Beer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/BeerProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Order.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Order.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/sbi/SessionBeanInterceptorTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Updated.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ExceptionHandlingTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Large.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ShipProducer_Broken.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/WrappedSimpleBean.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/IntegerCollectionInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListStringInstance.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/NoParameterizedCollectionInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedListInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/Foo.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Air.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bar.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bird.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Car.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLooping.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLoopingProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingNormalProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Farm.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Fish.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Foo.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Food.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/House.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLooping.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLoopingProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingDependentProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingNormalProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Petrol.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Pig.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Planet.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent1.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal1.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Space.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Water.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestBindingType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestDeploymentType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestNamed.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestScopeType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestStereotype.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/AnotherDeploymentType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml Log: Updated JSR-299 API to latest draft of the specification Modified: ri/trunk/api/src/main/java/javax/decorator/Decorator.java =================================================================== --- ri/trunk/api/src/main/java/javax/decorator/Decorator.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/decorator/Decorator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,7 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; /** * Specifies that a class is a decorator. Copied: ri/trunk/api/src/main/java/javax/enterprise/context/ApplicationScoped.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/ApplicationScoped.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/ApplicationScoped.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/ApplicationScoped.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,46 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.context; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + + +/** + * Specifies that a bean is application scoped. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@ScopeType +@Inherited +public @interface ApplicationScoped +{ + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/ApplicationScoped.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/context/ContextNotActiveException.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/ContextNotActiveException.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/ContextNotActiveException.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/ContextNotActiveException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.context; + +import javax.inject.ExecutionException; + +/** + * A ContextNotActiveException is thrown if at a particular point in the + * execution of the program the scope is inactive with respect to the current + * thread. When the scope is inactive, any invocation of the get() from the + * current thread upon the Context object for that scope results in a + * ContextNotActiveException. + * + * @author Pete Muir + * @author Shane Bryzak + */ + +public class ContextNotActiveException extends ExecutionException +{ + + private static final long serialVersionUID = -3599813072560026919L; + + public ContextNotActiveException() + { + super(); + } + + public ContextNotActiveException(String message) + { + super(message); + } + + public ContextNotActiveException(Throwable cause) + { + super(cause); + } + + public ContextNotActiveException(String message, Throwable cause) + { + super(message, cause); + } + +} Copied: ri/trunk/api/src/main/java/javax/enterprise/context/Conversation.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/Conversation.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/Conversation.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/Conversation.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,76 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package javax.enterprise.context; + +/** + * Provides conversation management operations + * + * @author Pete Muir + * + */ +public interface Conversation +{ + + /** + * Mark a transient conversation long running. The container will generate an + * id + */ + public void begin(); + + /** + * Mark a transient conversation long running. + * + * @param id the id of the conversation + */ + public void begin(String id); + + /** + * Mark a long running conversation transient + */ + public void end(); + + /** + * Determine if a conversation is long running or transient + * + * @return true if the conversation is long running + */ + public boolean isLongRunning(); + + /** + * Get the id associated with the current long running conversation + * + * @return the id of the current long running conversation + */ + public String getId(); + + /** + * Get the timeout for the current long running conversation. + * + * The conversation will destroy the conversation if it has not been accessed + * within this time period. + * + * @return the current timeout in milliseconds + */ + public long getTimeout(); + + /** + * Set the timeout for the current long running conversation + * + * @param milliseconds the new timeout in milliseconds + */ + public void setTimeout(long milliseconds); +} \ No newline at end of file Copied: ri/trunk/api/src/main/java/javax/enterprise/context/ConversationScoped.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/ConversationScoped.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/ConversationScoped.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/ConversationScoped.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,42 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.context; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that a bean is conversation scoped. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@ScopeType(passivating = true) +public @interface ConversationScoped +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/ConversationScoped.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/context/Dependent.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/Dependent.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/Dependent.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/Dependent.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,44 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.context; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that a bean is dependent scoped. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { METHOD, TYPE, FIELD }) +@Retention(RUNTIME) +@Documented +@ScopeType(normal = false) +@Inherited +public @interface Dependent +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/Dependent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/context/RequestScoped.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/RequestScoped.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/RequestScoped.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/RequestScoped.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,44 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.context; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that a bean is request scoped. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@ScopeType +@Inherited +public @interface RequestScoped +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/RequestScoped.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/context/ScopeType.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/ScopeType.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/ScopeType.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/ScopeType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.context; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that an annotation type is a scope type. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target(ANNOTATION_TYPE) +@Retention(RUNTIME) +@Documented +public @interface ScopeType +{ + + /** + * @return true if this is a normal scope + */ + boolean normal() default true; + + /** + * @return true if this is a passivating scope (beans with this scope + * type must be serializable) + */ + boolean passivating() default false; + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/ScopeType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/context/SessionScoped.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/SessionScoped.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/SessionScoped.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/SessionScoped.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,44 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.context; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that a bean is session scoped. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@ScopeType(passivating = true) +@Inherited +public @interface SessionScoped +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/SessionScoped.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/context/spi/Context.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/Context.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/spi/Context.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/spi/Context.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,75 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.context.spi; + +import java.lang.annotation.Annotation; + +import javax.enterprise.context.ContextNotActiveException; + +/** + * The contract between the manager and a contextual object. + * This interface should not be called directly by the application. + * + * @author Gavin King + * @author Pete Muir + */ + +public interface Context +{ + + /** + * The scope which this context implements + * + * @return the scope + */ + public Class<? extends Annotation> getScopeType(); + + /** + * Return an existing instance of a contextual type or create a new instance + * of a contextual type + * + * @param <T> the type of contextual type + * @param contextual the contextual type + * @param creationalContext the creational context in which incompletely + * initialized instances may be placed + * @return the contextual instance, or null if no creational context is given + * and an instance does not exist in the context + * @throws ContextNotActiveException if the context is not active + */ + public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext); + + /** + * Return an existing instance of a contextual type or create a new instance + * of a contextual type + * + * @param <T> the type of the contextual type + * @param contextual the contextual type + * @return the contextual instance, or null if an instance does not exist in + * the context + * @throws ContextNotActiveException if the context is not active + */ + public <T> T get(Contextual<T> contextual); + + /** + * The context is only active at certain points in the application lifecycle + * + * @return true if the context is active + */ + boolean isActive(); + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/spi/Context.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/context/spi/Contextual.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/Contextual.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/spi/Contextual.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/spi/Contextual.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.context.spi; + +import javax.enterprise.inject.CreationException; + +/** + * The contract between a context and a contextual type This interface should + * not be implemented directly by the application. + * + * @author Nicklas Karlsson + * @author Pete Muir + */ +public interface Contextual<T> +{ + /** + * Create a new instance of the contextual type + * + * @param creationalContext + * the creational context in which incompletely initialized + * contexts may be placed + * @return the contextual instance + * @throws CreationException + * if a checked exception occurs whilst creating the instance + */ + public T create(CreationalContext<T> creationalContext); + + /** + * Destroys an instance of the contexual type + * + * @param instance + * the insance to destroy + */ + public void destroy(T instance); +} Copied: ri/trunk/api/src/main/java/javax/enterprise/context/spi/CreationalContext.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/CreationalContext.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/spi/CreationalContext.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/spi/CreationalContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,37 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package javax.enterprise.context.spi; + +/** + * Allows registration of an incompletely initialized contextual instance with + * the container. The contextual instance is considered incompletely initialized + * until the create() method returns the instance. + * + * @author Pete Muir + * + */ +public interface CreationalContext<T> +{ + + /** + * Push an incomplete instance to the container + * + * @param incompleteInstance + */ + public void push(T incompleteInstance); + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/spi/CreationalContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/AmbiguousDependencyException.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject; + +import javax.inject.DeploymentException; + +/** + * An AmbiguousDependencyException is thrown when within the set of enabled + * beans with the API type and bind- ing types declared there exists no unique + * Web Bean with a higher precedence than all other beans in the set. + * + * + * @author Pete Muir + */ +public class AmbiguousResolutionException extends DeploymentException +{ + + private static final long serialVersionUID = -2132733164534544788L; + + public AmbiguousResolutionException() + { + } + + public AmbiguousResolutionException(String message, Throwable throwable) + { + super(message, throwable); + } + + public AmbiguousResolutionException(String message) + { + super(message); + } + + public AmbiguousResolutionException(Throwable throwable) + { + super(throwable); + } + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/AnnotationLiteral.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,173 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.inject; + +import java.lang.annotation.Annotation; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; + +import javax.inject.ExecutionException; + + +/** + * Supports inline instantiation of annotation type instances. + * + * @author Pete Muir + * @author Gavin King + * + * @param <T> + * the annotation type + */ +public abstract class AnnotationLiteral<T extends Annotation> implements + Annotation +{ + + private Class<T> annotationType; + private Method[] members; + + protected AnnotationLiteral() + { + Class<?> annotationLiteralSubclass = getAnnotationLiteralSubclass(this.getClass()); + if (annotationLiteralSubclass == null) + { + throw new RuntimeException(getClass() + "is not a subclass of AnnotationLiteral "); + } + + annotationType = getTypeParameter(annotationLiteralSubclass); + + if (annotationType == null) + { + throw new RuntimeException(getClass() + " is missing type parameter in AnnotationLiteral"); + } + + this.members = annotationType.getDeclaredMethods(); + } + + private static Class<?> getAnnotationLiteralSubclass(Class<?> clazz) + { + Class<?> superclass = clazz.getSuperclass(); + if (superclass.equals(AnnotationLiteral.class)) + { + return clazz; + } + else if (superclass.equals(Object.class)) + { + return null; + } + else + { + return (getAnnotationLiteralSubclass(superclass)); + } + } + + @SuppressWarnings("unchecked") + private static <T> Class<T> getTypeParameter(Class<?> annotationLiteralSuperclass) + { + Type type = annotationLiteralSuperclass.getGenericSuperclass(); + if (type instanceof ParameterizedType) + { + ParameterizedType parameterizedType = (ParameterizedType) type; + if (parameterizedType.getActualTypeArguments().length == 1) + { + return (Class<T>) parameterizedType + .getActualTypeArguments()[0]; + } + } + return null; + } + + public Class<? extends Annotation> annotationType() + { + return annotationType; + } + + @Override + public String toString() + { + String string = "@" + annotationType().getName() + "("; + for (int i = 0; i < members.length; i++) + { + string += members[i].getName() + "="; + string += invoke(members[i], this); + if (i < members.length - 1) + { + string += ","; + } + } + return string + ")"; + } + + @Override + public boolean equals(Object other) + { + if (other instanceof Annotation) + { + Annotation that = (Annotation) other; + if (this.annotationType().equals(that.annotationType())) + { + for (Method member : members) + { + Object thisValue = invoke(member, this); + Object thatValue = invoke(member, that); + if (!thisValue.equals(thatValue)) + { + return false; + } + } + return true; + } + } + return false; + } + + @Override + public int hashCode() + { + int hashCode = 0; + for (Method member : members) + { + int memberNameHashCode = 127 * member.getName().hashCode(); + int memberValueHashCode = invoke(member, this).hashCode(); + hashCode += memberNameHashCode ^ memberValueHashCode; + } + return hashCode; + } + + private static Object invoke(Method method, Object instance) + { + try + { + method.setAccessible(true); + return method.invoke(instance); + } + catch (IllegalArgumentException e) + { + throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); + } + catch (IllegalAccessException e) + { + throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); + } + catch (InvocationTargetException e) + { + throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); + } + } +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/BindingType.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/BindingType.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/BindingType.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/BindingType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,40 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.inject; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * + * Specifies that an annotation type is a binding type. + * + * @author Pete Muir + * @author Gavin King + */ + +@Target(ANNOTATION_TYPE) +@Retention(RUNTIME) +@Documented +public @interface BindingType +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/BindingType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/CreationException.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/CreationException.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/CreationException.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/CreationException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,52 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.inject; + +import javax.inject.ExecutionException; + +/** + * Wraps any checked exceptions which occur during creation of an bean + * + * @author Pete Muir + */ +public class CreationException extends ExecutionException +{ + + private static final long serialVersionUID = 1002854668862145298L; + + public CreationException() + { + + } + + public CreationException(String message) + { + super(message); + } + + public CreationException(Throwable cause) + { + super(cause); + } + + public CreationException(String message, Throwable cause) + { + super(message, cause); + } + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/CreationException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Current.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,42 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.inject; + +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.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * The default binding type. + * + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +public @interface Current +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Disposes.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Disposes.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Disposes.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Disposes.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,41 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.inject; + +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that a parameter of a method of bean is the disposed parameter + * of a disposal method. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target(PARAMETER) +@Retention(RUNTIME) +@Documented +public @interface Disposes +{ + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/Disposes.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/IllegalProductException.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/IllegalProductException.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/IllegalProductException.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/IllegalProductException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,50 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package javax.enterprise.inject; + +import javax.inject.ExecutionException; + +/** + * Thrown if a producer method returns a null value or a producer field contains + * a null value, and the scope of the method or field is not @Dependent + */ +public class IllegalProductException extends ExecutionException +{ + + private static final long serialVersionUID = -6280627846071966243L; + + public IllegalProductException() + { + super(); + } + + public IllegalProductException(String message, Throwable cause) + { + super(message, cause); + } + + public IllegalProductException(String message) + { + super(message); + } + + public IllegalProductException(Throwable cause) + { + super(cause); + } + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/IllegalProductException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Initializer.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Initializer.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Initializer.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Initializer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject; + +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that a method of a bean is a bean initializer method, or that a + * constructor is the bean constructor. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { METHOD, CONSTRUCTOR }) +@Retention(RUNTIME) +@Documented +public @interface Initializer +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/Initializer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Instance.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject; + +import java.lang.annotation.Annotation; + +import javax.inject.DuplicateBindingTypeException; + + +/** + * An interface for looking up beans of a particular type. + * + * @author Gavin King + * + * @param <T> + * the type of the event object + */ + +public interface Instance<T> extends Iterable<T> +{ + /** + * Get an instance of a bean of the specified type. + * + * Additional binding annotations may be specified at the injection point. + * + * @param bindings + * Additional binding types + * @return an instance of a bean of the specified type + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + * @throws IllegalArgumentException + * if an instance of an annotation that is not a binding type is + * passed + * + */ + public T get(Annotation... bindings); +} Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Model.java (from rev 2700, ri/trunk/api/src/main/java/javax/webbeans/Model.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Model.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Model.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,26 @@ +package javax.enterprise.inject; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.context.RequestScoped; + +/** + * A stereotype for MVC model objects + * + * @author Gavin King + */ + +@Named +@RequestScoped +@Stereotype +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +public @interface Model +{ +} \ No newline at end of file Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Named.java (from rev 2700, ri/trunk/api/src/main/java/javax/annotation/Named.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Named.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Named.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies the name of a bean. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +public @interface Named +{ + + /** + * If no name is explicitly specified, the default name is used. + * + * For simple beans and session beans the default name is the unqualified + * class name of the bean class, after converting the first character to + * lower case. + * + * For producer methods the default name is the method name, unless the + * method follows the JavaBeans property getter naming convention, in which + * case the default name is the JavaBeans property name. + * + * @return the bean name + */ + public String value() default ""; + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/Named.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/New.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/New.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/New.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/New.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,41 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.inject; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * The special binding type. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { FIELD, PARAMETER }) +@Retention(RUNTIME) +@Documented +@BindingType +public @interface New +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/New.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/NonBinding.java (from rev 2700, ri/trunk/api/src/main/java/javax/annotation/NonBinding.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/NonBinding.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/NonBinding.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that a member of a binding type or interceptor binding type is to + * be ignored for the purposes of resolution. + * + * @author Gavin King + * + */ +@Retention(RUNTIME) +@Target(METHOD) +public @interface NonBinding +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/NonBinding.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Produces.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Produces.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Produces.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Produces.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * + * Specifies that a method of a bean is a producer method. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target({METHOD, FIELD}) +@Retention(RUNTIME) +@Documented +public @interface Produces +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/Produces.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Stereotype.java (from rev 2700, ri/trunk/api/src/main/java/javax/annotation/Stereotype.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Stereotype.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Stereotype.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,55 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.inject; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Annotation; +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that an annotation type is a stereotype. + * + * @author Pete Muir + * @author Gavin King + */ + +@Retention(RUNTIME) +@Target(ANNOTATION_TYPE) +@Documented +public @interface Stereotype +{ + + /** + * Restrict the scope of the stereotyped bean + * + * @return the allowed scopes + */ + public Class<? extends Annotation>[] supportedScopes() default {}; + + /** + * Require that stereotype beans have certain API types + * + * @return the required types + */ + public Class<?>[] requiredTypes() default {}; + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/Stereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/TypeLiteral.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/TypeLiteral.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/TypeLiteral.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/TypeLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,121 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.inject; + +import java.lang.reflect.GenericArrayType; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; + +/** + * Supports inline instantiation of objects that represent parameterized types + * with actual type parameters. + * + * @author Gavin King + * @author Pete Muir + * + * @param <T> + * the type, including all actual type parameters + */ +public abstract class TypeLiteral<T> +{ + + private Type actualType; + + protected TypeLiteral() + { + Class<?> typeLiteralSubclass = getTypeLiteralSubclass(this.getClass()); + if (typeLiteralSubclass == null) + { + throw new RuntimeException(getClass() + " is not a subclass of TypeLiteral"); + } + actualType = getTypeParameter(typeLiteralSubclass); + if (actualType == null) + { + throw new RuntimeException(getClass() + " is missing type parameter in TypeLiteral"); + } + } + + /** + * Get the actual type represented by type literal + * + * @return + */ + public final Type getType() + { + return actualType; + } + + /** + * Get the raw type represented by the type literal + * + * @return + */ + @SuppressWarnings("unchecked") + public final Class<T> getRawType() { + Type type = getType(); + if (type instanceof Class) + { + return (Class<T>) type; + } + else if (type instanceof ParameterizedType) + { + return (Class<T>) ((ParameterizedType) type).getRawType(); + } + else if (type instanceof GenericArrayType) + { + return (Class<T>) Object[].class; + } + else + { + throw new RuntimeException("Illegal type"); + } + } + + private static Class<?> getTypeLiteralSubclass(Class<?> clazz) + { + Class<?> superclass = clazz.getSuperclass(); + if (superclass.equals(TypeLiteral.class)) + { + return clazz; + } + else if (superclass.equals(Object.class)) + { + return null; + } + else + { + return (getTypeLiteralSubclass(superclass)); + } + } + + private static Type getTypeParameter(Class<?> superclass) + { + Type type = superclass.getGenericSuperclass(); + if (type instanceof ParameterizedType) + { + ParameterizedType parameterizedType = (ParameterizedType) type; + if (parameterizedType.getActualTypeArguments().length == 1) + { + return parameterizedType.getActualTypeArguments()[0]; + } + } + return null; + } + + // TODO: equals(), hashCode() +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/TypeLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/UnproxyableDependencyException.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,56 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package javax.enterprise.inject; + +import javax.inject.DeploymentException; + +/** + * Thrown if a bean has normal scope and the type cannot be proxied by the + * container + * + * @author Pete Muir + */ +public class UnproxyableResolutionException extends DeploymentException +{ + + private static final long serialVersionUID = 1667539354548135465L; + + public UnproxyableResolutionException() + { + super(); + } + + public UnproxyableResolutionException(String message, Throwable throwable) + { + super(message, throwable); + } + + public UnproxyableResolutionException(String message) + { + super(message); + } + + public UnproxyableResolutionException(Throwable throwable) + { + super(throwable); + } + + + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/UnsatisfiedDependencyException.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package javax.enterprise.inject; + +import javax.inject.DeploymentException; + +/** + * Thrown if no beans can be resolved + * + * @author Pete Muir + */ +public class UnsatisfiedResolutionException extends DeploymentException +{ + + private static final long serialVersionUID = 5350603312442756709L; + + public UnsatisfiedResolutionException() + { + super(); + } + + public UnsatisfiedResolutionException(String message, Throwable throwable) + { + super(message, throwable); + } + + public UnsatisfiedResolutionException(String message) + { + super(message); + } + + public UnsatisfiedResolutionException(Throwable throwable) + { + super(throwable); + } + + + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/DeploymentType.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,39 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.inject.deployment; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that an annotation type is a deployment type. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target(ANNOTATION_TYPE) +@Retention(RUNTIME) +@Documented +public @interface DeploymentType +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Production.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Production.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Production.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Production.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,42 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.inject.deployment; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * The default deployment type. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +public @interface Production +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Production.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Specializes.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Specializes.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Specializes.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Specializes.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,41 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.inject.deployment; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that an implementation class directly specializes its superclass, + * of that a producer method directly specializes the method it overrides. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target({TYPE, METHOD}) +@Retention(RUNTIME) +@Documented +public @interface Specializes +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Specializes.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Standard.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Standard.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Standard.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Standard.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,42 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.inject.deployment; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Deployment type for standard components defined by the JSR-299 specification. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +public @interface Standard +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Standard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Deployed.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject.spi; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.inject.BindingType; + +/** + * Event binding type for the event that is raised by the manager when + * it has completed resolving and validation + * + * @author Pete Muir + */ + +@BindingType +@Retention(RUNTIME) +@Target( { FIELD, PARAMETER }) +public @interface AfterBeanDiscovery +{ +} Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Bean.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Bean.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Bean.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Bean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,85 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject.spi; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Set; + +import javax.enterprise.context.spi.Contextual; + +public interface Bean<T> extends Contextual<T> +{ + + /** + * The client-visible types of a bean + * + * @return the bean types + */ + public Set<Type> getTypes(); + + /** + * The bindings of a bean + * + * @return the bindings + */ + public Set<Annotation> getBindings(); + + /** + * The scope of a bean + * + * @return the scope + */ + public Class<? extends Annotation> getScopeType(); + + /** + * The deployment type of a bean + * + * @return the deployment type + */ + public Class<? extends Annotation> getDeploymentType(); + + /** + * The name of a bean + * + * @return the name + */ + public String getName(); + + /** + * The serializability of a bean + * + * @return true if the bean is serializable + */ + public boolean isSerializable(); + + /** + * The nullability of a bean + * + * @return true if the bean is nullable + */ + public boolean isNullable(); + + /** + * The injection points of a bean + * + * @return the injection points of a bean + */ + public Set<InjectionPoint> getInjectionPoints(); + +} \ No newline at end of file Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Bean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Manager.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,453 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject.spi; + +import java.io.InputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.List; +import java.util.Set; + +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.AmbiguousResolutionException; +import javax.enterprise.inject.TypeLiteral; +import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.event.Observer; +import javax.inject.DuplicateBindingTypeException; + +/** + * The contract between the application and the manager. Also the contract + * between the manager and Bean, Context and Observer objects. + * + * The application should not normally need to call this interface. + * + * @author Gavin King + * @author Pete Muir + * + */ +public interface BeanManager +{ + + /** + * Allows beans to be matched to injection point by considering bean type, + * bindings, and deployment precedence. + * + * Typesafe resolution usually occurs at container deployment time. + * + * @param <T> + * the type of the beans to be resolved + * @param type + * the type of the beans to be resolved + * @param bindings + * the bindings used to restrict the matched beans + * @return the matched beans + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public <T> Set<Bean<T>> getBeans(Class<T> type, Annotation... bindings); + + /** + * Allows beans to be matched to injection point by considering bean type, + * bindings, and deployment precedence. + * + * Typesafe resolution usually occurs at container deployment time. + * + * @param <T> + * the type of the beans to be resolved + * @param type + * the type of the beans to be resolved + * @param bindings + * the bindings used to restrict the matched beans + * @return the matched beans + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public <T> Set<Bean<T>> getBeans(TypeLiteral<T> type, Annotation... bindings); + + /** + * Obtains an instance of a bean by considering bean type, bindings, and + * deployment precedence. + * + * @param <T> + * the type of the bean to obtain + * @param type + * the type of the bean to obtain + * @param bindings + * the bindings used to restrict the matched beans + * @return an instance of the bean + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + * @throws UnsatisfiedResolutionException + * if no bean can be resolved for the given type and bindings + * @throws AmbiguousResolutionException + * if more than one bean is resolved for the given type and + * bindings + */ + public <T> T getInstanceByType(Class<T> type, Annotation... bindings); + + /** + * Obtains an instance of a bean by considering bean type, bindings, and + * deployment precedence. + * + * @param <T> + * the type of the bean to obtain + * @param type + * the type of the bean to obtain + * @param bindings + * the bindings used to restrict the matched beans + * @return an instance of the bean + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + * @throws UnsatisfiedResolutionException + * if no bean can be resolved for the given type and bindings + * @throws AmbiguousResolutionException + * if more than one bean is resolved for the given type and + * bindings + */ + public <T> T getInstanceByType(TypeLiteral<T> type, Annotation... bindings); + + /** + * Allows beans to be matched by considering the bean name and deployment + * precedence. + * + * Used in an environment that doesn't support typing such EL. + * + * @param name + * the name used to restrict the beans matched + * @return the matched beans + */ + public Set<Bean<?>> getBeans(String name); + + /** + * Obtains an instance of a bean by considering the bean name and deployment + * precedence. + * + * Used in an environment that doesn't support typing such EL. + * + * @param name + * the name used to restrict the beans matched + * @return an instance of the bean or null if no beans matched + * @throws AmbiguousResolutionException + * if more than one bean matches + */ + public Object getInstanceByName(String name); + + /** + * Obtains an instance of a bean + * + * @param <T> + * the type of the bean + * @param bean + * the bean to obtain an instance of + * @return an instance of the bean + */ + public <T> T getInstance(Bean<T> bean); + + /** + * Obtains an instance of bean for a given injection point. + * + * This method should not be called by an application. + * + * @param <T> + * the type of the bean + * @param injectionPoint + * the injection point the instance is needed for + * @param creationalContext + * the context in which the injection is occurring + * @return an instance of the bean + * @throws UnsatisfiedResolutionException + * if no bean can be resolved for the given type and bindings + * @throws AmbiguousResolutionException + * if more than one bean is resolved for the given type and + * bindings + */ + public Object getInjectableReference(InjectionPoint injectionPoint, CreationalContext<?> creationalContext); + + /** + * Fire an event + * + * @param event + * the event object + * @param bindings + * the event bindings used to restrict the observers matched + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + */ + public void fireEvent(Object event, Annotation... bindings); + + /** + * Obtain an active context instance for the given scope type. + * + * @param scopeType + * the scope to get the context instance for + * @return the context instance + * @throws ContextNotActiveException + * if no active contexts exist for the given scope type + * @throws IllegalArgumentException + * if more than one active context exists for the given scope type + */ + public Context getContext(Class<? extends Annotation> scopeType); + + /** + * Associate a custom Context with a scope. + * + * This method may be called at any time in the applications lifecycle. + * + * @param context + * the context to register + * @return the manager the context was registered with + */ + public BeanManager addContext(Context context); + + /** + * Allows a new bean to be registered. + * + * This method may be called at any time in the applications lifecycle. + * + * @param bean + * the bean to register + * @return the manager the bean was registered with + */ + public BeanManager addBean(Bean<?> bean); + + /** + * Allows a new interceptor to be registered. + * + * This method may be called at any time in the applications lifecycle. + * + * @param abstractInterceptor + * the interceptor to register + * @return the manager the interceptor was registered with + */ + public BeanManager addInterceptor(Interceptor abstractInterceptor); + + /** + * Allows a new decorator to be registered. + * + * This method may be called at any time in the applications lifecycle. + * + * @param abstractDecorator + * the decorator to register + * @return the manager the decorator was registered with + */ + public BeanManager addDecorator(Decorator abstractDecorator); + + /** + * Allows additional XML based to be provided. + * + * This method may be called at any time in the applications lifecycle. + * + * @param xmlStream + * the XML metadata + * @return the manager the XML metadata was registered with + */ + public BeanManager parse(InputStream xmlStream); + + /** + * Create a new child activity. A child activity inherits all beans, + * interceptors, decorators, observers, and contexts defined by its direct + * and indirect parent activities. + * + * This method should not be called by the application. + * + * @return the child activity + */ + public BeanManager createActivity(); + + /** + * Associate an activity with the current context for a normal scope + * + * @param scopeType + * the scope to associate the activity with + * @return the activity + * @throws ContextNotActiveException + * if the given scope is inactive + * @throws IllegalArgumentException + * if the given scope is not a normal scope + */ + public BeanManager setCurrent(Class<? extends Annotation> scopeType); + + /** + * Register an observer with the container + * + * @param <T> + * the type of the observer + * @param observer + * the observer to register + * @param eventType + * the event type the observer observes + * @param bindings + * event bindings to further restrict the events observed + * @return the manager the observer was registered with + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public <T> BeanManager addObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings); + + /** + * Register an observer with the container + * + * @param <T> + * the type of the observer + * @param observer + * the observer to register + * @param eventType + * the event type the observer observes + * @param bindings + * event bindings to further restrict the events observed + * @return the manager the observer was registered with + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a event binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public <T> BeanManager addObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings); + + /** + * Remove an observer registration + * + * @param <T> + * the type of the observer + * @param observer + * the observer to register + * @param eventType + * the event type the observer obseres + * @param bindings + * event bindings to further restrict the events observed + * @return the manager the observer was registered with + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a event binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public <T> BeanManager removeObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings); + + /** + * Remove an observer registration + * + * @param <T> + * the type of the observer + * @param observer + * the observer to register + * @param eventType + * the event type the observer obseres + * @param bindings + * event bindings to further restrict the events observed + * @return the manager the observer was registered with + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a event binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public <T> BeanManager removeObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings); + + /** + * Obtains observers for an event by considering event type and bindings. + * + * @param <T> + * the type of the event to obtain + * @param event + * the event object + * @param bindings + * the bindings used to restrict the matched observers + * @return the resolved observers + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a event binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings); + + /** + * Obtains an ordered list of enabled interceptors for a set interceptor + * bindings + * + * @param type + * the type of the interception + * @param bindings + * the bindings used to restrict the matched interceptors + * @return the resolved interceptors + * @throws IllegalArgumentException + * if no interceptor binding type is passed + * @throws IllegalArgumentException + * if an annotation which is not a interceptor binding type is + * passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public List<Interceptor<?>> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings); + + /** + * Obtains an ordered list of enabled decorators for a set of bean types and + * a set of bindings + * + * @param types + * the set of bean types of the decorated bean + * @param bindings + * the bindings declared by the decorated bean + * @return the resolved decorators + * @throws IllegalArgumentException + * if the set of bean types is empty + * @throws IllegalArgumentException + * if an annotation which is not a binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public List<Decorator<?>> resolveDecorators(Set<Type> types, Annotation... bindings); + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Initialized.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject.spi; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.inject.BindingType; + +/** + * Event binding type for the event that is raised by the manager when + * it has completed discovery and bean creation + * + * @author Pete Muir + */ +@BindingType +@Retention(RUNTIME) +@Target( { FIELD, PARAMETER }) +public @interface BeforeBeanDiscovery +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Decorator.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Decorator.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Decorator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject.spi; + +import java.lang.annotation.Annotation; +import java.util.Set; + +public interface Decorator<T> extends Bean<T> +{ + + /** + * Obtains the type of the decorated bean + * + * @return + */ + public Class<?> getDelegateType(); + + /** + * Obtains the bindings of the decorated bean + * + * @return + */ + public Set<Annotation> getDelegateBindings(); + + /** + * Injects the delegate + * + * @param instance the instance to inject the delegate into + * @param delegate the delegate to inject + */ + public void setDelegate(Object instance, Object delegate); + +} \ No newline at end of file Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Decorator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/InjectionPoint.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,109 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject.spi; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Member; +import java.lang.reflect.Type; +import java.util.Set; + + + +/** + * + * Provides access to metadata about the injection point into which a dependent + * object is injected. + * + * @author Gavin King + * @author Pete Muir + */ +public interface InjectionPoint +{ + + /** + * Get the declared type of injection point + * + * If the injection point is declared in XML, the type and binding types are + * determined according to Section 10.8, �Specifying API types and binding + * types�. + * + * @return the declared type of the injection point + */ + public Type getType(); + + /** + * Get the declared binding types of the injection point + * + * If the injection point is declared in XML, the type and binding types are + * determined according to Section 10.8, �Specifying API types and binding + * types�. + * + * @return the declared binding types of the injection point + */ + public Set<Annotation> getBindings(); + + /** + * Get the Bean object representing the Web Bean that defines the injection + * point + * + * @return the Bean object representing the Web Bean that defines the + * injection point + */ + public Bean<?> getBean(); + + /** + * Get the Field object in the case of field injection, the Method object in + * the case of method parameter injection or the Constructor object in the + * case of constructor parameter injection. + * + * @return the member being injected into + */ + public Member getMember(); + + /** + * Get the annotation instance for the given annotation type of the field in + * the case of field injection, or annotations of the parameter in the case + * of method parameter or constructor parameter injection. + * + * @param <T> + * the type of the annotation + * @param annotationType + * the type of the annotation + * @return the annotation of the specified annotationType, or null if no such + * annotation exists + */ + public <T extends Annotation> T getAnnotation(Class<T> annotationType); + + /** + * Get the annotations of the field in the case of field injection, or + * annotations of the parameter in the case of method parameter or + * constructor parameter injection. + * + * @return the annotations of the field + */ + public Annotation[] getAnnotations(); + + /** + * Determine if the specified annotation is present on the injection point + * + * @param annotationType + * the type of the annotation + * @return true if an annotation of the specified type is present, else false + */ + public boolean isAnnotationPresent(Class<? extends Annotation> annotationType); +} Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InterceptionType.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/InterceptionType.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InterceptionType.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InterceptionType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject.spi; + +/** + * Identifies the kind of lifecycle callback or business method + * + * @author Pete Muir + * + */ +public enum InterceptionType +{ + + /** + * Intercepts method invocation + */ + AROUND_INVOKE, + + /** + * Intercepts bean construction + */ + POST_CONSTRUCT, + + /** + * Intercepts bean destruction + */ + PRE_DESTROY, + + /** + * Intercepts bean passivation + */ + PRE_PASSIVATE, + + /** + * Intercepts bean activation + */ + POST_ACTIVATE +} \ No newline at end of file Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InterceptionType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Interceptor.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Interceptor.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Interceptor.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Interceptor.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject.spi; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Set; + + +public interface Interceptor<T> extends Bean<T> +{ + + /** + * The interceptor bindings used to bind an interceptor to a bean + * + * @return the interceptor bindings + */ + public Set<Annotation> getInterceptorBindingTypes(); + + /** + * The interceptor method for the specified lifecycle callback or business + * method + * + * @param type + * the interception type + * @return the method, or null if the interceptor does not intercept + * lifecycle callbacks or business methods + */ + public Method getMethod(InterceptionType type); + +} \ No newline at end of file Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Interceptor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/api/src/main/java/javax/event/Fires.java =================================================================== --- ri/trunk/api/src/main/java/javax/event/Fires.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/event/Fires.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,7 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; /** * Annotates a variable to be injected with an Event object that can be fired and Deleted: ri/trunk/api/src/main/java/javax/inject/AmbiguousDependencyException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/AmbiguousDependencyException.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/AmbiguousDependencyException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package javax.inject; - -/** - * An AmbiguousDependencyException is thrown when within the set of enabled - * beans with the API type and bind- ing types declared there exists no unique - * Web Bean with a higher precedence than all other beans in the set. - * - * - * @author Pete Muir - */ -public class AmbiguousDependencyException extends DeploymentException -{ - - private static final long serialVersionUID = -2132733164534544788L; - - public AmbiguousDependencyException() - { - } - - public AmbiguousDependencyException(String message, Throwable throwable) - { - super(message, throwable); - } - - public AmbiguousDependencyException(String message) - { - super(message); - } - - public AmbiguousDependencyException(Throwable throwable) - { - super(throwable); - } - -} Deleted: ri/trunk/api/src/main/java/javax/inject/AnnotationLiteral.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/AnnotationLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/AnnotationLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,171 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package javax.inject; - -import java.lang.annotation.Annotation; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; - - -/** - * Supports inline instantiation of annotation type instances. - * - * @author Pete Muir - * @author Gavin King - * - * @param <T> - * the annotation type - */ -public abstract class AnnotationLiteral<T extends Annotation> implements - Annotation -{ - - private Class<T> annotationType; - private Method[] members; - - protected AnnotationLiteral() - { - Class<?> annotationLiteralSubclass = getAnnotationLiteralSubclass(this.getClass()); - if (annotationLiteralSubclass == null) - { - throw new RuntimeException(getClass() + "is not a subclass of AnnotationLiteral "); - } - - annotationType = getTypeParameter(annotationLiteralSubclass); - - if (annotationType == null) - { - throw new RuntimeException(getClass() + " is missing type parameter in AnnotationLiteral"); - } - - this.members = annotationType.getDeclaredMethods(); - } - - private static Class<?> getAnnotationLiteralSubclass(Class<?> clazz) - { - Class<?> superclass = clazz.getSuperclass(); - if (superclass.equals(AnnotationLiteral.class)) - { - return clazz; - } - else if (superclass.equals(Object.class)) - { - return null; - } - else - { - return (getAnnotationLiteralSubclass(superclass)); - } - } - - @SuppressWarnings("unchecked") - private static <T> Class<T> getTypeParameter(Class<?> annotationLiteralSuperclass) - { - Type type = annotationLiteralSuperclass.getGenericSuperclass(); - if (type instanceof ParameterizedType) - { - ParameterizedType parameterizedType = (ParameterizedType) type; - if (parameterizedType.getActualTypeArguments().length == 1) - { - return (Class<T>) parameterizedType - .getActualTypeArguments()[0]; - } - } - return null; - } - - public Class<? extends Annotation> annotationType() - { - return annotationType; - } - - @Override - public String toString() - { - String string = "@" + annotationType().getName() + "("; - for (int i = 0; i < members.length; i++) - { - string += members[i].getName() + "="; - string += invoke(members[i], this); - if (i < members.length - 1) - { - string += ","; - } - } - return string + ")"; - } - - @Override - public boolean equals(Object other) - { - if (other instanceof Annotation) - { - Annotation that = (Annotation) other; - if (this.annotationType().equals(that.annotationType())) - { - for (Method member : members) - { - Object thisValue = invoke(member, this); - Object thatValue = invoke(member, that); - if (!thisValue.equals(thatValue)) - { - return false; - } - } - return true; - } - } - return false; - } - - @Override - public int hashCode() - { - int hashCode = 0; - for (Method member : members) - { - int memberNameHashCode = 127 * member.getName().hashCode(); - int memberValueHashCode = invoke(member, this).hashCode(); - hashCode += memberNameHashCode ^ memberValueHashCode; - } - return hashCode; - } - - private static Object invoke(Method method, Object instance) - { - try - { - method.setAccessible(true); - return method.invoke(instance); - } - catch (IllegalArgumentException e) - { - throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); - } - catch (IllegalAccessException e) - { - throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); - } - catch (InvocationTargetException e) - { - throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); - } - } -} Deleted: ri/trunk/api/src/main/java/javax/inject/BindingType.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/BindingType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/BindingType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,40 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package javax.inject; - -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * - * Specifies that an annotation type is a binding type. - * - * @author Pete Muir - * @author Gavin King - */ - -@Target(ANNOTATION_TYPE) -@Retention(RUNTIME) -@Documented -public @interface BindingType -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/CreationException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/CreationException.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/CreationException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,50 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package javax.inject; - -/** - * Wraps any checked exceptions which occur during creation of an bean - * - * @author Pete Muir - */ -public class CreationException extends ExecutionException -{ - - private static final long serialVersionUID = 1002854668862145298L; - - public CreationException() - { - - } - - public CreationException(String message) - { - super(message); - } - - public CreationException(Throwable cause) - { - super(cause); - } - - public CreationException(String message, Throwable cause) - { - super(message, cause); - } - -} Deleted: ri/trunk/api/src/main/java/javax/inject/Current.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Current.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Current.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,42 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package javax.inject; - -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.ElementType.FIELD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * The default binding type. - * - * @author Pete Muir - */ - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -public @interface Current -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/DeploymentType.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/DeploymentType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/DeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,39 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package javax.inject; - -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that an annotation type is a deployment type. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target(ANNOTATION_TYPE) -@Retention(RUNTIME) -@Documented -public @interface DeploymentType -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/Disposes.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Disposes.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Disposes.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,41 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package javax.inject; - -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that a parameter of a method of bean is the disposed parameter - * of a disposal method. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target(PARAMETER) -@Retention(RUNTIME) -@Documented -public @interface Disposes -{ - -} Deleted: ri/trunk/api/src/main/java/javax/inject/IllegalProductException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/IllegalProductException.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/IllegalProductException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,48 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package javax.inject; - -/** - * Thrown if a producer method returns a null value or a producer field contains - * a null value, and the scope of the method or field is not @Dependent - */ -public class IllegalProductException extends ExecutionException -{ - - private static final long serialVersionUID = -6280627846071966243L; - - public IllegalProductException() - { - super(); - } - - public IllegalProductException(String message, Throwable cause) - { - super(message, cause); - } - - public IllegalProductException(String message) - { - super(message); - } - - public IllegalProductException(Throwable cause) - { - super(cause); - } - -} Deleted: ri/trunk/api/src/main/java/javax/inject/Initializer.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Initializer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Initializer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package javax.inject; - -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that a method of a bean is a bean initializer method, or that a - * constructor is the bean constructor. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { METHOD, CONSTRUCTOR }) -@Retention(RUNTIME) -@Documented -public @interface Initializer -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/Instance.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Instance.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Instance.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,50 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package javax.inject; - -import java.lang.annotation.Annotation; - - -/** - * An interface for looking up beans of a particular type. - * - * @author Gavin King - * - * @param <T> - * the type of the event object - */ - -public interface Instance<T> -{ - /** - * Get an instance of a bean of the specified type. - * - * Additional binding annotations may be specified at the injection point. - * - * @param bindings - * Additional binding types - * @return an instance of a bean of the specified type - * @throws DuplicateBindingTypeException - * if two instances of the same binding type are passed - * @throws IllegalArgumentException - * if an instance of an annotation that is not a binding type is - * passed - * - */ - public T get(Annotation... bindings); -} Deleted: ri/trunk/api/src/main/java/javax/inject/New.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/New.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/New.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,41 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package javax.inject; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * The special binding type. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { FIELD, PARAMETER }) -@Retention(RUNTIME) -@Documented -@BindingType -public @interface New -{ -} Modified: ri/trunk/api/src/main/java/javax/inject/Obtains.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Obtains.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Obtains.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,6 +26,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import javax.enterprise.inject.BindingType; + /** * Annotates a variable to be injected with an Instance object. * Deleted: ri/trunk/api/src/main/java/javax/inject/Produces.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Produces.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Produces.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package javax.inject; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * - * Specifies that a method of a bean is a producer method. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target({METHOD, FIELD}) -@Retention(RUNTIME) -@Documented -public @interface Produces -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/Production.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Production.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Production.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,42 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package javax.inject; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * The default deployment type. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -public @interface Production -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/Specializes.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Specializes.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Specializes.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,41 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package javax.inject; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that an implementation class directly specializes its superclass, - * of that a producer method directly specializes the method it overrides. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target({TYPE, METHOD}) -@Retention(RUNTIME) -@Documented -public @interface Specializes -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/Standard.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Standard.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Standard.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,42 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package javax.inject; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Deployment type for standard components defined by the JSR-299 specification. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -public @interface Standard -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/TypeLiteral.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/TypeLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/TypeLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,121 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package javax.inject; - -import java.lang.reflect.GenericArrayType; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; - -/** - * Supports inline instantiation of objects that represent parameterized types - * with actual type parameters. - * - * @author Gavin King - * @author Pete Muir - * - * @param <T> - * the type, including all actual type parameters - */ -public abstract class TypeLiteral<T> -{ - - private Type actualType; - - protected TypeLiteral() - { - Class<?> typeLiteralSubclass = getTypeLiteralSubclass(this.getClass()); - if (typeLiteralSubclass == null) - { - throw new RuntimeException(getClass() + " is not a subclass of TypeLiteral"); - } - actualType = getTypeParameter(typeLiteralSubclass); - if (actualType == null) - { - throw new RuntimeException(getClass() + " is missing type parameter in TypeLiteral"); - } - } - - /** - * Get the actual type represented by type literal - * - * @return - */ - public final Type getType() - { - return actualType; - } - - /** - * Get the raw type represented by the type literal - * - * @return - */ - @SuppressWarnings("unchecked") - public final Class<T> getRawType() { - Type type = getType(); - if (type instanceof Class) - { - return (Class<T>) type; - } - else if (type instanceof ParameterizedType) - { - return (Class<T>) ((ParameterizedType) type).getRawType(); - } - else if (type instanceof GenericArrayType) - { - return (Class<T>) Object[].class; - } - else - { - throw new RuntimeException("Illegal type"); - } - } - - private static Class<?> getTypeLiteralSubclass(Class<?> clazz) - { - Class<?> superclass = clazz.getSuperclass(); - if (superclass.equals(TypeLiteral.class)) - { - return clazz; - } - else if (superclass.equals(Object.class)) - { - return null; - } - else - { - return (getTypeLiteralSubclass(superclass)); - } - } - - private static Type getTypeParameter(Class<?> superclass) - { - Type type = superclass.getGenericSuperclass(); - if (type instanceof ParameterizedType) - { - ParameterizedType parameterizedType = (ParameterizedType) type; - if (parameterizedType.getActualTypeArguments().length == 1) - { - return parameterizedType.getActualTypeArguments()[0]; - } - } - return null; - } - - // TODO: equals(), hashCode() -} Deleted: ri/trunk/api/src/main/java/javax/inject/UnproxyableDependencyException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/UnproxyableDependencyException.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/UnproxyableDependencyException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package javax.inject; - -/** - * Thrown if a bean has normal scope and the type cannot be proxied by the - * container - * - * @author Pete Muir - */ -public class UnproxyableDependencyException extends DeploymentException -{ - - private static final long serialVersionUID = 1667539354548135465L; - - public UnproxyableDependencyException() - { - super(); - } - - public UnproxyableDependencyException(String message, Throwable throwable) - { - super(message, throwable); - } - - public UnproxyableDependencyException(String message) - { - super(message); - } - - public UnproxyableDependencyException(Throwable throwable) - { - super(throwable); - } - - - -} Deleted: ri/trunk/api/src/main/java/javax/inject/UnsatisfiedDependencyException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/UnsatisfiedDependencyException.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/UnsatisfiedDependencyException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package javax.inject; - -/** - * Thrown if no beans can be resolved - * - * @author Pete Muir - */ -public class UnsatisfiedDependencyException extends DeploymentException -{ - - private static final long serialVersionUID = 5350603312442756709L; - - public UnsatisfiedDependencyException() - { - super(); - } - - public UnsatisfiedDependencyException(String message, Throwable throwable) - { - super(message, throwable); - } - - public UnsatisfiedDependencyException(String message) - { - super(message); - } - - public UnsatisfiedDependencyException(Throwable throwable) - { - super(throwable); - } - - - -} Modified: ri/trunk/api/src/main/java/javax/interceptor/Interceptor.java =================================================================== --- ri/trunk/api/src/main/java/javax/interceptor/Interceptor.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/interceptor/Interceptor.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -23,7 +23,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; /** * Specifies that a class is an interceptor. Modified: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java =================================================================== --- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,7 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; /** * The conversation context concurrent access wait timeout on a lock Modified: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java =================================================================== --- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,7 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; /** * The conversation id request parameter name Modified: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java =================================================================== --- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,7 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; /** * The conversation context inactivity timeout Modified: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java =================================================================== --- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,7 +18,7 @@ import java.util.Set; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; /** * A conversation manager responsible for starting, resuming and ending conversations Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,22 +26,23 @@ import java.util.List; import java.util.Set; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.AmbiguousResolutionException; +import javax.enterprise.inject.Instance; +import javax.enterprise.inject.New; +import javax.enterprise.inject.UnproxyableResolutionException; +import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.InjectionPoint; import javax.event.Event; import javax.event.Fires; -import javax.inject.AmbiguousDependencyException; import javax.inject.DefinitionException; import javax.inject.InconsistentSpecializationException; -import javax.inject.Instance; -import javax.inject.New; import javax.inject.NullableDependencyException; import javax.inject.Obtains; -import javax.inject.UnproxyableDependencyException; -import javax.inject.UnsatisfiedDependencyException; import javax.inject.UnserializableDependencyException; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; +import org.jboss.webbeans.bean.BaseBean; import org.jboss.webbeans.bean.NewEnterpriseBean; import org.jboss.webbeans.bean.NewSimpleBean; import org.jboss.webbeans.bean.RIBean; @@ -77,7 +78,7 @@ */ public void validate() { - final List<Bean<?>> specializedBeans = new ArrayList<Bean<?>>(); + final List<BaseBean<?>> specializedBeans = new ArrayList<BaseBean<?>>(); for (Bean<?> bean : manager.getBeans()) { for (InjectionPoint injectionPoint : bean.getInjectionPoints()) @@ -108,16 +109,16 @@ Set<?> resolvedBeans = manager.resolveByType(annotatedItem, injectionPoint, bindings); if (resolvedBeans.isEmpty()) { - throw new UnsatisfiedDependencyException("The injection point " + injectionPoint + " with binding types " + Names.annotationsToString(injectionPoint.getBindings()) + " in " + bean + " has unsatisfied dependencies with binding types "); + throw new UnsatisfiedResolutionException("The injection point " + injectionPoint + " with binding types " + Names.annotationsToString(injectionPoint.getBindings()) + " in " + bean + " has unsatisfied dependencies with binding types "); } if (resolvedBeans.size() > 1) { - throw new AmbiguousDependencyException("The injection point " + injectionPoint + " with binding types " + Names.annotationsToString(injectionPoint.getBindings()) + " in " + bean + " has ambiguous dependencies"); + throw new AmbiguousResolutionException("The injection point " + injectionPoint + " with binding types " + Names.annotationsToString(injectionPoint.getBindings()) + " in " + bean + " has ambiguous dependencies"); } Bean<?> resolvedBean = (Bean<?>) resolvedBeans.iterator().next(); if (manager.getServices().get(MetaDataCache.class).getScopeModel(resolvedBean.getScopeType()).isNormal() && !Proxies.isTypeProxyable(injectionPoint.getType())) { - throw new UnproxyableDependencyException("The injection point " + injectionPoint + " has non-proxyable dependencies"); + throw new UnproxyableResolutionException("The injection point " + injectionPoint + " has non-proxyable dependencies"); } if (Reflections.isPrimitive(annotatedItem.getRawType()) && resolvedBean.isNullable()) { @@ -147,7 +148,7 @@ boolean normalScoped = manager.getServices().get(MetaDataCache.class).getScopeModel(bean.getScopeType()).isNormal(); if (normalScoped && !Beans.isBeanProxyable(bean)) { - throw new UnproxyableDependencyException("Normal scoped bean " + bean + " is not proxyable"); + throw new UnproxyableResolutionException("Normal scoped bean " + bean + " is not proxyable"); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -25,7 +25,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.inject.TypeLiteral; +import javax.enterprise.inject.TypeLiteral; import org.jboss.webbeans.bootstrap.api.Singleton; import org.jboss.webbeans.bootstrap.api.SingletonProvider; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,9 +18,10 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import java.util.Iterator; import java.util.Set; -import javax.inject.Instance; +import javax.enterprise.inject.Instance; import org.jboss.webbeans.injection.resolution.ResolvableAnnotatedClass; @@ -59,8 +60,8 @@ * @param bindings The binding types * @return The instance * - * @see javax.inject.Instance#get(Annotation...) - * @see javax.inject.manager.Manager#getInstanceByType(Class, Annotation...) + * @see javax.enterprise.inject.Instance#get(Annotation...) + * @see javax.enterprise.inject.spi.BeanManager#getInstanceByType(Class, Annotation...) */ public T get(Annotation... bindings) { @@ -79,4 +80,10 @@ return "Obtainable instance for type " + type + " and binding types " + bindings; } + public Iterator<T> iterator() + { + // TODO Auto-generated method stub + return null; + } + } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -40,26 +40,28 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.context.Context; -import javax.context.ContextNotActiveException; -import javax.context.CreationalContext; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.AmbiguousResolutionException; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.TypeLiteral; +import javax.enterprise.inject.UnproxyableResolutionException; +import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.deployment.Standard; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.Decorator; +import javax.enterprise.inject.spi.InjectionPoint; +import javax.enterprise.inject.spi.InterceptionType; +import javax.enterprise.inject.spi.Interceptor; import javax.event.Observer; -import javax.inject.AmbiguousDependencyException; -import javax.inject.BindingType; import javax.inject.DeploymentException; import javax.inject.DuplicateBindingTypeException; -import javax.inject.Production; -import javax.inject.Standard; -import javax.inject.TypeLiteral; -import javax.inject.UnproxyableDependencyException; -import javax.inject.UnsatisfiedDependencyException; -import javax.inject.manager.Bean; -import javax.inject.manager.Decorator; -import javax.inject.manager.InjectionPoint; -import javax.inject.manager.InterceptionType; -import javax.inject.manager.Interceptor; -import javax.inject.manager.Manager; +import org.jboss.webbeans.bean.AbstractDecorator; +import org.jboss.webbeans.bean.AbstractInterceptor; import org.jboss.webbeans.bean.DisposalMethodBean; import org.jboss.webbeans.bean.EnterpriseBean; import org.jboss.webbeans.bean.NewEnterpriseBean; @@ -188,7 +190,7 @@ * ******************************** */ private transient final ThreadLocal<Stack<InjectionPoint>> currentInjectionPoint; - private transient List<Bean<?>> beans; + private transient List<Bean<?>> beanWithManagers; private final transient Namespace rootNamespace; private final transient ConcurrentSetMultiMap<Type, EventObserver<?>> registeredObservers; private final transient Set<ManagerImpl> childActivities; @@ -275,7 +277,7 @@ ) { this.services = serviceRegistry; - this.beans = beans; + this.beanWithManagers = beans; this.newEnterpriseBeans = newEnterpriseBeans; this.riBeans = riBeans; this.clientProxyProvider = clientProxyProvider; @@ -331,16 +333,16 @@ * @param bean The bean to register * @return A reference to manager * - * @see javax.inject.manager.Manager#addBean(javax.inject.manager.Bean) + * @see javax.enterprise.inject.spi.BeanManager#addBean(javax.inject.manager.Bean) */ - public Manager addBean(Bean<?> bean) + public BeanManager addBean(Bean<?> bean) { - if (beans.contains(bean)) + if (beanWithManagers.contains(bean)) { return this; } resolver.clear(); - beans.add(bean); + beanWithManagers.add(bean); registerBeanNamespace(bean); for (ManagerImpl childActivity : childActivities) { @@ -360,7 +362,7 @@ public <T> Set<DisposalMethodBean<T>> resolveDisposalBeans(Class<T> apiType, Annotation... bindings) { // Correct? - Set<Bean<T>> beans = resolveByType(apiType, bindings); + Set<Bean<T>> beans = getBeans(apiType, bindings); Set<DisposalMethodBean<T>> disposalBeans = new HashSet<DisposalMethodBean<T>>(); for (Bean<T> bean : beans) if (bean instanceof DisposalMethodBean) @@ -375,7 +377,7 @@ * @param bindings The binding types to match * @return The set of matching observers * - * @see javax.inject.manager.Manager#resolveObservers(java.lang.Object, + * @see javax.enterprise.inject.spi.BeanManager#resolveObservers(java.lang.Object, * java.lang.annotation.Annotation[]) */ public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings) @@ -454,10 +456,10 @@ * @param bindings The binding types to match * @return The set of matching beans * - * @see javax.inject.manager.Manager#resolveByType(java.lang.Class, + * @see javax.enterprise.inject.spi.BeanManager#getBeans(java.lang.Class, * java.lang.annotation.Annotation[]) */ - public <T> Set<Bean<T>> resolveByType(Class<T> type, Annotation... bindings) + public <T> Set<Bean<T>> getBeans(Class<T> type, Annotation... bindings) { return resolveByType(ResolvableAnnotatedClass.of(type, bindings), bindings); } @@ -469,10 +471,10 @@ * @param bindings The binding types to match * @return The set of matching beans * - * @see javax.inject.manager.Manager#resolveByType(javax.inject.TypeLiteral, + * @see javax.enterprise.inject.spi.BeanManager#getBeans(javax.enterprise.inject.TypeLiteral, * java.lang.annotation.Annotation[]) */ - public <T> Set<Bean<T>> resolveByType(TypeLiteral<T> type, Annotation... bindings) + public <T> Set<Bean<T>> getBeans(TypeLiteral<T> type, Annotation... bindings) { return resolveByType(ResolvableAnnotatedClass.of(type, bindings), bindings); } @@ -546,7 +548,7 @@ { synchronized (beans) { - this.beans = new CopyOnWriteArrayList<Bean<?>>(beans); + this.beanWithManagers = new CopyOnWriteArrayList<Bean<?>>(beans); for (RIBean<?> bean : beans) { if (bean instanceof NewEnterpriseBean) @@ -591,7 +593,7 @@ */ public List<Bean<?>> getBeans() { - return Collections.unmodifiableList(beans); + return Collections.unmodifiableList(beanWithManagers); } public Map<String, RIBean<?>> getRiBeans() @@ -605,9 +607,9 @@ * @param context The context to add * @return A reference to the manager * - * @see javax.inject.manager.Manager#addContext(javax.context.Context) + * @see javax.enterprise.inject.spi.BeanManager#addContext(javax.enterprise.context.spi.Context) */ - public Manager addContext(Context context) + public BeanManager addContext(Context context) { contexts.put(context.getScopeType(), context); return this; @@ -616,12 +618,12 @@ /** * Registers a decorator with the manager * - * @param decorator The decorator to register + * @param abstractDecorator The decorator to register * @return A reference to the manager * - * @see javax.inject.manager.Manager#addDecorator(javax.inject.manager.Decorator) + * @see javax.enterprise.inject.spi.BeanManager#addDecorator(org.jboss.webbeans.bean.AbstractDecorator) */ - public Manager addDecorator(Decorator decorator) + public BeanManager addDecorator(Decorator abstractDecorator) { throw new UnsupportedOperationException("Not yet implemented"); } @@ -629,17 +631,17 @@ /** * Registers an interceptor with the manager * - * @param interceptor The interceptor to register + * @param abstractInterceptor The interceptor to register * @return A reference to the manager * - * @see javax.inject.manager.Manager#addInterceptor(javax.inject.manager.Interceptor) + * @see javax.enterprise.inject.spi.BeanManager#addInterceptor(org.jboss.webbeans.bean.AbstractInterceptor) */ - public Manager addInterceptor(Interceptor interceptor) + public BeanManager addInterceptor(Interceptor abstractInterceptor) { throw new UnsupportedOperationException("Not yet implemented"); } - public <T> Manager addObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings) + public <T> BeanManager addObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings) { return addObserverByType(observer, eventType, bindings); } @@ -651,12 +653,12 @@ * @param observer * @return */ - public <T> Manager addObserver(ObserverImpl<T> observer) + public <T> BeanManager addObserver(ObserverImpl<T> observer) { return addObserverByType(observer, observer.getEventType(), observer.getBindingsAsArray()); } - public <T> Manager addObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings) + public <T> BeanManager addObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings) { return addObserverByType(observer, eventType.getType(), bindings); } @@ -670,7 +672,7 @@ * @param bindings * @return */ - public <T> Manager addObserverByType(Observer<T> observer, Type eventType, Annotation... bindings) + public <T> BeanManager addObserverByType(Observer<T> observer, Type eventType, Annotation... bindings) { checkEventType(eventType); this.eventManager.addObserver(observer, eventType, bindings); @@ -687,7 +689,7 @@ * @param event The event object to pass along * @param bindings The binding types to match * - * @see javax.inject.manager.Manager#fireEvent(java.lang.Object, + * @see javax.enterprise.inject.spi.BeanManager#fireEvent(java.lang.Object, * java.lang.annotation.Annotation[]) */ public void fireEvent(Object event, Annotation... bindings) @@ -721,7 +723,7 @@ * @param scopeType The scope to match * @return A single active context of the given scope * - * @see javax.inject.manager.Manager#getContext(java.lang.Class) + * @see javax.enterprise.inject.spi.BeanManager#getContext(java.lang.Class) */ public Context getContext(Class<? extends Annotation> scopeType) { @@ -750,7 +752,7 @@ * @param bean The bean to instantiate * @return An instance of the bean * - * @see javax.inject.manager.Manager#getInstance(javax.inject.manager.Bean) + * @see javax.enterprise.inject.spi.BeanManager#getInstance(javax.inject.manager.Bean) */ public <T> T getInstance(Bean<T> bean) { @@ -775,10 +777,10 @@ * @param bean The bean to instantiate * @return An instance of the bean * - * @see javax.inject.manager.Manager#getInstance(javax.inject.manager.Bean) + * @see javax.enterprise.inject.spi.BeanManager#getInstance(javax.inject.manager.Bean) */ @SuppressWarnings("unchecked") - private <T> T getInstance(Bean<T> bean, CreationalContextImpl<T> creationalContext) + private <T> T getInstance(Bean<T> bean, CreationalContextImpl<?> creationalContext) { if (specializedBeans.containsKey(bean)) { @@ -788,7 +790,7 @@ { if (creationalContext != null || (creationalContext == null && getContext(bean.getScopeType()).get(bean) != null)) { - return clientProxyProvider.getClientProxy(this, bean); + return (T) clientProxyProvider.getClientProxy(this, bean); } else { @@ -797,13 +799,13 @@ } else { - return getContext(bean.getScopeType()).get(bean, creationalContext); + return getContext(bean.getScopeType()).get((Bean<T>)bean, (CreationalContext<T>)creationalContext); } } - public <T> T getInstanceToInject(InjectionPoint injectionPoint) + public Object getInstanceToInject(InjectionPoint injectionPoint) { - return this.<T> getInstanceToInject(injectionPoint, null); + return this.getInjectableReference(injectionPoint, null); } public void injectNonContextualInstance(Object instance) @@ -812,7 +814,7 @@ } @SuppressWarnings("unchecked") - public <T> T getInstanceToInject(InjectionPoint injectionPoint, CreationalContext<?> creationalContext) + public Object getInjectableReference(InjectionPoint injectionPoint, CreationalContext<?> creationalContext) { boolean registerInjectionPoint = !injectionPoint.getType().equals(InjectionPoint.class); try @@ -821,11 +823,11 @@ { currentInjectionPoint.get().push(injectionPoint); } - AnnotatedItem<T, ?> element = ResolvableAnnotatedClass.of(injectionPoint.getType(), injectionPoint.getBindings().toArray(new Annotation[0])); - Bean<T> resolvedBean = getBeanByType(element, element.getBindingsAsArray()); + AnnotatedItem<?, ?> element = ResolvableAnnotatedClass.of(injectionPoint.getType(), injectionPoint.getBindings().toArray(new Annotation[0])); + Bean<?> resolvedBean = getBeanByType(element, element.getBindingsAsArray()); if (getServices().get(MetaDataCache.class).getScopeModel(resolvedBean.getScopeType()).isNormal() && !Proxies.isTypeProxyable(injectionPoint.getType())) { - throw new UnproxyableDependencyException("Attempting to inject an unproxyable normal scoped bean " + resolvedBean + " into " + injectionPoint); + throw new UnproxyableResolutionException("Attempting to inject an unproxyable normal scoped bean " + resolvedBean + " into " + injectionPoint); } if (creationalContext instanceof CreationalContextImpl) { @@ -860,18 +862,18 @@ * @param name The name to match * @return An instance of the bean * - * @see javax.inject.manager.Manager#getInstanceByName(java.lang.String) + * @see javax.enterprise.inject.spi.BeanManager#getInstanceByName(java.lang.String) */ public Object getInstanceByName(String name) { - Set<Bean<?>> beans = resolveByName(name); + Set<Bean<?>> beans = getBeans(name); if (beans.size() == 0) { return null; } else if (beans.size() > 1) { - throw new AmbiguousDependencyException("Resolved multiple Web Beans with " + name); + throw new AmbiguousResolutionException("Resolved multiple Web Beans with " + name); } else { @@ -886,7 +888,7 @@ * @param bindings The binding types to match * @return An instance of the bean * - * @see javax.inject.manager.Manager#getInstanceByType(java.lang.Class, + * @see javax.enterprise.inject.spi.BeanManager#getInstanceByType(java.lang.Class, * java.lang.annotation.Annotation[]) */ public <T> T getInstanceByType(Class<T> type, Annotation... bindings) @@ -901,7 +903,7 @@ * @param bindings The binding types to match * @return An instance of the bean * - * @see javax.inject.manager.Manager#getInstanceByType(javax.inject.TypeLiteral, + * @see javax.enterprise.inject.spi.BeanManager#getInstanceByType(javax.enterprise.inject.TypeLiteral, * java.lang.annotation.Annotation[]) */ public <T> T getInstanceByType(TypeLiteral<T> type, Annotation... bindings) @@ -927,17 +929,17 @@ Set<Bean<T>> beans = resolveByType(element, bindings); if (beans.size() == 0) { - throw new UnsatisfiedDependencyException(element + "Unable to resolve any Web Beans"); + throw new UnsatisfiedResolutionException(element + "Unable to resolve any Web Beans"); } else if (beans.size() > 1) { - throw new AmbiguousDependencyException(element + "Resolved multiple Web Beans"); + throw new AmbiguousResolutionException(element + "Resolved multiple Web Beans"); } Bean<T> bean = beans.iterator().next(); boolean normalScoped = getServices().get(MetaDataCache.class).getScopeModel(bean.getScopeType()).isNormal(); if (normalScoped && !Beans.isBeanProxyable(bean)) { - throw new UnproxyableDependencyException("Normal scoped bean " + bean + " is not proxyable"); + throw new UnproxyableResolutionException("Normal scoped bean " + bean + " is not proxyable"); } return bean; } @@ -950,10 +952,10 @@ * @param bindings the binding types to match * @return A reference to the manager * - * @see javax.inject.manager.Manager#removeObserver(javax.event.Observer, + * @see javax.enterprise.inject.spi.BeanManager#removeObserver(javax.event.Observer, * java.lang.Class, java.lang.annotation.Annotation[]) */ - public <T> Manager removeObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings) + public <T> BeanManager removeObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings) { this.eventManager.removeObserver(observer, eventType, bindings); return this; @@ -967,10 +969,10 @@ * @param bindings the binding types to match * @return A reference to the manager * - * @see javax.inject.manager.Manager#removeObserver(javax.event.Observer, - * javax.inject.TypeLiteral, java.lang.annotation.Annotation[]) + * @see javax.enterprise.inject.spi.BeanManager#removeObserver(javax.event.Observer, + * javax.enterprise.inject.TypeLiteral, java.lang.annotation.Annotation[]) */ - public <T> Manager removeObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings) + public <T> BeanManager removeObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings) { this.eventManager.removeObserver(observer, eventType.getRawType(), bindings); return this; @@ -982,9 +984,9 @@ * @param The name to match * @return The set of matching beans * - * @see javax.inject.manager.Manager#resolveByName(java.lang.String) + * @see javax.enterprise.inject.spi.BeanManager#getBeans(java.lang.String) */ - public Set<Bean<?>> resolveByName(String name) + public Set<Bean<?>> getBeans(String name) { return resolver.get(name); } @@ -996,10 +998,10 @@ * @param bindings The binding types to match * @return A list of matching decorators * - * @see javax.inject.manager.Manager#resolveDecorators(java.util.Set, + * @see javax.enterprise.inject.spi.BeanManager#resolveDecorators(java.util.Set, * java.lang.annotation.Annotation[]) */ - public List<Decorator> resolveDecorators(Set<Type> types, Annotation... bindings) + public List<Decorator<?>> resolveDecorators(Set<Type> types, Annotation... bindings) { throw new UnsupportedOperationException(); } @@ -1012,10 +1014,10 @@ * @param interceptorBindings The binding types to match * @return A list of matching interceptors * - * @see javax.inject.manager.Manager#resolveInterceptors(javax.inject.manager.InterceptionType, + * @see javax.enterprise.inject.spi.BeanManager#resolveInterceptors(javax.enterprise.inject.spi.InterceptionType, * java.lang.annotation.Annotation[]) */ - public List<Interceptor> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings) + public List<Interceptor<?>> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings) { throw new UnsupportedOperationException(); } @@ -1047,7 +1049,7 @@ return buffer.toString(); } - public Manager parse(InputStream xmlStream) + public BeanManager parse(InputStream xmlStream) { throw new UnsupportedOperationException(); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/WebBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/WebBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/WebBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,7 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; /** * Deployment type for Web Beans beans Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,15 +24,15 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.deployment.Specializes; +import javax.enterprise.inject.deployment.Standard; +import javax.enterprise.inject.spi.Bean; import javax.event.Event; -import javax.inject.BindingType; import javax.inject.DefinitionException; -import javax.inject.Specializes; -import javax.inject.Standard; -import javax.inject.manager.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; @@ -265,7 +265,7 @@ for (AnnotatedInjectionPoint<?, ?> injectionPoint : getAnnotatedInjectionPoints()) { Annotation[] bindings = injectionPoint.getMetaAnnotationsAsArray(BindingType.class); - Bean<?> resolvedBean = manager.resolveByType(injectionPoint.getRawType(), bindings).iterator().next(); + Bean<?> resolvedBean = manager.getBeans(injectionPoint.getRawType(), bindings).iterator().next(); if (passivating) { if (Dependent.class.equals(resolvedBean.getScopeType()) && !resolvedBean.isSerializable() && (((injectionPoint instanceof AnnotatedField) && !((AnnotatedField<?>) injectionPoint).isTransient()) || (injectionPoint instanceof AnnotatedParameter)) ) @@ -370,7 +370,7 @@ * * @return The set of binding types * - * @see javax.inject.manager.Bean#getBindings() + * @see org.jboss.webbeans.bean.BaseBean#getBindings() */ @Override public Set<Annotation> getBindings() @@ -393,7 +393,7 @@ * * @return The deployment type * - * @see javax.inject.manager.Bean#getDeploymentType() + * @see org.jboss.webbeans.bean.BaseBean#getDeploymentType() */ @Override public Class<? extends Annotation> getDeploymentType() @@ -422,7 +422,7 @@ * * @return The name * - * @see javax.inject.manager.Bean#getName() + * @see org.jboss.webbeans.bean.BaseBean#getName() */ @Override public String getName() @@ -435,7 +435,7 @@ * * @return The scope type * - * @see javax.inject.manager.Bean#getScopeType() + * @see org.jboss.webbeans.bean.BaseBean#getScopeType() */ @Override public Class<? extends Annotation> getScopeType() @@ -459,7 +459,7 @@ * * @return The set of API types * - * @see javax.inject.manager.Bean#getTypes() + * @see org.jboss.webbeans.bean.BaseBean#getTypes() */ @Override public Set<Type> getTypes() @@ -484,7 +484,7 @@ * * @return True if nullable, false otherwise * - * @see javax.inject.manager.Bean#isNullable() + * @see org.jboss.webbeans.bean.BaseBean#isNullable() */ @Override public boolean isNullable() Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,17 +20,17 @@ import java.util.HashSet; import java.util.Set; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.context.ScopeType; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.ScopeType; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.CreationException; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.DeploymentType; +import javax.enterprise.inject.deployment.Production; import javax.event.Observes; -import javax.inject.CreationException; import javax.inject.DefinitionException; -import javax.inject.DeploymentType; -import javax.inject.Disposes; -import javax.inject.Initializer; -import javax.inject.Produces; -import javax.inject.Production; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractDecorator.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Decorator.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractDecorator.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractDecorator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.webbeans.bean; + +import java.lang.annotation.Annotation; +import java.util.Set; + +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.Decorator; + + +/** + * The Bean object for a a decorator + * + * This interface should not be called directly by the application. + * + * @author Pete Muir + * + */ +public abstract class AbstractDecorator extends BaseBean<Object> implements Decorator<Object> +{ + + /** + * Create an interceptor bean + * + * @param beanManager + * the manager to create the interceptor for + */ + protected AbstractDecorator(BeanManager beanManager) + { + super(beanManager); + } + + /* (non-Javadoc) + * @see javax.enterprise.inject.spi.Decorator#getDelegateType() + */ + public abstract Class<?> getDelegateType(); + + /* (non-Javadoc) + * @see javax.enterprise.inject.spi.Decorator#getDelegateBindings() + */ + public abstract Set<Annotation> getDelegateBindings(); + + /* (non-Javadoc) + * @see javax.enterprise.inject.spi.Decorator#setDelegate(java.lang.Object, java.lang.Object) + */ + public abstract void setDelegate(Object instance, Object delegate); + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractDecorator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractInterceptor.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Interceptor.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractInterceptor.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractInterceptor.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.webbeans.bean; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Set; + +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InterceptionType; +import javax.enterprise.inject.spi.Interceptor; + + +/** + * The contract between the manager and a interceptor. + * + * This interface should not be called directly by the application. + * + * @author Pete Muir + * + */ +public abstract class AbstractInterceptor extends BaseBean<Object> implements Interceptor<Object> +{ + + /** + * Create an interceptor bean + * + * @param beanManager + * the manager to create the interceptor for + */ + protected AbstractInterceptor(BeanManager beanManager) + { + super(beanManager); + } + + /* (non-Javadoc) + * @see javax.inject.manager.Interceptor#getInterceptorBindingTypes() + */ + public abstract Set<Annotation> getInterceptorBindingTypes(); + + /* (non-Javadoc) + * @see javax.inject.manager.Interceptor#getMethod(javax.inject.manager.InterceptionType) + */ + public abstract Method getMethod(InterceptionType type); + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractInterceptor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -28,15 +28,15 @@ import java.util.HashSet; import java.util.Set; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.context.ScopeType; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.ScopeType; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.IllegalProductException; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.DeploymentType; +import javax.enterprise.inject.spi.InjectionPoint; import javax.inject.DefinitionException; -import javax.inject.DeploymentType; -import javax.inject.IllegalProductException; -import javax.inject.Initializer; -import javax.inject.Produces; -import javax.inject.manager.InjectionPoint; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/BaseBean.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Bean.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/BaseBean.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/BaseBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,100 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.webbeans.bean; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Set; + +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InjectionPoint; + +/** + * The contract between the manager and a bean. This interface + * should not be called directly by the application. + * + * @author Gavin King + * + * @param <T> an API type of the bean + */ +public abstract class BaseBean<T> implements Bean<T> +{ + private final BeanManager beanManager; + + /** + * Create an instance of a bean + * + * @param beanManager + */ + protected BaseBean(BeanManager beanManager) + { + this.beanManager = beanManager; + } + + /** + * Get the manager used to create this bean + * + * @return an instance of the manager + */ + protected BeanManager getManager() + { + return beanManager; + } + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#getTypes() + */ + public abstract Set<Type> getTypes(); + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#getBindings() + */ + public abstract Set<Annotation> getBindings(); + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#getScopeType() + */ + public abstract Class<? extends Annotation> getScopeType(); + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#getDeploymentType() + */ + public abstract Class<? extends Annotation> getDeploymentType(); + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#getName() + */ + public abstract String getName(); + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#isSerializable() + */ + public abstract boolean isSerializable(); + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#isNullable() + */ + public abstract boolean isNullable(); + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#getInjectionPoints() + */ + public abstract Set<InjectionPoint> getInjectionPoints(); + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/BaseBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,16 +24,16 @@ import java.util.List; import java.util.Set; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.context.ScopeType; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.ScopeType; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.DeploymentType; +import javax.enterprise.inject.spi.InjectionPoint; import javax.event.Observes; import javax.inject.DefinitionException; -import javax.inject.DeploymentType; -import javax.inject.Disposes; -import javax.inject.Initializer; -import javax.inject.Produces; -import javax.inject.manager.InjectionPoint; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,11 +26,11 @@ import javassist.util.proxy.ProxyFactory; import javassist.util.proxy.ProxyObject; -import javax.context.ApplicationScoped; -import javax.context.CreationalContext; import javax.decorator.Decorator; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.CreationException; import javax.event.Observes; -import javax.inject.CreationException; import javax.inject.DefinitionException; import javax.interceptor.Interceptor; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,10 +20,10 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; -import javax.inject.manager.Manager; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InjectionPoint; /** * A delegating bean @@ -32,17 +32,17 @@ * * @param <T> */ -public abstract class ForwardingBean<T> extends Bean<T> +public abstract class ForwardingBean<T> extends BaseBean<T> { /** * Constructor * - * @param manager The Web Beans manager + * @param beanManager The Web Beans manager */ - public ForwardingBean(Manager manager) + public ForwardingBean(BeanManager beanManager) { - super(manager); + super(beanManager); } /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,8 +21,8 @@ import java.util.HashSet; import java.util.Set; -import javax.context.Dependent; -import javax.inject.Standard; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.deployment.Standard; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,8 +21,8 @@ import java.util.HashSet; import java.util.Set; -import javax.context.Dependent; -import javax.inject.Standard; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.deployment.Standard; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedClass; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,7 +18,7 @@ import java.lang.reflect.Field; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,11 +21,11 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.CreationException; +import javax.enterprise.inject.Disposes; import javax.event.Observes; -import javax.inject.CreationException; import javax.inject.DefinitionException; -import javax.inject.Disposes; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,9 +21,8 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; -import javax.context.Dependent; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; @@ -34,7 +33,7 @@ * * @author Pete Muir */ -public abstract class RIBean<T> extends Bean<T> +public abstract class RIBean<T> extends BaseBean<T> { private static final ConcurrentMap<String, AtomicInteger> ids = new ConcurrentHashMap<String, AtomicInteger>(); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,9 +22,9 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.Initializer; import javax.inject.DefinitionException; -import javax.inject.Initializer; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -27,9 +27,9 @@ import javassist.util.proxy.ProxyFactory; import javassist.util.proxy.ProxyObject; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.inject.Production; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.deployment.Production; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.RIBean; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/ConnectionContextual.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/ConnectionContextual.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/ConnectionContextual.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,8 +18,8 @@ import java.io.Serializable; -import javax.context.Contextual; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; import javax.inject.ExecutionException; import javax.jms.Connection; import javax.jms.JMSException; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,7 +18,7 @@ import java.lang.reflect.Method; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; import javax.jms.Connection; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageConsumerContextual.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageConsumerContextual.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageConsumerContextual.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,8 +18,8 @@ import java.io.Serializable; -import javax.context.Contextual; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; import javax.inject.ExecutionException; import javax.jms.JMSException; import javax.jms.MessageConsumer; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageProducerContextual.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageProducerContextual.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageProducerContextual.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,8 +18,8 @@ import java.io.Serializable; -import javax.context.Contextual; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; import javax.inject.ExecutionException; import javax.jms.JMSException; import javax.jms.MessageProducer; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/SessionContextual.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/SessionContextual.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/SessionContextual.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,8 +18,8 @@ import java.io.Serializable; -import javax.context.Contextual; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; import javax.inject.ExecutionException; import javax.jms.JMSException; import javax.jms.Session; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,8 +21,8 @@ import javassist.util.proxy.MethodHandler; -import javax.context.Context; -import javax.inject.manager.Bean; +import javax.enterprise.context.spi.Context; +import javax.enterprise.inject.spi.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.context.CreationalContextImpl; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,8 +24,8 @@ import javassist.util.proxy.ProxyFactory; +import javax.enterprise.inject.spi.Bean; import javax.inject.DefinitionException; -import javax.inject.manager.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.util.Proxies; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,8 +22,8 @@ import java.util.HashSet; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.context.DependentContext; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,8 +22,8 @@ import java.util.HashSet; import java.util.Set; -import javax.context.Dependent; -import javax.inject.Standard; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.deployment.Standard; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.RIBean; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,10 +22,10 @@ import java.util.HashSet; import java.util.Set; +import javax.enterprise.inject.TypeLiteral; import javax.event.Event; import javax.event.Fires; import javax.inject.Obtains; -import javax.inject.TypeLiteral; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.event.EventImpl; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InjectionPointBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InjectionPointBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InjectionPointBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,8 +21,8 @@ import java.util.HashSet; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.ManagerImpl; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,9 +22,9 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.Instance; +import javax.enterprise.inject.Instance; +import javax.enterprise.inject.TypeLiteral; import javax.inject.Obtains; -import javax.inject.TypeLiteral; import org.jboss.webbeans.InstanceImpl; import org.jboss.webbeans.ManagerImpl; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/ManagerBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/ManagerBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/ManagerBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,15 +21,15 @@ import java.util.HashSet; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.Manager; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.BeanManager; import org.jboss.webbeans.ManagerImpl; public class ManagerBean extends AbstractStandardBean<ManagerImpl> { - private static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(ManagerImpl.class, Manager.class)); + private static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(ManagerImpl.class, BeanManager.class)); public static final ManagerBean of(ManagerImpl manager) { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,14 +21,14 @@ import java.util.HashSet; import java.util.Set; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.enterprise.inject.deployment.DeploymentType; import javax.event.Observes; -import javax.inject.BindingType; -import javax.inject.DeploymentType; -import javax.inject.Disposes; -import javax.inject.Initializer; -import javax.inject.Produces; import javax.inject.Realizes; -import javax.inject.UnsatisfiedDependencyException; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.AbstractClassBean; @@ -164,7 +164,7 @@ for(DisposalMethodBean<?> bean: all) { buff.append(bean.toString()); } - throw new UnsatisfiedDependencyException(buff.toString()); + throw new UnsatisfiedResolutionException(buff.toString()); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,7 +18,7 @@ import java.lang.annotation.Annotation; -import javax.context.Context; +import javax.enterprise.context.spi.Context; /** * Common Context operation @@ -57,7 +57,7 @@ * * @return The scope type * - * @see javax.context.Context#getScopeType() + * @see javax.enterprise.context.spi.Context#getScopeType() */ public Class<? extends Annotation> getScopeType() { @@ -69,7 +69,7 @@ * * @return The active state * - * @see javax.context.Context#isActive() + * @see javax.enterprise.context.spi.Context#isActive() */ public boolean isActive() { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -19,11 +19,11 @@ import java.lang.annotation.Annotation; import java.util.concurrent.locks.ReentrantLock; -import javax.context.ContextNotActiveException; -import javax.context.Contextual; -import javax.context.CreationalContext; -import javax.inject.manager.Bean; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; +import org.jboss.webbeans.bean.BaseBean; import org.jboss.webbeans.context.api.BeanStore; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; @@ -63,7 +63,7 @@ * @return An instance of the bean * @throws ContextNotActiveException if the context is not active * - * @see javax.context.Context#get(Bean, boolean) + * @see javax.enterprise.context.spi.Context#get(BaseBean, boolean) */ public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext) { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.bootstrap.api.Service; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextualInstance.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextualInstance.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextualInstance.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.context; -import javax.context.Contextual; +import javax.enterprise.context.spi.Contextual; /** * A representation of a contextual bean plus associated instance Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,7 +22,7 @@ */ package org.jboss.webbeans.context; -import javax.context.ConversationScoped; +import javax.enterprise.context.ConversationScoped; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.bootstrap.api.Service; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -19,8 +19,8 @@ import java.util.HashMap; import java.util.Map; -import javax.context.CreationalContext; -import javax.inject.manager.Bean; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; public class CreationalContextImpl<T> implements CreationalContext<T> { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,10 +24,10 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.context.ContextNotActiveException; -import javax.context.Contextual; -import javax.context.CreationalContext; -import javax.context.Dependent; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.bootstrap.api.Service; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,7 +22,7 @@ */ package org.jboss.webbeans.context; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.bootstrap.api.Service; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,7 +22,7 @@ */ package org.jboss.webbeans.context; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.bootstrap.api.Service; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,7 +20,7 @@ import java.util.Enumeration; import java.util.List; -import javax.context.Contextual; +import javax.enterprise.context.spi.Contextual; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.context.api.BeanStore; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/BeanStoreNamingScheme.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/BeanStoreNamingScheme.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/BeanStoreNamingScheme.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.context.beanstore; -import javax.context.Contextual; +import javax.enterprise.context.spi.Contextual; /** * Interface against a BeanStore to handle different naming schemes Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/PrefixBeanStoreNamingScheme.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/PrefixBeanStoreNamingScheme.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/PrefixBeanStoreNamingScheme.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.context.beanstore; -import javax.context.Contextual; +import javax.enterprise.context.spi.Contextual; import org.jboss.webbeans.CurrentManager; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/AbstractConversationManager.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/AbstractConversationManager.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/AbstractConversationManager.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -29,8 +29,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Future; -import javax.context.Conversation; -import javax.inject.Current; +import javax.enterprise.context.Conversation; +import javax.enterprise.inject.Current; import org.jboss.webbeans.context.ConversationContext; import org.jboss.webbeans.context.api.BeanStore; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; import org.jboss.webbeans.context.ConversationContext; import org.jboss.webbeans.context.api.BeanStore; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,11 +16,11 @@ */ package org.jboss.webbeans.conversation; -import javax.annotation.Named; -import javax.context.Conversation; -import javax.context.RequestScoped; -import javax.inject.Initializer; -import javax.inject.Standard; +import javax.enterprise.context.Conversation; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Standard; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; @@ -29,7 +29,7 @@ * The current conversation implementation * * @author Nicklas Karlsson - * @see javax.context.Conversation + * @see javax.enterprise.context.Conversation */ @RequestScoped @Named("javax.context.conversation") Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,7 +22,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; import org.jboss.webbeans.WebBean; import org.jboss.webbeans.log.LogProvider; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -19,7 +19,7 @@ import java.io.Serializable; import java.util.concurrent.atomic.AtomicInteger; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; import org.jboss.webbeans.WebBean; import org.jboss.webbeans.log.LogProvider; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,8 +24,8 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Produces; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Produces; import javax.servlet.http.HttpSession; import org.jboss.webbeans.CurrentManager; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.List; +import javax.enterprise.inject.Current; import javax.event.Observer; -import javax.inject.Current; import javax.inject.DuplicateBindingTypeException; import org.jboss.webbeans.ManagerImpl; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,19 +22,19 @@ import java.lang.reflect.WildcardType; import java.util.List; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; import javax.event.Asynchronously; import javax.event.IfExists; import javax.event.Observer; import javax.event.ObserverException; import javax.event.Observes; import javax.inject.DefinitionException; -import javax.inject.Disposes; -import javax.inject.Initializer; -import javax.inject.Produces; -import javax.inject.manager.Bean; import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.bean.BaseBean; import org.jboss.webbeans.bean.RIBean; import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.context.DependentInstancesStore; @@ -57,7 +57,7 @@ */ public class ObserverImpl<T> implements Observer<T> { - protected final Bean<?> observerBean; + protected final BaseBean<?> observerBean; protected final MethodInjectionPoint<?> observerMethod; private final boolean conditional; private final boolean asynchronous; @@ -73,7 +73,7 @@ * @param observerBean The observer bean * @param manager The Web Beans manager */ - protected ObserverImpl(final AnnotatedMethod<?> observer, final Bean<?> observerBean, final ManagerImpl manager) + protected ObserverImpl(final AnnotatedMethod<?> observer, final BaseBean<?> observerBean, final ManagerImpl manager) { this.manager = manager; this.observerBean = observerBean; @@ -206,7 +206,7 @@ manager.getTaskExecutor().execute(deferredEvent); } - private <B> B getInstance(Bean<B> observerBean) + private <B> B getInstance(BaseBean<B> observerBean) { return manager.getInstance(observerBean, !isConditional()); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -25,10 +25,10 @@ import javax.event.Asynchronously; import javax.event.BeforeTransactionCompletion; import javax.inject.DefinitionException; -import javax.inject.manager.Bean; import javax.transaction.Synchronization; import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.bean.BaseBean; import org.jboss.webbeans.introspector.AnnotatedMethod; import org.jboss.webbeans.transaction.spi.TransactionServices; @@ -72,7 +72,7 @@ * @param observerBean The bean declaring the observer method * @param manager The JCDI manager in use */ - protected TransactionalObserverImpl(AnnotatedMethod<?> observer, Bean<?> observerBean, ManagerImpl manager) + protected TransactionalObserverImpl(AnnotatedMethod<?> observer, BaseBean<?> observerBean, ManagerImpl manager) { super(observer, observerBean, manager); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/AnnotatedInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/AnnotatedInjectionPoint.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/AnnotatedInjectionPoint.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.injection; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.introspector.AnnotatedItem; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -27,8 +27,8 @@ import java.util.List; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.Bean; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedConstructor; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Exceptions.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Exceptions.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Exceptions.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,7 +18,7 @@ import java.lang.reflect.InvocationTargetException; -import javax.inject.CreationException; +import javax.enterprise.inject.CreationException; import javax.inject.ExecutionException; class Exceptions Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,8 +22,8 @@ import java.lang.reflect.Field; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.Bean; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedField; @@ -73,7 +73,7 @@ { try { - delegate().set(declaringInstance, manager.getInstanceToInject(this, creationalContext)); + delegate().set(declaringInstance, manager.getInjectableReference(this, creationalContext)); } catch (IllegalArgumentException e) { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,8 +26,8 @@ import java.util.List; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.Bean; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedMethod; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,13 +22,14 @@ import java.util.Set; import java.util.concurrent.Callable; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.inject.Standard; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.deployment.Standard; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.bean.BaseBean; import org.jboss.webbeans.context.ApplicationContext; import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.resources.ClassTransformer; @@ -47,7 +48,7 @@ { this.instances = new ConcurrentCache<Class<?>, Set<FieldInjectionPoint<?>>>(); this.manager = manager; - nonContextualBean = new Bean<Object>(manager) + nonContextualBean = new BaseBean<Object>(manager) { @Override Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,8 +20,8 @@ import java.lang.reflect.Member; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.Bean; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedParameter; @@ -77,9 +77,10 @@ throw new UnsupportedOperationException(); } + @SuppressWarnings("unchecked") public T getValueToInject(ManagerImpl manager, CreationalContext<?> creationalContext) { - return manager.<T>getInstanceToInject(this, creationalContext); + return (T) manager.getInjectableReference(this, creationalContext); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.TypeLiteral; +import javax.enterprise.inject.TypeLiteral; import org.jboss.webbeans.introspector.AnnotationStore; import org.jboss.webbeans.introspector.jlr.AbstractAnnotatedItem; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,8 +26,8 @@ import java.util.TreeSet; import java.util.concurrent.Callable; -import javax.inject.TypeLiteral; -import javax.inject.manager.Bean; +import javax.enterprise.inject.TypeLiteral; +import javax.enterprise.inject.spi.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.standard.EventBean; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,10 +22,10 @@ import java.util.HashSet; import java.util.Set; -import javax.annotation.Stereotype; -import javax.context.ScopeType; -import javax.inject.BindingType; -import javax.inject.DeploymentType; +import javax.enterprise.context.ScopeType; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.deployment.DeploymentType; /** * AnnotatedItem provides a uniform access to the annotations on an annotated Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,6 +24,7 @@ import java.util.List; import java.util.Set; +import javax.enterprise.inject.Disposes; import javax.event.AfterTransactionCompletion; import javax.event.AfterTransactionFailure; import javax.event.AfterTransactionSuccess; @@ -32,7 +33,6 @@ import javax.event.Fires; import javax.event.IfExists; import javax.event.Observes; -import javax.inject.Disposes; /** * AnnotatedType provides a uniform access to the annotations on an annotated Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.introspector; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; /** @@ -31,10 +31,10 @@ /** * Gets the actual value of the parameter from the manager * - * @param manager The Web Beans manager + * @param beanManager The Web Beans manager * @return The value */ - public T getValue(Manager manager); + public T getValue(BeanManager beanManager); public AnnotatedMember<?, ?> getDeclaringMember(); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; import org.jboss.webbeans.literal.CurrentLiteral; import org.jboss.webbeans.util.collections.multi.SetHashMultiMap; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.introspector; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; public abstract class ForwardingAnnotatedParameter<T> extends ForwardingAnnotatedItem<T, Object> implements AnnotatedParameter<T> { @@ -29,9 +29,9 @@ return delegate().getDeclaringMember(); } - public T getValue(Manager manager) + public T getValue(BeanManager beanManager) { - return delegate().getValue(manager); + return delegate().getValue(beanManager); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,8 +20,8 @@ import java.lang.reflect.Modifier; import java.lang.reflect.Type; -import javax.inject.BindingType; -import javax.inject.manager.Manager; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.spi.BeanManager; import org.jboss.webbeans.introspector.AnnotatedMember; import org.jboss.webbeans.introspector.AnnotationStore; @@ -103,12 +103,12 @@ /** * Gets the current value of the member * - * @param manager The Web Beans manager + * @param beanManager The Web Beans manager * @return The current value */ - public T getValue(Manager manager) + public T getValue(BeanManager beanManager) { - return manager.getInstanceByType(getRawType(), getMetaAnnotationsAsArray(BindingType.class)); + return beanManager.getInstanceByType(getRawType(), getMetaAnnotationsAsArray(BindingType.class)); } /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,8 +20,8 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.inject.BindingType; -import javax.inject.manager.Manager; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.spi.BeanManager; import org.jboss.webbeans.introspector.AnnotatedMember; import org.jboss.webbeans.introspector.AnnotatedParameter; @@ -110,14 +110,14 @@ /** * Gets the current value * - * @param manager The Web Beans manager + * @param beanManager The Web Beans manager * @return the value * * @see org.jboss.webbeans.introspector.AnnotatedParameter */ - public T getValue(Manager manager) + public T getValue(BeanManager beanManager) { - return manager.getInstanceByType(getRawType(), getMetaAnnotationsAsArray(BindingType.class)); + return beanManager.getInstanceByType(getRawType(), getMetaAnnotationsAsArray(BindingType.class)); } /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/ConversationAwareViewHandler.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/ConversationAwareViewHandler.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/ConversationAwareViewHandler.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,10 +1,10 @@ package org.jboss.webbeans.jsf; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; +import javax.enterprise.inject.spi.BeanManager; import javax.faces.application.ViewHandler; import javax.faces.application.ViewHandlerWrapper; import javax.faces.context.FacesContext; -import javax.inject.manager.Manager; import org.jboss.webbeans.CurrentManager; @@ -51,8 +51,8 @@ public String getActionURL(FacesContext context, String viewId) { String actionUrl = super.getActionURL(context, viewId); - Manager manager = CurrentManager.rootManager(); - Conversation conversation = manager.getInstanceByType(Conversation.class); + BeanManager beanManager = CurrentManager.rootManager(); + Conversation conversation = beanManager.getInstanceByType(Conversation.class); if (conversation.isLongRunning()) { return new FacesUrlTransformer(actionUrl).appendConversationIdIfNecessary(conversation.getId()).getUrl(); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/FacesUrlTransformer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/FacesUrlTransformer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/FacesUrlTransformer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.jsf; +import javax.enterprise.inject.AnnotationLiteral; import javax.faces.context.FacesContext; -import javax.inject.AnnotationLiteral; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.conversation.ConversationIdName; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,8 +16,8 @@ */ package org.jboss.webbeans.jsf; +import javax.enterprise.inject.AnnotationLiteral; import javax.faces.context.FacesContext; -import javax.inject.AnnotationLiteral; import javax.servlet.http.HttpSession; import org.jboss.webbeans.CurrentManager; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,7 +22,7 @@ */ package org.jboss.webbeans.jsf; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; import javax.faces.event.PhaseEvent; import javax.faces.event.PhaseId; import javax.faces.event.PhaseListener; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,8 +16,8 @@ */ package org.jboss.webbeans.literal; -import javax.inject.AnnotationLiteral; -import javax.inject.Current; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.Current; /** * Annotation literal for @Current Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,15 +16,15 @@ */ package org.jboss.webbeans.literal; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Deployed; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.AfterBeanDiscovery; /** * Annotation literal for @Deployed * * @author Nicklas Karlsson */ -public class DeployedLiteral extends AnnotationLiteral<Deployed> implements Deployed +public class DeployedLiteral extends AnnotationLiteral<AfterBeanDiscovery> implements AfterBeanDiscovery { } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/FiresLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/FiresLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/FiresLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,8 +16,8 @@ */ package org.jboss.webbeans.literal; +import javax.enterprise.inject.AnnotationLiteral; import javax.event.Fires; -import javax.inject.AnnotationLiteral; public class FiresLiteral extends AnnotationLiteral<Fires> implements Fires { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,15 +16,15 @@ */ package org.jboss.webbeans.literal; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Initialized; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; /** * Annotation literal for @Initialized * * @author Pete Muir */ -public class InitializedLiteral extends AnnotationLiteral<Initialized> implements Initialized +public class InitializedLiteral extends AnnotationLiteral<BeforeBeanDiscovery> implements BeforeBeanDiscovery { } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,8 +16,8 @@ */ package org.jboss.webbeans.literal; -import javax.inject.AnnotationLiteral; -import javax.inject.New; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.New; /** * Annotation literal for @Current Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ObtainsLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ObtainsLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ObtainsLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.literal; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; import javax.inject.Obtains; public class ObtainsLiteral extends AnnotationLiteral<Obtains> implements Obtains Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,8 +20,8 @@ import java.lang.reflect.InvocationTargetException; import java.util.Set; -import javax.annotation.NonBinding; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.NonBinding; import javax.inject.DefinitionException; import javax.inject.ExecutionException; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/ScopeModel.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/ScopeModel.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/ScopeModel.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,7 +18,7 @@ import java.lang.annotation.Annotation; -import javax.context.ScopeType; +import javax.enterprise.context.ScopeType; import org.jboss.webbeans.resources.ClassTransformer; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,12 +21,12 @@ import java.util.HashSet; import java.util.Set; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.ScopeType; -import javax.inject.BindingType; +import javax.enterprise.context.ScopeType; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.deployment.DeploymentType; import javax.inject.DefinitionException; -import javax.inject.DeploymentType; import javax.interceptor.InterceptorBindingType; import org.jboss.webbeans.resources.ClassTransformer; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationPropagationFilter.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationPropagationFilter.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationPropagationFilter.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,7 +18,7 @@ import java.io.IOException; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,8 +16,8 @@ */ package org.jboss.webbeans.servlet; -import javax.context.RequestScoped; -import javax.inject.Produces; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; import javax.servlet.http.HttpSession; import org.jboss.webbeans.WebBean; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -19,10 +19,10 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.Bean; import javax.inject.DefinitionException; -import javax.inject.Produces; -import javax.inject.manager.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.EnterpriseBean; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -32,7 +32,7 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; import javax.inject.ExecutionException; import org.jboss.webbeans.util.reflection.ParameterizedTypeImpl; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -37,12 +37,9 @@ import org.dom4j.Namespace; import org.dom4j.QName; import org.dom4j.io.SAXReader; -import org.jboss.webbeans.bootstrap.api.ServiceRegistry; import org.jboss.webbeans.introspector.AnnotatedClass; -import org.jboss.webbeans.introspector.AnnotatedItem; import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; import org.jboss.webbeans.resources.ClassTransformer; -import org.jboss.webbeans.resources.spi.ResourceLoader; import org.jboss.webbeans.resources.spi.ResourceLoadingException; import org.xml.sax.SAXException; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -28,11 +28,11 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Named; -import javax.context.ScopeType; +import javax.enterprise.context.ScopeType; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.DeploymentType; import javax.inject.DefinitionException; import javax.inject.DeploymentException; -import javax.inject.DeploymentType; import javax.interceptor.InterceptorBindingType; import org.dom4j.Document; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -23,17 +23,17 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Named; import javax.annotation.Resource; -import javax.annotation.Stereotype; -import javax.context.ScopeType; import javax.decorator.Decorator; import javax.ejb.EJB; -import javax.inject.BindingType; +import javax.enterprise.context.ScopeType; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.deployment.DeploymentType; +import javax.enterprise.inject.deployment.Specializes; import javax.inject.DefinitionException; -import javax.inject.DeploymentType; import javax.inject.Realizes; -import javax.inject.Specializes; import javax.interceptor.Interceptor; import javax.interceptor.InterceptorBindingType; import javax.persistence.PersistenceContext; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -25,8 +25,8 @@ import javax.annotation.Resource; import javax.ejb.EJB; -import javax.inject.Current; -import javax.inject.DeploymentType; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.deployment.DeploymentType; import javax.persistence.PersistenceContext; import javax.persistence.PersistenceUnit; import javax.xml.ws.WebServiceRef; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -23,11 +23,11 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.ScopeType; +import javax.enterprise.context.ScopeType; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.deployment.DeploymentType; import javax.inject.DefinitionException; -import javax.inject.DeploymentType; import org.dom4j.Element; import org.jboss.webbeans.introspector.AnnotatedClass; Modified: ri/trunk/impl/src/main/resources/ee/namespace =================================================================== --- ri/trunk/impl/src/main/resources/ee/namespace 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/resources/ee/namespace 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,11 @@ java.lang java.util javax.annotation -javax.inject +javax.enterprise.inject +javax.enterprise.context +javax.enterprise.context.spi +javax.enterprise.inject.spi +javax.enterprise.inject.deployment javax.context javax.interceptor javax.decorator Modified: ri/trunk/osgi-bundle/pom.xml =================================================================== --- ri/trunk/osgi-bundle/pom.xml 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/osgi-bundle/pom.xml 2009-05-26 12:45:33 UTC (rev 2711) @@ -54,7 +54,7 @@ <instructions> <_include>-osgi.bundle</_include> <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency> - <_exportcontents>javax.event; javax.context; javax.webbeans; javax.decorator; javax.inject; javax.inject.manager; version=${osgi.version}, + <_exportcontents>javax.event; javax.context; javax.webbeans; javax.decorator; javax.inject; javax.enterprise.inject.spi; version=${osgi.version}, org.jboss.webbeans.*.api.*; org.jboss.webbeans.*.spi.*; org.jboss.webbeans.conversation; org.jboss.webbeans.bootstrap; org.jboss.webbeans.introspector; org.jboss.webbeans.servlet; version=${osgi.version}, org.jboss.webbeans.el; include:="WebBeansELResolver"; version=${osgi.version}, org.jboss.webbeans.jsf; include:="WebBeansPhaseListener"; version=${osgi.version}, Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java =================================================================== --- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; import org.jboss.jsr299.tck.spi.Managers; import org.jboss.webbeans.CurrentManager; @@ -13,7 +13,7 @@ public class ManagersImpl implements Managers { - public Manager getManager() + public BeanManager getManager() { return CurrentManager.rootManager(); } Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/BeanStore.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/BeanStore.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/BeanStore.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -17,7 +17,7 @@ package org.jboss.webbeans.context.api; -import javax.context.Contextual; +import javax.enterprise.context.spi.Contextual; /** Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -3,8 +3,7 @@ import java.util.Map; import java.util.Set; -import javax.context.Contextual; -import javax.inject.manager.Bean; +import javax.enterprise.context.spi.Contextual; import org.jboss.webbeans.context.api.BeanStore; @@ -24,7 +23,7 @@ * @param The bean to look for * @return An instance, if found * - * @see org.jboss.webbeans.context.api.BeanStore#get(Bean) + * @see org.jboss.webbeans.context.api.BeanStore#get(BaseBean) */ public <T extends Object> T get(Contextual<? extends T> bean) { @@ -39,7 +38,7 @@ * @param bean the bean to remove * @return The instance removed * - * @see org.jboss.webbeans.context.api.BeanStore#remove(Bean) + * @see org.jboss.webbeans.context.api.BeanStore#remove(BaseBean) */ public <T extends Object> T remove(Contextual<? extends T> bean) { @@ -76,7 +75,7 @@ * @param bean The bean * @param instance the instance * - * @see org.jboss.webbeans.context.api.BeanStore#put(Bean, Object) + * @see org.jboss.webbeans.context.api.BeanStore#put(BaseBean, Object) */ public <T> void put(Contextual<? extends T> bean, T instance) { Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,7 +21,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.context.Contextual; +import javax.enterprise.context.spi.Contextual; /** * A BeanStore that uses a HashMap as backing storage Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.context.api.helpers; -import javax.context.Contextual; +import javax.enterprise.context.spi.Contextual; import org.jboss.webbeans.context.api.BeanStore; Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -17,7 +17,7 @@ package org.jboss.webbeans.ejb.spi; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.bootstrap.api.Service; import org.jboss.webbeans.ejb.api.SessionObjectReference; Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.ejb.spi.helpers; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.ejb.api.SessionObjectReference; import org.jboss.webbeans.ejb.spi.EjbDescriptor; Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/manager/api/WebBeansManager.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/manager/api/WebBeansManager.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/manager/api/WebBeansManager.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -19,7 +19,7 @@ import java.io.Serializable; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; /** * Functionality provided by the Web Beans Manager over and above the JSR-299 @@ -28,7 +28,7 @@ * @author Pete Muir * */ -public interface WebBeansManager extends Manager, Serializable +public interface WebBeansManager extends BeanManager, Serializable { /** Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/JpaServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/JpaServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/JpaServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.persistence.spi; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/ForwardingJpaServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/ForwardingJpaServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/ForwardingJpaServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.persistence.spi.helpers; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.resources.spi; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.bootstrap.api.Service; Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/AbstractResourceServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/AbstractResourceServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/AbstractResourceServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -5,8 +5,8 @@ import java.lang.reflect.Method; import javax.annotation.Resource; +import javax.enterprise.inject.spi.InjectionPoint; import javax.inject.ExecutionException; -import javax.inject.manager.InjectionPoint; import javax.naming.Context; import javax.naming.NamingException; Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.resources.spi.helpers; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.resources.spi.ResourceServices; Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java =================================================================== --- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.bootstrap.api.test; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.ejb.api.SessionObjectReference; import org.jboss.webbeans.ejb.spi.EjbDescriptor; Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java =================================================================== --- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import java.util.Collection; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java =================================================================== --- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.bootstrap.api.test; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.resources.spi.ResourceServices; Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEjBServices.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEjBServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEjBServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -6,7 +6,7 @@ import java.lang.reflect.Field; import java.util.Collection; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; import org.jboss.webbeans.ejb.api.SessionObjectReference; Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJpaServices.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJpaServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJpaServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -7,7 +7,7 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import javax.persistence.Entity; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockResourceServices.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockResourceServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockResourceServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.mock; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.resources.spi.ResourceServices; Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,8 +10,8 @@ import java.util.Arrays; import java.util.List; -import javax.inject.Production; -import javax.inject.Standard; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.deployment.Standard; import org.jboss.testharness.AbstractTest; import org.jboss.webbeans.CurrentManager; Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -5,10 +5,10 @@ import java.util.List; import java.util.Set; -import javax.context.Context; -import javax.context.CreationalContext; -import javax.context.RequestScoped; -import javax.inject.manager.Bean; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -47,7 +47,7 @@ public void testCreateSFSB() { GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class); - Bean<KleinStadt> stadtBean = getCurrentManager().resolveByType(KleinStadt.class).iterator().next(); + Bean<KleinStadt> stadtBean = getCurrentManager().getBeans(KleinStadt.class).iterator().next(); assert stadtBean != null : "Expected a bean for stateful session bean Kassel"; CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>(); KleinStadt stadtInstance = stadtBean.create(creationalContext); @@ -75,7 +75,7 @@ public void testDestroyRemovesSFSB() throws Exception { GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class); - Bean<KleinStadt> stadtBean = getCurrentManager().resolveByType(KleinStadt.class).iterator().next(); + Bean<KleinStadt> stadtBean = getCurrentManager().getBeans(KleinStadt.class).iterator().next(); assert stadtBean != null : "Expected a bean for stateful session bean Kassel"; Context requestContext = getCurrentManager().getContext(RequestScoped.class); CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>(); Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; -import javax.context.RequestScoped; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.context.RequestScoped; @Stateful @RequestScoped Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,10 +2,10 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import javax.context.RequestScoped; import javax.ejb.EJB; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.context.RequestScoped; @Stateful @RequestScoped Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,10 +1,10 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; import javax.annotation.PreDestroy; -import javax.context.Dependent; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Current; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Current; @Stateful @Dependent Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import javax.annotation.PostConstruct; import javax.ejb.Stateless; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; @Stateless public class Mainz implements AlteStadt Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Current; +import javax.enterprise.inject.Current; @Stateful public class Marburg implements UniStadt Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; public class MockCreationalContext<T> implements CreationalContext<T> { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Game.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Game.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Game.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.examples; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; public class Game { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Generator.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Generator.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Generator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.examples; -import javax.context.ApplicationScoped; -import javax.inject.Produces; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; @ApplicationScoped public class Generator { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Mock.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Mock.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Mock.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Random.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Random.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Random.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.examples; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; public class TextTranslator { private SentenceParser sentenceParser; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/AnotherDeploymentType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/AnotherDeploymentType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Cow.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Cow.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Cow.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; @ApplicationScoped class Cow implements Animal Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserver.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserver.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserver.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,15 +1,15 @@ package org.jboss.webbeans.test.unit.bootstrap; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.event.Observes; -import javax.inject.manager.Initialized; -import javax.inject.manager.Manager; class InitializedObserver { public static boolean observered; - public void observeInitialized(@Observes @Initialized Manager manager) + public void observeInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager) { observered = true; } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesApplicationContext.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesApplicationContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesApplicationContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,16 +1,16 @@ package org.jboss.webbeans.test.unit.bootstrap; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.event.Observes; -import javax.inject.Current; -import javax.inject.manager.Initialized; -import javax.inject.manager.Manager; class InitializedObserverWhichUsesApplicationContext { @Current Cow cow; - public void observeInitialized(@Observes @Initialized Manager manager) + public void observeInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager) { cow.moo(); } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesRequestContext.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesRequestContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesRequestContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,9 +1,9 @@ package org.jboss.webbeans.test.unit.bootstrap; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.event.Observes; -import javax.inject.Current; -import javax.inject.manager.Initialized; -import javax.inject.manager.Manager; class InitializedObserverWhichUsesRequestContext { @@ -12,7 +12,7 @@ @Current Tuna tuna; - public void observeInitialized(@Observes @Initialized Manager manager) + public void observeInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager) { name = tuna.getName(); } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tuna.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tuna.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Tuna Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/XmlBootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/XmlBootstrapTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/XmlBootstrapTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap; -import javax.inject.Production; -import javax.inject.Standard; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.deployment.Standard; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Hound.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Hound.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.bootstrap.environments; -import javax.annotation.Named; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.inject.Named; @Stateful @Tame Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Salmon.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Salmon.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Salmon.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.environments; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Named Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/SeaBass.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/SeaBass.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/SeaBass.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.environments; -import javax.context.RequestScoped; -import javax.inject.Production; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.deployment.Production; @Production @RequestScoped Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Bean; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.Bean; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.ManagerImpl; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Sole.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Sole.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Sole.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.bootstrap.environments; -import javax.annotation.Named; import javax.ejb.EJB; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Whitefish Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tame.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/TarantulaProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/TarantulaProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/TarantulaProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.environments; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; public class TarantulaProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tuna.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tuna.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.environments; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Tuna Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Whitefish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Whitefish.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Whitefish.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Elephant.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Elephant.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Elephant.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production @Stateful Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Hound.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Hound.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise; -import javax.annotation.Named; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.inject.Named; @Stateful @Tame Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Panther.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Panther.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Panther.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production @Stateful Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Synchronous.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Synchronous.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Synchronous.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tame.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tiger.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tiger.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tiger.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production @Stateful Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production @Stateful Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; -import javax.annotation.Named; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.inject.Named; @Stateful @Tame Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production @Stateful Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Named Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; -import javax.context.RequestScoped; -import javax.inject.Production; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.deployment.Production; @Production @RequestScoped Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Whitefish Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production @Stateful Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Tuna Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/BootstrapTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/BootstrapTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.bean.RIBean; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Salmon.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Salmon.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Salmon.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Named Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/SeaBass.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/SeaBass.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/SeaBass.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; -import javax.context.RequestScoped; -import javax.inject.Production; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.deployment.Production; @Production @RequestScoped Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Sole.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Sole.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Sole.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Whitefish Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Tuna.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Tuna.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Tuna Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Whitefish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Whitefish.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Whitefish.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/BootstrapTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/BootstrapTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Hound.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Hound.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.bootstrap.singleEnterprise; -import javax.annotation.Named; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.inject.Named; @Stateful @Tame Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Tame.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tame.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; public class TarantulaProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/BootstrapTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/BootstrapTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,9 +4,10 @@ import java.util.List; import java.util.Map; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.webbeans.bean.BaseBean; import org.jboss.webbeans.bean.RIBean; import org.jboss.webbeans.test.AbstractWebBeansTest; import org.testng.annotations.Test; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/Tuna.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/Tuna.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.singleSimple; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Tuna Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplictionScopedObject.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplictionScopedObject.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplictionScopedObject.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; @ApplicationScoped public class ApplictionScopedObject Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScoped.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScoped.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScoped.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -3,8 +3,8 @@ import java.util.Arrays; import java.util.List; -import javax.context.RequestScoped; -import javax.inject.Produces; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; public class ParameterizedTypeScoped { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScopedTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScopedTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScopedTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.TypeLiteral; +import javax.enterprise.inject.TypeLiteral; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.test.AbstractWebBeansTest; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,9 +1,9 @@ package org.jboss.webbeans.test.unit.context; -import javax.context.ApplicationScoped; -import javax.context.ConversationScoped; -import javax.context.RequestScoped; -import javax.context.SessionScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.ConversationScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.context.SessionScoped; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.metadata.MetaDataCache; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Beer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Beer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Beer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.definition; -import javax.annotation.Named; +import javax.enterprise.inject.Named; public @Named Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/BeerProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/BeerProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/BeerProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.definition; -import javax.annotation.Named; -import javax.inject.Produces; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; public class BeerProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Order.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Order.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Order.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.definition; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production class Order Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class) @Target( { TYPE }) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import java.util.Arrays; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.metadata.StereotypeModel; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.inject.New; +import javax.enterprise.inject.New; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; @@ -28,13 +28,13 @@ public void initNewBean() { - assert getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class).size() == 1; - assert getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class).iterator().next() instanceof EnterpriseBean; - wrappedEnterpriseBean = (EnterpriseBean<WrappedEnterpriseBeanLocal>) getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class).iterator().next(); + assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).size() == 1; + assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).iterator().next() instanceof EnterpriseBean; + wrappedEnterpriseBean = (EnterpriseBean<WrappedEnterpriseBeanLocal>) getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).iterator().next(); - assert getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next() instanceof NewEnterpriseBean; - newEnterpriseBean = (NewEnterpriseBean<WrappedEnterpriseBeanLocal>) getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next(); + assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).size() == 1; + assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next() instanceof NewEnterpriseBean; + newEnterpriseBean = (NewEnterpriseBean<WrappedEnterpriseBeanLocal>) getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next(); } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,9 +1,9 @@ package org.jboss.webbeans.test.unit.implementation; -import javax.annotation.Named; -import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Named; @SessionScoped @Stateful Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,9 +4,9 @@ import java.util.Iterator; import java.util.Set; -import javax.annotation.Stereotype; -import javax.inject.DeploymentType; -import javax.inject.Production; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.deployment.DeploymentType; +import javax.enterprise.inject.deployment.Production; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.introspector.AnnotatedClass; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Order.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Order.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Order.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.implementation.annotatedItem; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production class Order Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/sbi/SessionBeanInterceptorTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/sbi/SessionBeanInterceptorTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/sbi/SessionBeanInterceptorTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -6,7 +6,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.test.AbstractWebBeansTest; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,9 +1,9 @@ package org.jboss.webbeans.test.unit.implementation.event; +import javax.enterprise.inject.AnnotationLiteral; import javax.event.Event; import javax.event.Fires; import javax.event.Observes; -import javax.inject.AnnotationLiteral; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.ManagerImpl; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Updated.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Updated.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Updated.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @BindingType @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ExceptionHandlingTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ExceptionHandlingTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ExceptionHandlingTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.implementation.exceptions; -import javax.inject.AnnotationLiteral; -import javax.inject.CreationException; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.CreationException; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.test.AbstractWebBeansTest; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Large.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Large.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Large.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ShipProducer_Broken.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ShipProducer_Broken.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ShipProducer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.implementation.exceptions; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; public class ShipProducer_Broken { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.New; +import javax.enterprise.inject.New; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.bean.NewSimpleBean; @@ -22,13 +22,13 @@ public void initNewBean() { - assert getCurrentManager().resolveByType(WrappedSimpleBean.class).size() == 1; - assert getCurrentManager().resolveByType(WrappedSimpleBean.class).iterator().next() instanceof SimpleBean; - wrappedSimpleBean = (SimpleBean<WrappedSimpleBean>) getCurrentManager().resolveByType(WrappedSimpleBean.class).iterator().next(); + assert getCurrentManager().getBeans(WrappedSimpleBean.class).size() == 1; + assert getCurrentManager().getBeans(WrappedSimpleBean.class).iterator().next() instanceof SimpleBean; + wrappedSimpleBean = (SimpleBean<WrappedSimpleBean>) getCurrentManager().getBeans(WrappedSimpleBean.class).iterator().next(); - assert getCurrentManager().resolveByType(WrappedSimpleBean.class, NEW_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(WrappedSimpleBean.class, NEW_LITERAL).iterator().next() instanceof NewSimpleBean; - newSimpleBean = (NewSimpleBean<WrappedSimpleBean>) getCurrentManager().resolveByType(WrappedSimpleBean.class, NEW_LITERAL).iterator().next(); + assert getCurrentManager().getBeans(WrappedSimpleBean.class, NEW_LITERAL).size() == 1; + assert getCurrentManager().getBeans(WrappedSimpleBean.class, NEW_LITERAL).iterator().next() instanceof NewSimpleBean; + newSimpleBean = (NewSimpleBean<WrappedSimpleBean>) getCurrentManager().getBeans(WrappedSimpleBean.class, NEW_LITERAL).iterator().next(); } @Test(groups = { "new" }) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/WrappedSimpleBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/WrappedSimpleBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/WrappedSimpleBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.annotation.Named; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Named; @SessionScoped @Named("Fred") Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/IntegerCollectionInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/IntegerCollectionInjection.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/IntegerCollectionInjection.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import java.util.Collection; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; public class IntegerCollectionInjection { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Instance; +import javax.enterprise.inject.Instance; import javax.inject.Obtains; public class ListInstance Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListStringInstance.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListStringInstance.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListStringInstance.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Instance; +import javax.enterprise.inject.Instance; import javax.inject.Obtains; public class ListStringInstance Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/NoParameterizedCollectionInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/NoParameterizedCollectionInjection.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/NoParameterizedCollectionInjection.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import java.util.Collection; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; public class NoParameterizedCollectionInjection { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import java.util.Collection; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; public class ParameterizedCollectionInjection { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedListInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedListInjection.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedListInjection.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import java.util.List; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; public class ParameterizedListInjection { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; public class ParameterizedProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.List; -import javax.inject.TypeLiteral; +import javax.enterprise.inject.TypeLiteral; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.test.AbstractWebBeansTest; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.implementation.producer.method; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; public class IntInjection { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,14 +1,14 @@ package org.jboss.webbeans.test.unit.implementation.producer.method; -import javax.inject.Current; -import javax.inject.Produces; -import javax.inject.manager.InjectionPoint; -import javax.inject.manager.Manager; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InjectionPoint; class ManagerProducer { - @Current Manager manager; + @Current BeanManager beanManager; private static boolean injectionPointInjected; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.implementation.producer.method; -import javax.annotation.Named; -import javax.inject.Produces; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; public class NamedProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/Foo.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/Foo.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/Foo.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.annotation.Named; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Named; @Named @RequestScoped Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import java.util.List; -import javax.inject.Instance; -import javax.inject.TypeLiteral; +import javax.enterprise.inject.Instance; +import javax.enterprise.inject.TypeLiteral; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.literal.ObtainsLiteral; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Air.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Air.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Air.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Initializer; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Initializer; @ApplicationScoped class Air Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bar.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bar.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bar.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.lookup.circular; import javax.annotation.PostConstruct; -import javax.context.ApplicationScoped; -import javax.inject.Current; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Current; @ApplicationScoped class Bar Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bird.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bird.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bird.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Initializer; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Initializer; @ApplicationScoped class Bird Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Car.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Car.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Car.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; import javax.annotation.PostConstruct; -import javax.inject.Current; +import javax.enterprise.inject.Current; class Car { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLooping.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLooping.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLooping.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLoopingProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLoopingProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLoopingProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class DependentLoopingProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class DependentSelfConsumingDependentProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingNormalProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingNormalProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingNormalProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Produces; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; class DependentSelfConsumingNormalProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Farm.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Farm.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Farm.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; class Farm { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Fish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Fish.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Fish.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; class Fish { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Foo.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Foo.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Foo.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; import javax.annotation.PostConstruct; -import javax.inject.Current; +import javax.enterprise.inject.Current; class Foo { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Food.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Food.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Food.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.lookup.circular; import javax.annotation.PostConstruct; -import javax.context.ApplicationScoped; -import javax.inject.Current; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Current; @ApplicationScoped class Food Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/House.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/House.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/House.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Initializer; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Initializer; @ApplicationScoped class House Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLooping.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLooping.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLooping.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLoopingProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLoopingProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLoopingProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Produces; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; @ApplicationScoped class NormalLoopingProducer Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingDependentProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingDependentProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingDependentProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Produces; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; @ApplicationScoped class NormalSelfConsumingDependentProducer Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingNormalProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingNormalProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingNormalProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Produces; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; @ApplicationScoped class NormalSelfConsumingNormalProducer Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Petrol.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Petrol.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Petrol.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.lookup.circular; import javax.annotation.PostConstruct; -import javax.context.ApplicationScoped; -import javax.inject.Current; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Current; @ApplicationScoped class Petrol Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Pig.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Pig.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Pig.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.lookup.circular; import javax.annotation.PostConstruct; -import javax.context.ApplicationScoped; -import javax.inject.Current; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Current; @ApplicationScoped class Pig Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Planet.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Planet.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Planet.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; class Planet { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent1.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent1.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent1.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal1.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal1.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal1.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Space.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Space.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Space.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Initializer; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Initializer; @ApplicationScoped class Space Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Water.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Water.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Water.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; class Water { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -6,16 +6,16 @@ import java.util.HashSet; import java.util.Set; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.inject.Production; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; -import javax.inject.manager.Manager; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.bean.BaseBean; import org.jboss.webbeans.literal.CurrentLiteral; import org.jboss.webbeans.test.AbstractWebBeansTest; import org.testng.annotations.Test; @@ -34,7 +34,7 @@ private static interface Dummy {} - private static class DummyBean extends Bean<Dummy> + private static class DummyBean extends BaseBean<Dummy> { private static final Set<Type> TYPES = new HashSet<Type>(); @@ -45,9 +45,9 @@ TYPES.add(Object.class); } - protected DummyBean(Manager manager) + protected DummyBean(BeanManager beanManager) { - super(manager); + super(beanManager); } @Override @@ -116,23 +116,23 @@ Integer rootManagerId = getCurrentManager().getId(); ManagerImpl deserializedRootManager = (ManagerImpl) deserialize(serialize(getCurrentManager())); assert deserializedRootManager.getId().equals(rootManagerId); - assert getCurrentManager().resolveByType(Foo.class).size() == 1; - assert deserializedRootManager.resolveByType(Foo.class).size() == 1; - assert getCurrentManager().resolveByType(Foo.class).iterator().next().equals(deserializedRootManager.resolveByType(Foo.class).iterator().next()); + assert getCurrentManager().getBeans(Foo.class).size() == 1; + assert deserializedRootManager.getBeans(Foo.class).size() == 1; + assert getCurrentManager().getBeans(Foo.class).iterator().next().equals(deserializedRootManager.getBeans(Foo.class).iterator().next()); } @Test public void testChildManagerSerializability() throws Exception { ManagerImpl childManager = getCurrentManager().createActivity(); - Bean<?> dummyBean = new DummyBean(childManager); + BaseBean<?> dummyBean = new DummyBean(childManager); childManager.addBean(dummyBean); Integer childManagerId = childManager.getId(); ManagerImpl deserializedChildManager = (ManagerImpl) deserialize(serialize(childManager)); assert deserializedChildManager.getId().equals(childManagerId); - assert childManager.resolveByType(Dummy.class).size() == 1; - assert deserializedChildManager.resolveByType(Dummy.class).size() == 1; - assert childManager.resolveByType(Dummy.class).iterator().next().equals(deserializedChildManager.resolveByType(Dummy.class).iterator().next()); + assert childManager.getBeans(Dummy.class).size() == 1; + assert deserializedChildManager.getBeans(Dummy.class).size() == 1; + assert childManager.getBeans(Dummy.class).iterator().next().equals(deserializedChildManager.getBeans(Dummy.class).iterator().next()); } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.xml.beans; -import javax.context.RequestScoped; -import javax.inject.Initializer; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Initializer; import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestBindingType; import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestDeploymentType; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestBindingType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestBindingType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestBindingType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.xml.beans.annotationtype; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @BindingType public @interface TestBindingType Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestDeploymentType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestDeploymentType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.xml.beans.annotationtype; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @DeploymentType public @interface TestDeploymentType Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestNamed.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestNamed.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestNamed.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.xml.beans.annotationtype; -import javax.annotation.Named; +import javax.enterprise.inject.Named; @Named public @interface TestNamed Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestScopeType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestScopeType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestScopeType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.xml.beans.annotationtype; -import javax.context.ScopeType; +import javax.enterprise.context.ScopeType; @ScopeType public @interface TestScopeType Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestStereotype.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.xml.beans.annotationtype; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype public @interface TestStereotype Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -3,9 +3,9 @@ import java.net.URL; import java.util.Iterator; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.deployment.Standard; import javax.inject.DefinitionException; -import javax.inject.Production; -import javax.inject.Standard; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -15,6 +15,6 @@ @Test public void testJavaEePkg() { - assert getCurrentManager().resolveByType(Order.class).size() == 2; + assert getCurrentManager().getBeans(Order.class).size() == 2; } } \ No newline at end of file Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,12 +2,12 @@ import java.util.Date; -import javax.annotation.Named; -import javax.context.RequestScoped; import javax.ejb.ScheduleExpression; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; import javax.event.Event; -import javax.inject.Initializer; -import javax.inject.Produces; import javax.interceptor.InvocationContext; import javax.jms.Connection; import javax.persistence.EntityManager; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/AnotherDeploymentType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/AnotherDeploymentType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; @@ -21,7 +21,6 @@ import org.jboss.webbeans.test.unit.xml.beans.Order; import org.jboss.webbeans.xml.XmlEnvironment; import org.jboss.webbeans.xml.XmlParser; -import org.testng.annotations.Test; @Artifact @Resources({ @@ -67,7 +66,7 @@ ManagerImpl manager = parserEnv.getManager(); - Set<Bean<Order>> beansSet = manager.resolveByType(Order.class); + Set<Bean<Order>> beansSet = manager.getBeans(Order.class); List<Class<? extends Annotation>> dTypes = manager.getEnabledDeploymentTypes(); dTypes.size(); for(Bean<Order> bean : beansSet) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -35,7 +35,7 @@ XmlParser parser = new XmlParser(parserEnv); parser.parse(); - assert parserEnv.getManager().resolveByType(Order.class).size() == 1; + assert parserEnv.getManager().getBeans(Order.class).size() == 1; } @Test(expectedExceptions = DefinitionException.class) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.xml.parser.schema.foo; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; public class Order { Modified: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ <Beans xmlns="urn:java:ee" xmlns:myapp="urn:java:org.jboss.webbeans.test.unit.xml.parser" - xmlns:manager="urn:java:javax.inject.manager" + xmlns:manager="urn:java:javax.enterprise.inject.spi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:java:org.jboss.webbeans.test.unit.xml.parser"> <Deploy>