[webbeans-commits] Webbeans SVN: r1232 - in ri/trunk: webbeans-api/src/main/java/javax/annotation and 35 other directories.

Author: pete.muir(a)jboss.org Date: 2009-01-26 10:00:55 -0500 (Mon, 26 Jan 2009) New Revision: 1232 Added: ri/trunk/webbeans-api/src/main/java/javax/annotation/ ri/trunk/webbeans-api/src/main/java/javax/annotation/Named.java ri/trunk/webbeans-api/src/main/java/javax/annotation/NonBinding.java ri/trunk/webbeans-api/src/main/java/javax/annotation/Stereotype.java ri/trunk/webbeans-api/src/main/java/javax/context/ ri/trunk/webbeans-api/src/main/java/javax/context/ApplicationScoped.java ri/trunk/webbeans-api/src/main/java/javax/context/Context.java ri/trunk/webbeans-api/src/main/java/javax/context/ContextNotActiveException.java ri/trunk/webbeans-api/src/main/java/javax/context/Contextual.java ri/trunk/webbeans-api/src/main/java/javax/context/Conversation.java ri/trunk/webbeans-api/src/main/java/javax/context/ConversationScoped.java ri/trunk/webbeans-api/src/main/java/javax/context/Dependent.java ri/trunk/webbeans-api/src/main/java/javax/context/RequestScoped.java ri/trunk/webbeans-api/src/main/java/javax/context/ScopeType.java ri/trunk/webbeans-api/src/main/java/javax/context/SessionScoped.java ri/trunk/webbeans-api/src/main/java/javax/decorator/ ri/trunk/webbeans-api/src/main/java/javax/decorator/Decorates.java ri/trunk/webbeans-api/src/main/java/javax/decorator/Decorator.java ri/trunk/webbeans-api/src/main/java/javax/event/ ri/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionCompletion.java ri/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionFailure.java ri/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionSuccess.java ri/trunk/webbeans-api/src/main/java/javax/event/BeforeTransactionCompletion.java ri/trunk/webbeans-api/src/main/java/javax/event/Event.java ri/trunk/webbeans-api/src/main/java/javax/event/Fires.java ri/trunk/webbeans-api/src/main/java/javax/event/IfExists.java ri/trunk/webbeans-api/src/main/java/javax/event/Observer.java ri/trunk/webbeans-api/src/main/java/javax/event/ObserverException.java ri/trunk/webbeans-api/src/main/java/javax/event/Observes.java ri/trunk/webbeans-api/src/main/java/javax/inject/ ri/trunk/webbeans-api/src/main/java/javax/inject/AmbiguousDependencyException.java ri/trunk/webbeans-api/src/main/java/javax/inject/AnnotationLiteral.java ri/trunk/webbeans-api/src/main/java/javax/inject/BindingType.java ri/trunk/webbeans-api/src/main/java/javax/inject/CreationException.java ri/trunk/webbeans-api/src/main/java/javax/inject/Current.java ri/trunk/webbeans-api/src/main/java/javax/inject/DefinitionException.java ri/trunk/webbeans-api/src/main/java/javax/inject/DeploymentException.java ri/trunk/webbeans-api/src/main/java/javax/inject/DeploymentType.java ri/trunk/webbeans-api/src/main/java/javax/inject/Disposes.java ri/trunk/webbeans-api/src/main/java/javax/inject/DuplicateBindingTypeException.java ri/trunk/webbeans-api/src/main/java/javax/inject/ExecutionException.java ri/trunk/webbeans-api/src/main/java/javax/inject/IllegalProductException.java ri/trunk/webbeans-api/src/main/java/javax/inject/InconsistentSpecializationException.java ri/trunk/webbeans-api/src/main/java/javax/inject/Initializer.java ri/trunk/webbeans-api/src/main/java/javax/inject/Instance.java ri/trunk/webbeans-api/src/main/java/javax/inject/New.java ri/trunk/webbeans-api/src/main/java/javax/inject/NullableDependencyException.java ri/trunk/webbeans-api/src/main/java/javax/inject/Obtains.java ri/trunk/webbeans-api/src/main/java/javax/inject/Produces.java ri/trunk/webbeans-api/src/main/java/javax/inject/Production.java ri/trunk/webbeans-api/src/main/java/javax/inject/Realizes.java ri/trunk/webbeans-api/src/main/java/javax/inject/Specializes.java ri/trunk/webbeans-api/src/main/java/javax/inject/Standard.java ri/trunk/webbeans-api/src/main/java/javax/inject/TypeLiteral.java ri/trunk/webbeans-api/src/main/java/javax/inject/UnproxyableDependencyException.java ri/trunk/webbeans-api/src/main/java/javax/inject/UnsatisfiedDependencyException.java ri/trunk/webbeans-api/src/main/java/javax/inject/UnserializableDependencyException.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Decorator.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Deployed.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Initialized.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/InjectionPoint.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/InterceptionType.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Interceptor.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java ri/trunk/webbeans-api/src/main/java/javax/interceptor/ ri/trunk/webbeans-api/src/main/java/javax/interceptor/Interceptor.java ri/trunk/webbeans-api/src/main/java/javax/interceptor/InterceptorBindingType.java Removed: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Context.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Contextual.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Decorator.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Deployed.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Initialized.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/InterceptionType.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Interceptor.java ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionCompletion.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionFailure.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionSuccess.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/AmbiguousDependencyException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/ApplicationScoped.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/BeforeTransactionCompletion.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/BindingType.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/ContextNotActiveException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Conversation.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/ConversationScoped.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/CreationException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Current.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorates.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorator.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/DefinitionException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Dependent.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentType.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Disposes.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/DuplicateBindingTypeException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Event.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/ExecutionException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Fires.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/IfExists.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/IllegalProductException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/InconsistentSpecializationException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Initializer.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/InjectionPoint.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Instance.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Interceptor.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/InterceptorBindingType.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Named.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/New.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonBinding.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentConstructorException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentFieldException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMemberException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMethodException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentTypeException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/NullableDependencyException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observer.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/ObserverException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observes.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtains.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Produces.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Production.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Realizes.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/RequestScoped.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/ScopeType.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/SessionScoped.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Specializes.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Standard.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/Stereotype.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/TypeLiteral.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnproxyableDependencyException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnremovedException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnsatisfiedDependencyException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnserializableDependencyException.java ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/ Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbResolver.java ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/ForwardingEjbResolver.java ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceLoadingException.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/FacadeImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/InstanceImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/PropertiesBasedBootstrap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractBeanMapContext.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractContext.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ApplicationContext.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ContextMap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ContextualInstance.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ConversationContext.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/RequestContext.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/SessionContext.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/BeanMap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SimpleBeanMap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exception/NotAScopeException.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointProvider.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedField.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/NewLiteral.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AnnotationModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/BindingTypeModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ScopeModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/StereotypeModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/AbstractNamingContext.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/DefaultNaming.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/transaction/Transaction.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Beans.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Game.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Generator.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Mock.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Random.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Tests.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/AnotherDeploymentType.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Elephant.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Hound.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserver.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesApplicationContext.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesRequestContext.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/LadybirdSpider.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Panther.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Salmon.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/SeaBass.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Sole.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Synchronous.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tame.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/TarantulaProducer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tiger.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tuna.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Whitefish.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/Order.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/AnotherDeploymentType.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/Asynchronous.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/Tuna.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/Bad.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/ClassAnnotatedItemTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/Order.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedSimpleBean.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/AnotherDeploymentType.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Chunky.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Cod.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Expensive.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Farmer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/FishFarm.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Haddock.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/ResolutionByTypeTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Salmon.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/SeaBass.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Sole.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Tuna.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Whitefish.java Log: WBRI-117, update to packaging to PRD2 Copied: ri/trunk/webbeans-api/src/main/java/javax/annotation/Named.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Named.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/annotation/Named.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/annotation/Named.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.annotation; + +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 Web 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. + * + * @return the component name + */ + + public String value() default ""; + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/annotation/Named.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/annotation/NonBinding.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonBinding.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/annotation/NonBinding.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/annotation/NonBinding.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.annotation; + +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/webbeans-api/src/main/java/javax/annotation/NonBinding.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/annotation/Stereotype.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Stereotype.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/annotation/Stereotype.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/annotation/Stereotype.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,45 @@ +/* +* 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.annotation; + +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 Web Beans stereotype. + * + * @author Pete Muir + * @author Gavin King + */ + +@Retention(RUNTIME) +@Target(ANNOTATION_TYPE) +@Documented +public @interface Stereotype +{ + + public Class<? extends Annotation>[] supportedScopes() default {}; + + public Class<?>[] requiredTypes() default {}; + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/annotation/Stereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/context/ApplicationScoped.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/ApplicationScoped.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/context/ApplicationScoped.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/context/ApplicationScoped.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.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 Web 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/webbeans-api/src/main/java/javax/context/ApplicationScoped.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/context/Context.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Context.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/context/Context.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/context/Context.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.context; + +import java.lang.annotation.Annotation; + +/** + * The contract between the Web Bean manager and a Web Beans context object. + * This interface should not be called directly by the application. + * + * @author Gavin King + * @author Pete Muir + */ + +public interface Context +{ + + public Class<? extends Annotation> getScopeType(); + + public <T> T get(Contextual<T> bean, boolean create); + + boolean isActive(); + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/context/Context.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/context/ContextNotActiveException.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/ContextNotActiveException.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/context/ContextNotActiveException.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/context/ContextNotActiveException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.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 +{ + + 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/webbeans-api/src/main/java/javax/context/Contextual.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Contextual.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/context/Contextual.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/context/Contextual.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,31 @@ +/* + * 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.context; + +/** + * The contract between a Context and an object that has its lifecycle managed + * by the context + * + * @author Nicklas Karlsson + */ +public interface Contextual<T> +{ + public T create(); + + public void destroy(T instance); +} Copied: ri/trunk/webbeans-api/src/main/java/javax/context/Conversation.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Conversation.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/context/Conversation.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/context/Conversation.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,11 @@ +package javax.context; + +public interface Conversation { + public void begin(); + public void begin(String id); + public void end(); + public boolean isLongRunning(); + public String getId(); + public long getTimeout(); + public void setTimeout(long milliseconds); +} \ No newline at end of file Copied: ri/trunk/webbeans-api/src/main/java/javax/context/ConversationScoped.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/ConversationScoped.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/context/ConversationScoped.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/context/ConversationScoped.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.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 Web 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/webbeans-api/src/main/java/javax/context/ConversationScoped.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/context/Dependent.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Dependent.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/context/Dependent.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/context/Dependent.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.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 Web 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/webbeans-api/src/main/java/javax/context/Dependent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/context/RequestScoped.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/RequestScoped.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/context/RequestScoped.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/context/RequestScoped.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.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 Web 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/webbeans-api/src/main/java/javax/context/RequestScoped.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/context/ScopeType.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/ScopeType.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/context/ScopeType.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/context/ScopeType.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.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 Web Beans 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 (Web Beans with this scope + * type must be serializable) + */ + boolean passivating() default false; + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/context/ScopeType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/context/SessionScoped.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/SessionScoped.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/context/SessionScoped.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/context/SessionScoped.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.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 Web 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/webbeans-api/src/main/java/javax/context/SessionScoped.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/decorator/Decorates.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorates.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/decorator/Decorates.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/decorator/Decorates.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.decorator; + +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; + +/** + * Specifies that a field of a decorator class is the delegate attribute. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target(FIELD) +@Retention(RUNTIME) +@Documented +public @interface Decorates +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/decorator/Decorates.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/decorator/Decorator.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorator.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/decorator/Decorator.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/decorator/Decorator.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.decorator; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Stereotype; + +/** + * Specifies that a class is a Web Beans decorator. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target(TYPE) +@Retention(RUNTIME) +@Documented +@Stereotype +public @interface Decorator +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/decorator/Decorator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionCompletion.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionCompletion.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionCompletion.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionCompletion.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,36 @@ +/* + * 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.event; + +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that an observer method is a transactional observer. + * + * @author Gavin King + * + */ +@Retention(RUNTIME) +@Target(PARAMETER) +public @interface AfterTransactionCompletion +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionCompletion.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionFailure.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionFailure.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionFailure.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionFailure.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,36 @@ +/* + * 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.event; + +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that an observer method is a transactional observer. + * + * @author Gavin King + * + */ +@Retention(RUNTIME) +@Target(PARAMETER) +public @interface AfterTransactionFailure +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionFailure.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionSuccess.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionSuccess.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionSuccess.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionSuccess.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,36 @@ +/* + * 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.event; + +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that an observer method is a transactional observer. + * + * @author Gavin King + * + */ +@Retention(RUNTIME) +@Target(PARAMETER) +public @interface AfterTransactionSuccess +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionSuccess.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/event/BeforeTransactionCompletion.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/BeforeTransactionCompletion.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/event/BeforeTransactionCompletion.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/event/BeforeTransactionCompletion.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,36 @@ +/* + * 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.event; + +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that an observer method is a transactional observer. + * + * @author Gavin King + * + */ +@Retention(RUNTIME) +@Target(PARAMETER) +public @interface BeforeTransactionCompletion +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/event/BeforeTransactionCompletion.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/event/Event.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Event.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/event/Event.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/event/Event.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.event; + +import java.lang.annotation.Annotation; + +/** + * An interface for firing events of a particular type, and registering + * observers for events of that type. + * + * @author Gavin King + * @author Pete Muir + * + * @param <T> +* the type of the event object + */ + +public interface Event<T> +{ + + public void fire(T event, Annotation... bindings); + + public void observe(Observer<T> observer, Annotation... bindings); + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/event/Event.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/event/Fires.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Fires.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/event/Fires.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/event/Fires.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,45 @@ +/* +* 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.event; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +/** + * Annotates a variable to be injected with an Event object that can be fired and + * observed by observer methods + * + * @author David Allen + * @author Gavin King + */ + +@BindingType +@Retention(RUNTIME) +@Target( { TYPE, METHOD, FIELD, PARAMETER }) +@Documented +public @interface Fires +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/event/Fires.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/event/IfExists.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/IfExists.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/event/IfExists.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/event/IfExists.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.event; + +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 an observer method is only called if the current instance of + * the Web Bean declaring the observer method already exists. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target(PARAMETER) +@Retention(RUNTIME) +@Documented +public @interface IfExists +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/event/IfExists.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/event/Observer.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observer.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/event/Observer.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/event/Observer.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,13 @@ +package javax.event; + +/** + * The contract between the Web Bean manager and a Web Beans observer object. + * This interface should not be called directly by the application. + * + * @author Gavin King + * + */ +public interface Observer<T> +{ + public void notify(T event); +} \ No newline at end of file Property changes on: ri/trunk/webbeans-api/src/main/java/javax/event/Observer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/event/ObserverException.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/ObserverException.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/event/ObserverException.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/event/ObserverException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.event; + +import javax.inject.ExecutionException; + +/** + * + * @author Pete Muir + */ + +public class ObserverException extends ExecutionException +{ + + public ObserverException() + { + + } + + public ObserverException(String message) + { + super(message); + } + + public ObserverException(Throwable cause) + { + super(cause); + } + + public ObserverException(String message, Throwable cause) + { + super(message, cause); + } + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/event/ObserverException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/event/Observes.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observes.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/event/Observes.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/event/Observes.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.event; + +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 a Web Bean + * implementation class is the event parameter + * of an observer method. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target(PARAMETER) +@Retention(RUNTIME) +@Documented +public @interface Observes +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/event/Observes.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/AmbiguousDependencyException.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/AmbiguousDependencyException.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/AmbiguousDependencyException.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/AmbiguousDependencyException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject; + +/** + * An AmbiguousDependencyException is thrown when within the set of enabled Web + * Beans with the API type and bind- ing types declared there exists no unique + * Web Bean with a higher precedence than all other Web Beans in the set. + * + * + * @author Pete Muir + */ +public class AmbiguousDependencyException extends DeploymentException +{ + + public AmbiguousDependencyException() + { + } + + public AmbiguousDependencyException(String message, Throwable throwable) + { + super(message, throwable); + } + + public AmbiguousDependencyException(String message) + { + super(message); + } + + public AmbiguousDependencyException(Throwable throwable) + { + super(throwable); + } + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/AmbiguousDependencyException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/AnnotationLiteral.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/AnnotationLiteral.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/AnnotationLiteral.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,176 @@ +/* +* 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; + +/** + * Supports inline instantiation of annotation types. + * + * @author Pete Muir + * @author Gavin King + * + * @param <T> + * the annotation type + */ +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; + + +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 + /* + * The hash code of a primitive value v is equal to WrapperType.valueOf(v).hashCode(), where WrapperType is the wrapper type corresponding to the primitive type of v (Byte, Character, Double, Float, Integer, Long, Short, or Boolean). + * The hash code of a string, enum, class, or annotation member-value I v is computed as by calling v.hashCode(). (In the case of annotation member values, this is a recursive definition.) + * The hash code of an array member-value is computed by calling the appropriate overloading of Arrays.hashCode on the value. (There is one overloading for each primitive type, and one for object reference types.) + */ + 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/webbeans-api/src/main/java/javax/inject/AnnotationLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/BindingType.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/BindingType.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/BindingType.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/BindingType.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.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 Web Beans binding type. + * + * @author Pete Muir + * @author Gavin King + */ + +@Target(ANNOTATION_TYPE) +@Retention(RUNTIME) +@Documented +public @interface BindingType +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/BindingType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/CreationException.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/CreationException.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/CreationException.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/CreationException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject; + +/** + * + * @author Pete Muir + */ + +public class CreationException extends ExecutionException +{ + + 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/webbeans-api/src/main/java/javax/inject/CreationException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/Current.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Current.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/Current.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/Current.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.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/webbeans-api/src/main/java/javax/inject/Current.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/DefinitionException.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/DefinitionException.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/DefinitionException.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/DefinitionException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,49 @@ +/* + * 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; + +/** + * + * @author Pete Muir + */ +public class DefinitionException extends RuntimeException +{ + + public DefinitionException() + { + super(); + } + + public DefinitionException(String message, Throwable throwable) + { + super(message, throwable); + } + + public DefinitionException(String message) + { + super(message); + } + + public DefinitionException(Throwable throwable) + { + super(throwable); + } + + + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/DefinitionException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/DeploymentException.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentException.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/DeploymentException.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/DeploymentException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,49 @@ +/* + * 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; + +/** + * + * @author Pete Muir + */ +public class DeploymentException extends RuntimeException +{ + + public DeploymentException() + { + super(); + } + + public DeploymentException(String message, Throwable throwable) + { + super(message, throwable); + } + + public DeploymentException(String message) + { + super(message); + } + + public DeploymentException(Throwable throwable) + { + super(throwable); + } + + + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/DeploymentException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/DeploymentType.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentType.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/DeploymentType.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/DeploymentType.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.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 Web Beans deployment type. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target(ANNOTATION_TYPE) +@Retention(RUNTIME) +@Documented +public @interface DeploymentType +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/DeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/Disposes.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Disposes.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/Disposes.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/Disposes.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.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 a Web Bean implementation class + * class 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/webbeans-api/src/main/java/javax/inject/Disposes.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/DuplicateBindingTypeException.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/DuplicateBindingTypeException.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/DuplicateBindingTypeException.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/DuplicateBindingTypeException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject; + +/** + * This exception is thrown whenever more than one binding type instance of the + * same type is used with the API. + * + * @author David Allen + */ +public class DuplicateBindingTypeException extends ExecutionException +{ + + private static final long serialVersionUID = 4194175477451120383L; + + public DuplicateBindingTypeException() + { + super(); + } + + public DuplicateBindingTypeException(String message, Throwable cause) + { + super(message, cause); + } + + public DuplicateBindingTypeException(String message) + { + super(message); + } + + public DuplicateBindingTypeException(Throwable cause) + { + super(cause); + } + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/DuplicateBindingTypeException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/ExecutionException.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/ExecutionException.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/ExecutionException.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/ExecutionException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject; + +/** + * + * @author Pete Muir + */ +public class ExecutionException extends RuntimeException +{ + + public ExecutionException() + { + super(); + } + + public ExecutionException(String message, Throwable throwable) + { + super(message, throwable); + } + + public ExecutionException(String message) + { + super(message); + } + + public ExecutionException(Throwable throwable) + { + super(throwable); + } + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/ExecutionException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/IllegalProductException.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/IllegalProductException.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/IllegalProductException.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/IllegalProductException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject; + +/** + */ +public class IllegalProductException extends ExecutionException +{ + + 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/webbeans-api/src/main/java/javax/inject/IllegalProductException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/InconsistentSpecializationException.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/InconsistentSpecializationException.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/InconsistentSpecializationException.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/InconsistentSpecializationException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject; + +/** + * + * @author Pete Muir + */ +public class InconsistentSpecializationException extends DeploymentException +{ + + public InconsistentSpecializationException() + { + super(); + } + + public InconsistentSpecializationException(String message, Throwable throwable) + { + super(message, throwable); + } + + public InconsistentSpecializationException(String message) + { + super(message); + } + + public InconsistentSpecializationException(Throwable throwable) + { + super(throwable); + } + + + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/InconsistentSpecializationException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/Initializer.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Initializer.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/Initializer.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/Initializer.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +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 Web Bean implementation class is a Web Beans + * initializer method, or that a constructor is the Web Bean constructor. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { METHOD, CONSTRUCTOR }) +@Retention(RUNTIME) +@Documented +public @interface Initializer +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/Initializer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/Instance.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Instance.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/Instance.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/Instance.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject; + +import java.lang.annotation.Annotation; + + +/** + * An interface for looking up web 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 Web 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 Web 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/webbeans-api/src/main/java/javax/inject/New.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/New.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/New.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/New.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.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/webbeans-api/src/main/java/javax/inject/New.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/NullableDependencyException.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/NullableDependencyException.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/NullableDependencyException.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/NullableDependencyException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject; + +/** + * + * @author Pete Muir + */ +public class NullableDependencyException extends DeploymentException +{ + + public NullableDependencyException() + { + super(); + } + + public NullableDependencyException(String message, Throwable throwable) + { + super(message, throwable); + } + + public NullableDependencyException(String message) + { + super(message); + } + + public NullableDependencyException(Throwable throwable) + { + super(throwable); + } + + + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/NullableDependencyException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/Obtains.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtains.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/Obtains.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/Obtains.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotates a variable to be injected with an Instance object. + * + * @author Gavin King + */ + +@BindingType +@Retention(RUNTIME) +@Target( { TYPE, METHOD, FIELD, PARAMETER }) +@Documented +public @interface Obtains +{ +} Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/Produces.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Produces.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/Produces.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/Produces.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject; + +import static java.lang.annotation.ElementType.METHOD; +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; + +/** + * + * Specifies that a method of a Web Bean implementation class is a producer + * method. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target({METHOD, FIELD}) +@Retention(RUNTIME) +@Documented +public @interface Produces +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/Produces.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/Production.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Production.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/Production.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/Production.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.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 +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/Production.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/Realizes.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Realizes.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/Realizes.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/Realizes.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject; + +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) +@Retention(RUNTIME) +@Documented +public @interface Realizes +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/Realizes.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/Specializes.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Specializes.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/Specializes.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/Specializes.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.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 +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/Specializes.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/Standard.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Standard.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/Standard.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/Standard.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,43 @@ +/* +* 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 Web Beans + * specification. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +public @interface Standard +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/Standard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/TypeLiteral.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/TypeLiteral.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/TypeLiteral.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/TypeLiteral.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,111 @@ +/* +* 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"); + } + } + + public final Type getType() + { + return actualType; + } + + @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/webbeans-api/src/main/java/javax/inject/TypeLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/UnproxyableDependencyException.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnproxyableDependencyException.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/UnproxyableDependencyException.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/UnproxyableDependencyException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject; + +/** + * + * @author Pete Muir + */ +public class UnproxyableDependencyException extends DeploymentException +{ + + public UnproxyableDependencyException() + { + super(); + } + + public UnproxyableDependencyException(String message, Throwable throwable) + { + super(message, throwable); + } + + public UnproxyableDependencyException(String message) + { + super(message); + } + + public UnproxyableDependencyException(Throwable throwable) + { + super(throwable); + } + + + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/UnproxyableDependencyException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/UnsatisfiedDependencyException.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnsatisfiedDependencyException.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/UnsatisfiedDependencyException.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/UnsatisfiedDependencyException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject; + +/** + * + * @author Pete Muir + */ +public class UnsatisfiedDependencyException extends DeploymentException +{ + + public UnsatisfiedDependencyException() + { + super(); + } + + public UnsatisfiedDependencyException(String message, Throwable throwable) + { + super(message, throwable); + } + + public UnsatisfiedDependencyException(String message) + { + super(message); + } + + public UnsatisfiedDependencyException(Throwable throwable) + { + super(throwable); + } + + + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/UnsatisfiedDependencyException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/UnserializableDependencyException.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnserializableDependencyException.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/UnserializableDependencyException.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/UnserializableDependencyException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject; + +/** + * + * @author Pete Muir + */ +public class UnserializableDependencyException extends DeploymentException +{ + + public UnserializableDependencyException() + { + super(); + } + + public UnserializableDependencyException(String message, Throwable throwable) + { + super(message, throwable); + } + + public UnserializableDependencyException(String message) + { + super(message); + } + + public UnserializableDependencyException(Throwable throwable) + { + super(throwable); + } + + + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/inject/UnserializableDependencyException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/manager (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager) Deleted: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Bean.java 2009-01-25 19:11:28 UTC (rev 1230) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,68 +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.webbeans.manager; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.Set; - -import javax.webbeans.InjectionPoint; - -/** - * The contract between the Web Bean manager and a Web Bean. This interface - * should not be called directly by the application. - * - * @author Gavin King - * - * @param <T> an API type of the Web Bean - */ -public abstract class Bean<T> implements Contextual<T> -{ - private final Manager manager; - - protected Bean(Manager manager) - { - this.manager = manager; - } - - protected Manager getManager() - { - return manager; - } - - public abstract T create(); - - public abstract void destroy(T instance); - - public abstract Set<Type> getTypes(); - - public abstract Set<Annotation> getBindings(); - - public abstract Class<? extends Annotation> getScopeType(); - - public abstract Class<? extends Annotation> getDeploymentType(); - - public abstract String getName(); - - public abstract boolean isSerializable(); - - public abstract boolean isNullable(); - - public abstract Set<InjectionPoint> getInjectionPoints(); - -} Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java (from rev 1231, ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Bean.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,68 @@ +/* + * 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.manager; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Set; + +import javax.context.Contextual; + +/** + * The contract between the Web Bean manager and a Web Bean. This interface + * should not be called directly by the application. + * + * @author Gavin King + * + * @param <T> an API type of the Web Bean + */ +public abstract class Bean<T> implements Contextual<T> +{ + private final Manager manager; + + protected Bean(Manager manager) + { + this.manager = manager; + } + + protected Manager getManager() + { + return manager; + } + + public abstract T create(); + + public abstract void destroy(T instance); + + public abstract Set<Type> getTypes(); + + public abstract Set<Annotation> getBindings(); + + public abstract Class<? extends Annotation> getScopeType(); + + public abstract Class<? extends Annotation> getDeploymentType(); + + public abstract String getName(); + + public abstract boolean isSerializable(); + + public abstract boolean isNullable(); + + public abstract Set<InjectionPoint> getInjectionPoints(); + +} Deleted: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Context.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Context.java 2009-01-25 19:11:28 UTC (rev 1230) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Context.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans.manager; - -import java.lang.annotation.Annotation; - -/** - * The contract between the Web Bean manager and a Web Beans context object. - * This interface should not be called directly by the application. - * - * @author Gavin King - * @author Pete Muir - */ - -public interface Context -{ - - public Class<? extends Annotation> getScopeType(); - - public <T> T get(Contextual<T> bean, boolean create); - - boolean isActive(); - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Contextual.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Contextual.java 2009-01-25 19:11:28 UTC (rev 1230) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Contextual.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,31 +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.webbeans.manager; - -/** - * The contract between a Context and an object that has its lifecycle managed - * by the context - * - * @author Nicklas Karlsson - */ -public interface Contextual<T> -{ - public T create(); - - public void destroy(T instance); -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Decorator.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Decorator.java 2009-01-25 19:11:28 UTC (rev 1230) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Decorator.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,37 +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.webbeans.manager; - -import java.lang.annotation.Annotation; -import java.util.Set; - -public abstract class Decorator extends Bean<Object> -{ - - protected Decorator(Manager manager) - { - super(manager); - } - - public abstract Class<?> getDelegateType(); - - public abstract Set<Annotation> getDelegateBindings(); - - public abstract void setDelegate(Object instance, Object delegate); - -} Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Decorator.java (from rev 1231, ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Decorator.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Decorator.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Decorator.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject.manager; + +import java.lang.annotation.Annotation; +import java.util.Set; + +public abstract class Decorator extends Bean<Object> +{ + + protected Decorator(Manager manager) + { + super(manager); + } + + public abstract Class<?> getDelegateType(); + + public abstract Set<Annotation> getDelegateBindings(); + + public abstract void setDelegate(Object instance, Object delegate); + +} Deleted: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Deployed.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Deployed.java 2009-01-25 19:11:28 UTC (rev 1230) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Deployed.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans.manager; - -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.webbeans.BindingType; - -/** - * Event binding type for the event that is raised by the Web Bean manager when - * it has completed resolving and validation - */ - -@BindingType -@Retention(RUNTIME) -@Target( { FIELD, PARAMETER }) -public @interface Deployed -{ -} Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Deployed.java (from rev 1231, ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Deployed.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Deployed.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Deployed.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.inject.manager; + +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.inject.BindingType; + +/** + * Event binding type for the event that is raised by the Web Bean manager when + * it has completed resolving and validation + */ + +@BindingType +@Retention(RUNTIME) +@Target( { FIELD, PARAMETER }) +public @interface Deployed +{ +} Deleted: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Initialized.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Initialized.java 2009-01-25 19:11:28 UTC (rev 1230) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Initialized.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,38 +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.webbeans.manager; - -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.webbeans.BindingType; - -/** - * Event binding type for the event that is raised by the Web Bean manager when - * it has completed discovery and bean creation - */ -@BindingType -@Retention(RUNTIME) -@Target( { FIELD, PARAMETER }) -public @interface Initialized -{ -} Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Initialized.java (from rev 1231, ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Initialized.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Initialized.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Initialized.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,38 @@ +/* + * 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.manager; + +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.inject.BindingType; + +/** + * Event binding type for the event that is raised by the Web Bean manager when + * it has completed discovery and bean creation + */ +@BindingType +@Retention(RUNTIME) +@Target( { FIELD, PARAMETER }) +public @interface Initialized +{ +} Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/InjectionPoint.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/InjectionPoint.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/manager/InjectionPoint.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/InjectionPoint.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,108 @@ +/* + * 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.manager; + +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); +} Deleted: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/InterceptionType.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/InterceptionType.java 2009-01-25 19:11:28 UTC (rev 1230) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/InterceptionType.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,23 +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.webbeans.manager; - -public enum InterceptionType -{ - AROUND_INVOKE, POST_CONSTRUCT, PRE_DESTROY, PRE_PASSIVATE, POST_ACTIVATE -} \ No newline at end of file Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/InterceptionType.java (from rev 1231, ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/InterceptionType.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/manager/InterceptionType.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/InterceptionType.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,23 @@ +/* + * 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.manager; + +public enum InterceptionType +{ + AROUND_INVOKE, POST_CONSTRUCT, PRE_DESTROY, PRE_PASSIVATE, POST_ACTIVATE +} \ No newline at end of file Deleted: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Interceptor.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Interceptor.java 2009-01-25 19:11:28 UTC (rev 1230) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Interceptor.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,36 +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.webbeans.manager; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.Set; - -public abstract class Interceptor extends Bean<Object> -{ - - protected Interceptor(Manager manager) - { - super(manager); - } - - public abstract Set<Annotation> getInterceptorBindingTypes(); - - public abstract Method getMethod(InterceptionType type); - -} Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Interceptor.java (from rev 1231, ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Interceptor.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Interceptor.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Interceptor.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,36 @@ +/* + * 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.manager; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Set; + +public abstract class Interceptor extends Bean<Object> +{ + + protected Interceptor(Manager manager) + { + super(manager); + } + + public abstract Set<Annotation> getInterceptorBindingTypes(); + + public abstract Method getMethod(InterceptionType type); + +} Deleted: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Manager.java 2009-01-25 19:11:28 UTC (rev 1230) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,85 +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.webbeans.manager; - -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.List; -import java.util.Set; - -import javax.webbeans.Observer; -import javax.webbeans.TypeLiteral; - -/** - * The contract between the application and the Web Bean manager. Also the - * contract between the Web Bean manager and Bean, Context and Observer objects. - * - * @author Gavin King - * - */ -public interface Manager -{ - - public <T> Set<Bean<T>> resolveByType(Class<T> apiType, Annotation... bindings); - - public <T> Set<Bean<T>> resolveByType(TypeLiteral<T> apiType, Annotation... bindings); - - public <T> T getInstanceByType(Class<T> type, Annotation... bindings); - - public <T> T getInstanceByType(TypeLiteral<T> type, Annotation... bindings); - - public Set<Bean<?>> resolveByName(String name); - - public Object getInstanceByName(String name); - - public <T> T getInstance(Bean<T> bean); - - public void fireEvent(Object event, Annotation... bindings); - - public Context getContext(Class<? extends Annotation> scopeType); - - public Manager addContext(Context context); - - public Manager addBean(Bean<?> bean); - - public Manager addInterceptor(Interceptor interceptor); - - public Manager addDecorator(Decorator decorator); - - public Manager parse(InputStream xmlStream); - - public Manager createChildManager(); - - public Manager setCurrent(); - - public <T> Manager addObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings); - - public <T> Manager addObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings); - - public <T> Manager removeObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings); - - public <T> Manager removeObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings); - - public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings); - - public List<Interceptor> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings); - - public List<Decorator> resolveDecorators(Set<Type> types, Annotation... bindings); - -} Copied: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java (from rev 1231, ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Manager.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -0,0 +1,86 @@ +/* + * 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.manager; + +import java.io.InputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.List; +import java.util.Set; + +import javax.context.Context; +import javax.event.Observer; +import javax.inject.TypeLiteral; + +/** + * The contract between the application and the Web Bean manager. Also the + * contract between the Web Bean manager and Bean, Context and Observer objects. + * + * @author Gavin King + * + */ +public interface Manager +{ + + public <T> Set<Bean<T>> resolveByType(Class<T> apiType, Annotation... bindings); + + public <T> Set<Bean<T>> resolveByType(TypeLiteral<T> apiType, Annotation... bindings); + + public <T> T getInstanceByType(Class<T> type, Annotation... bindings); + + public <T> T getInstanceByType(TypeLiteral<T> type, Annotation... bindings); + + public Set<Bean<?>> resolveByName(String name); + + public Object getInstanceByName(String name); + + public <T> T getInstance(Bean<T> bean); + + public void fireEvent(Object event, Annotation... bindings); + + public Context getContext(Class<? extends Annotation> scopeType); + + public Manager addContext(Context context); + + public Manager addBean(Bean<?> bean); + + public Manager addInterceptor(Interceptor interceptor); + + public Manager addDecorator(Decorator decorator); + + public Manager parse(InputStream xmlStream); + + public Manager createChildManager(); + + public Manager setCurrent(); + + public <T> Manager addObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings); + + public <T> Manager addObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings); + + public <T> Manager removeObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings); + + public <T> Manager removeObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings); + + public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings); + + public List<Interceptor> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings); + + public List<Decorator> resolveDecorators(Set<Type> types, Annotation... bindings); + +} Copied: ri/trunk/webbeans-api/src/main/java/javax/interceptor/Interceptor.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Interceptor.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/interceptor/Interceptor.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/interceptor/Interceptor.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.interceptor; + +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.annotation.Stereotype; + +/** + * Specifies that a class is a Web Beans interceptor. + * + * @author Gavin King + * + */ +@Retention(RUNTIME) +@Target(TYPE) +@Stereotype +public @interface Interceptor +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/interceptor/Interceptor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-api/src/main/java/javax/interceptor/InterceptorBindingType.java (from rev 1230, ri/trunk/webbeans-api/src/main/java/javax/webbeans/InterceptorBindingType.java) =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/interceptor/InterceptorBindingType.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/interceptor/InterceptorBindingType.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.interceptor; + +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 Web Beans + * interceptor binding type. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target(ANNOTATION_TYPE) +@Retention(RUNTIME) +@Documented +public @interface InterceptorBindingType +{ +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/interceptor/InterceptorBindingType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionCompletion.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionCompletion.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionCompletion.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,36 +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.webbeans; - -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that an observer method is a transactional observer. - * - * @author Gavin King - * - */ -@Retention(RUNTIME) -@Target(PARAMETER) -public @interface AfterTransactionCompletion -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionFailure.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionFailure.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionFailure.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,36 +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.webbeans; - -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that an observer method is a transactional observer. - * - * @author Gavin King - * - */ -@Retention(RUNTIME) -@Target(PARAMETER) -public @interface AfterTransactionFailure -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionSuccess.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionSuccess.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionSuccess.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,36 +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.webbeans; - -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that an observer method is a transactional observer. - * - * @author Gavin King - * - */ -@Retention(RUNTIME) -@Target(PARAMETER) -public @interface AfterTransactionSuccess -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/AmbiguousDependencyException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/AmbiguousDependencyException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/AmbiguousDependencyException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * An AmbiguousDependencyException is thrown when within the set of enabled Web - * Beans with the API type and bind- ing types declared there exists no unique - * Web Bean with a higher precedence than all other Web Beans in the set. - * - * - * @author Pete Muir - */ -public class AmbiguousDependencyException extends DeploymentException -{ - - 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/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,175 +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.webbeans; - -/** - * Supports inline instantiation of annotation types. - * - * @author Pete Muir - * @author Gavin King - * - * @param <T> - * the annotation type - */ -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; - -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 - /* - * The hash code of a primitive value v is equal to WrapperType.valueOf(v).hashCode(), where WrapperType is the wrapper type corresponding to the primitive type of v (Byte, Character, Double, Float, Integer, Long, Short, or Boolean). - * The hash code of a string, enum, class, or annotation member-value I v is computed as by calling v.hashCode(). (In the case of annotation member values, this is a recursive definition.) - * The hash code of an array member-value is computed by calling the appropriate overloading of Arrays.hashCode on the value. (There is one overloading for each primitive type, and one for object reference types.) - */ - 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/webbeans-api/src/main/java/javax/webbeans/ApplicationScoped.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/ApplicationScoped.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/ApplicationScoped.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,46 +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.webbeans; - -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 Web Bean is application scoped. - * - * @author Gavin King - * - * @author Pete Muir - */ - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@ScopeType -@Inherited -public @interface ApplicationScoped -{ - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/BeforeTransactionCompletion.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/BeforeTransactionCompletion.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/BeforeTransactionCompletion.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,36 +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.webbeans; - -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that an observer method is a transactional observer. - * - * @author Gavin King - * - */ -@Retention(RUNTIME) -@Target(PARAMETER) -public @interface BeforeTransactionCompletion -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/BindingType.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/BindingType.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/BindingType.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -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 Web Beans binding type. - * - * @author Pete Muir - * @author Gavin King - */ - -@Target(ANNOTATION_TYPE) -@Retention(RUNTIME) -@Documented -public @interface BindingType -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/ContextNotActiveException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/ContextNotActiveException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/ContextNotActiveException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * 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 -{ - - public ContextNotActiveException() - { - super(); - } - - public ContextNotActiveException(String message) - { - super(message); - } - - public ContextNotActiveException(Throwable cause) - { - super(cause); - } - - public ContextNotActiveException(String message, Throwable cause) - { - super(message, cause); - } - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Conversation.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Conversation.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Conversation.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,11 +0,0 @@ -package javax.webbeans; - -public interface Conversation { - public void begin(); - public void begin(String id); - public void end(); - public boolean isLongRunning(); - public String getId(); - public long getTimeout(); - public void setTimeout(long milliseconds); -} \ No newline at end of file Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/ConversationScoped.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/ConversationScoped.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/ConversationScoped.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -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 Web Bean is conversation scoped. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@ScopeType(passivating = true) -public @interface ConversationScoped -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/CreationException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/CreationException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/CreationException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * - * @author Pete Muir - */ - -public class CreationException extends ExecutionException -{ - - 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/webbeans-api/src/main/java/javax/webbeans/Current.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Current.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Current.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -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/webbeans-api/src/main/java/javax/webbeans/Decorates.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorates.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorates.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -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; - -/** - * Specifies that a field of a decorator class is the delegate attribute. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target(FIELD) -@Retention(RUNTIME) -@Documented -public @interface Decorates -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorator.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorator.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorator.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -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 class is a Web Beans decorator. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target(TYPE) -@Retention(RUNTIME) -@Documented -@Stereotype -public @interface Decorator -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/DefinitionException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/DefinitionException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/DefinitionException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,49 +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.webbeans; - -/** - * - * @author Pete Muir - */ -public class DefinitionException extends RuntimeException -{ - - public DefinitionException() - { - super(); - } - - public DefinitionException(String message, Throwable throwable) - { - super(message, throwable); - } - - public DefinitionException(String message) - { - super(message); - } - - public DefinitionException(Throwable throwable) - { - super(throwable); - } - - - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Dependent.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Dependent.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Dependent.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,44 +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.webbeans; - -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 Web Bean is dependent scoped. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { METHOD, TYPE, FIELD }) -@Retention(RUNTIME) -@Documented -@ScopeType(normal = false) -@Inherited -public @interface Dependent -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,49 +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.webbeans; - -/** - * - * @author Pete Muir - */ -public class DeploymentException extends RuntimeException -{ - - public DeploymentException() - { - super(); - } - - public DeploymentException(String message, Throwable throwable) - { - super(message, throwable); - } - - public DeploymentException(String message) - { - super(message); - } - - public DeploymentException(Throwable throwable) - { - super(throwable); - } - - - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentType.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentType.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentType.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -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 Web Beans deployment type. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target(ANNOTATION_TYPE) -@Retention(RUNTIME) -@Documented -public @interface DeploymentType -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Disposes.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Disposes.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Disposes.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -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 a Web Bean implementation class - * class 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/webbeans-api/src/main/java/javax/webbeans/DuplicateBindingTypeException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/DuplicateBindingTypeException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/DuplicateBindingTypeException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * This exception is thrown whenever more than one binding type instance of the - * same type is used with the API. - * - * @author David Allen - */ -public class DuplicateBindingTypeException extends ExecutionException -{ - - private static final long serialVersionUID = 4194175477451120383L; - - public DuplicateBindingTypeException() - { - super(); - } - - public DuplicateBindingTypeException(String message, Throwable cause) - { - super(message, cause); - } - - public DuplicateBindingTypeException(String message) - { - super(message); - } - - public DuplicateBindingTypeException(Throwable cause) - { - super(cause); - } - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Event.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Event.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Event.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -import java.lang.annotation.Annotation; - -/** - * An interface for firing events of a particular type, and registering - * observers for events of that type. - * - * @author Gavin King - * @author Pete Muir - * - * @param <T> -* the type of the event object - */ - -public interface Event<T> -{ - - public void fire(T event, Annotation... bindings); - - public void observe(Observer<T> observer, Annotation... bindings); - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/ExecutionException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/ExecutionException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/ExecutionException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * - * @author Pete Muir - */ -public class ExecutionException extends RuntimeException -{ - - public ExecutionException() - { - super(); - } - - public ExecutionException(String message, Throwable throwable) - { - super(message, throwable); - } - - public ExecutionException(String message) - { - super(message); - } - - public ExecutionException(Throwable throwable) - { - super(throwable); - } - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Fires.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Fires.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Fires.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,43 +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.webbeans; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotates a variable to be injected with an Event object that can be fired and - * observed by observer methods - * - * @author David Allen - * @author Gavin King - */ - -@BindingType -@Retention(RUNTIME) -@Target( { TYPE, METHOD, FIELD, PARAMETER }) -@Documented -public @interface Fires -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/IfExists.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/IfExists.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/IfExists.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -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 an observer method is only called if the current instance of - * the Web Bean declaring the observer method already exists. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target(PARAMETER) -@Retention(RUNTIME) -@Documented -public @interface IfExists -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/IllegalProductException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/IllegalProductException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/IllegalProductException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,44 +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.webbeans; - -/** - */ -public class IllegalProductException extends ExecutionException -{ - - 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/webbeans-api/src/main/java/javax/webbeans/InconsistentSpecializationException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/InconsistentSpecializationException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/InconsistentSpecializationException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * - * @author Pete Muir - */ -public class InconsistentSpecializationException extends DeploymentException -{ - - public InconsistentSpecializationException() - { - super(); - } - - public InconsistentSpecializationException(String message, Throwable throwable) - { - super(message, throwable); - } - - public InconsistentSpecializationException(String message) - { - super(message); - } - - public InconsistentSpecializationException(Throwable throwable) - { - super(throwable); - } - - - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Initializer.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Initializer.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Initializer.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -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 Web Bean implementation class is a Web Beans - * initializer method, or that a constructor is the Web Bean constructor. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { METHOD, CONSTRUCTOR }) -@Retention(RUNTIME) -@Documented -public @interface Initializer -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/InjectionPoint.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/InjectionPoint.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/InjectionPoint.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,109 +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.webbeans; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Member; -import java.lang.reflect.Type; -import java.util.Set; - -import javax.webbeans.manager.Bean; - -/** - * - * 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); -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Instance.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Instance.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Instance.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,49 +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.webbeans; - -import java.lang.annotation.Annotation; - -/** - * An interface for looking up web 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 Web 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 Web 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/webbeans-api/src/main/java/javax/webbeans/Interceptor.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Interceptor.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Interceptor.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,37 +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.webbeans; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that a class is a Web Beans interceptor. - * - * @author Gavin King - * - */ -@Retention(RUNTIME) -@Target(TYPE) -@Stereotype -public @interface Interceptor -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/InterceptorBindingType.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/InterceptorBindingType.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/InterceptorBindingType.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -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 Web Beans - * interceptor binding type. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target(ANNOTATION_TYPE) -@Retention(RUNTIME) -@Documented -public @interface InterceptorBindingType -{ -} Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -8,6 +8,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import javax.annotation.Named; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; + /** * A stereotype for MVC model objects * Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Named.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Named.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Named.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -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 Web 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. - * - * @return the component name - */ - - public String value() default ""; - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/New.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/New.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/New.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -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 -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonBinding.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonBinding.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonBinding.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,37 +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.webbeans; - -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 -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentConstructorException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentConstructorException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentConstructorException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * - * @author Pete Muir - */ - -public class NonexistentConstructorException extends DefinitionException -{ - - public NonexistentConstructorException() - { - - } - - public NonexistentConstructorException(String message) - { - super(message); - } - - public NonexistentConstructorException(Throwable cause) - { - super(cause); - } - - public NonexistentConstructorException(String message, Throwable cause) - { - super(message, cause); - } - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentFieldException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentFieldException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentFieldException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * - * @author Pete Muir - */ - -public class NonexistentFieldException extends DefinitionException -{ - - public NonexistentFieldException() - { - - } - - public NonexistentFieldException(String message) - { - super(message); - } - - public NonexistentFieldException(Throwable cause) - { - super(cause); - } - - public NonexistentFieldException(String message, Throwable cause) - { - super(message, cause); - } - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMemberException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMemberException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMemberException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * - * @author Pete Muir - */ - -public class NonexistentMemberException extends DefinitionException -{ - - public NonexistentMemberException() - { - - } - - public NonexistentMemberException(String message) - { - super(message); - } - - public NonexistentMemberException(Throwable cause) - { - super(cause); - } - - public NonexistentMemberException(String message, Throwable cause) - { - super(message, cause); - } - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMethodException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMethodException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMethodException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * - * @author Pete Muir - */ - -public class NonexistentMethodException extends DefinitionException -{ - - public NonexistentMethodException() - { - - } - - public NonexistentMethodException(String message) - { - super(message); - } - - public NonexistentMethodException(Throwable cause) - { - super(cause); - } - - public NonexistentMethodException(String message, Throwable cause) - { - super(message, cause); - } - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentTypeException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentTypeException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentTypeException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * - * @author Pete Muir - */ - -public class NonexistentTypeException extends DefinitionException -{ - - public NonexistentTypeException() - { - - } - - public NonexistentTypeException(String message) - { - super(message); - } - - public NonexistentTypeException(Throwable cause) - { - super(cause); - } - - public NonexistentTypeException(String message, Throwable cause) - { - super(message, cause); - } - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/NullableDependencyException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/NullableDependencyException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/NullableDependencyException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * - * @author Pete Muir - */ -public class NullableDependencyException extends DeploymentException -{ - - public NullableDependencyException() - { - super(); - } - - public NullableDependencyException(String message, Throwable throwable) - { - super(message, throwable); - } - - public NullableDependencyException(String message) - { - super(message); - } - - public NullableDependencyException(Throwable throwable) - { - super(throwable); - } - - - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observer.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observer.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observer.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,13 +0,0 @@ -package javax.webbeans; - -/** - * The contract between the Web Bean manager and a Web Beans observer object. - * This interface should not be called directly by the application. - * - * @author Gavin King - * - */ -public interface Observer<T> -{ - public void notify(T event); -} \ No newline at end of file Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/ObserverException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/ObserverException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/ObserverException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * - * @author Pete Muir - */ - -public class ObserverException extends ExecutionException -{ - - public ObserverException() - { - - } - - public ObserverException(String message) - { - super(message); - } - - public ObserverException(Throwable cause) - { - super(cause); - } - - public ObserverException(String message, Throwable cause) - { - super(message, cause); - } - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observes.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observes.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observes.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -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 a Web Bean - * implementation class is the event parameter - * of an observer method. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target(PARAMETER) -@Retention(RUNTIME) -@Documented -public @interface Observes -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtains.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtains.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtains.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotates a variable to be injected with an Instance object. - * - * @author Gavin King - */ - -@BindingType -@Retention(RUNTIME) -@Target( { TYPE, METHOD, FIELD, PARAMETER }) -@Documented -public @interface Obtains -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Produces.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Produces.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Produces.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -import static java.lang.annotation.ElementType.METHOD; -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; - -/** - * - * Specifies that a method of a Web Bean implementation class is a producer - * method. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target({METHOD, FIELD}) -@Retention(RUNTIME) -@Documented -public @interface Produces -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Production.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Production.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Production.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -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/webbeans-api/src/main/java/javax/webbeans/Realizes.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Realizes.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Realizes.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -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) -@Retention(RUNTIME) -@Documented -public @interface Realizes -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/RequestScoped.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/RequestScoped.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/RequestScoped.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,44 +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.webbeans; - -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 Web Bean is request scoped. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@ScopeType -@Inherited -public @interface RequestScoped -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/ScopeType.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/ScopeType.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/ScopeType.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,51 +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.webbeans; - -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 Web Beans 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 (Web Beans with this scope - * type must be serializable) - */ - boolean passivating() default false; - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/SessionScoped.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/SessionScoped.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/SessionScoped.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,44 +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.webbeans; - -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 Web Bean is session scoped. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@ScopeType(passivating = true) -@Inherited -public @interface SessionScoped -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Specializes.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Specializes.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Specializes.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -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/webbeans-api/src/main/java/javax/webbeans/Standard.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Standard.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Standard.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,43 +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.webbeans; - -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 Web Beans - * specification. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -public @interface Standard -{ -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Stereotype.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Stereotype.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Stereotype.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,45 +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.webbeans; - -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 Web Beans stereotype. - * - * @author Pete Muir - * @author Gavin King - */ - -@Retention(RUNTIME) -@Target(ANNOTATION_TYPE) -@Documented -public @interface Stereotype -{ - - public Class<? extends Annotation>[] supportedScopes() default {}; - - public Class<?>[] requiredTypes() default {}; - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/TypeLiteral.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/TypeLiteral.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/TypeLiteral.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,111 +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.webbeans; - -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"); - } - } - - public final Type getType() - { - return actualType; - } - - @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/webbeans-api/src/main/java/javax/webbeans/UnproxyableDependencyException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnproxyableDependencyException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnproxyableDependencyException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * - * @author Pete Muir - */ -public class UnproxyableDependencyException extends DeploymentException -{ - - 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/webbeans-api/src/main/java/javax/webbeans/UnremovedException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnremovedException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnremovedException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * - * @author Pete Muir - */ - -public class UnremovedException extends ExecutionException -{ - - public UnremovedException() - { - - } - - public UnremovedException(String message) - { - super(message); - } - - public UnremovedException(Throwable cause) - { - super(cause); - } - - public UnremovedException(String message, Throwable cause) - { - super(message, cause); - } - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnsatisfiedDependencyException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnsatisfiedDependencyException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnsatisfiedDependencyException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * - * @author Pete Muir - */ -public class UnsatisfiedDependencyException extends DeploymentException -{ - - public UnsatisfiedDependencyException() - { - super(); - } - - public UnsatisfiedDependencyException(String message, Throwable throwable) - { - super(message, throwable); - } - - public UnsatisfiedDependencyException(String message) - { - super(message); - } - - public UnsatisfiedDependencyException(Throwable throwable) - { - super(throwable); - } - - - -} Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnserializableDependencyException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnserializableDependencyException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/UnserializableDependencyException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans; - -/** - * - * @author Pete Muir - */ -public class UnserializableDependencyException extends DeploymentException -{ - - public UnserializableDependencyException() - { - super(); - } - - public UnserializableDependencyException(String message, Throwable throwable) - { - super(message, throwable); - } - - public UnserializableDependencyException(String message) - { - super(message); - } - - public UnserializableDependencyException(Throwable throwable) - { - super(throwable); - } - - - -} Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -22,16 +22,16 @@ import java.util.List; import java.util.Set; -import javax.webbeans.AmbiguousDependencyException; -import javax.webbeans.DefinitionException; -import javax.webbeans.InconsistentSpecializationException; -import javax.webbeans.InjectionPoint; -import javax.webbeans.New; -import javax.webbeans.NullableDependencyException; -import javax.webbeans.UnproxyableDependencyException; -import javax.webbeans.UnsatisfiedDependencyException; -import javax.webbeans.UnserializableDependencyException; -import javax.webbeans.manager.Bean; +import javax.inject.AmbiguousDependencyException; +import javax.inject.DefinitionException; +import javax.inject.InconsistentSpecializationException; +import javax.inject.New; +import javax.inject.NullableDependencyException; +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.AbstractBean; import org.jboss.webbeans.bean.NewEnterpriseBean; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/FacadeImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/FacadeImpl.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/FacadeImpl.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -21,8 +21,8 @@ import java.util.HashSet; import java.util.Set; -import javax.webbeans.DuplicateBindingTypeException; -import javax.webbeans.manager.Manager; +import javax.inject.DuplicateBindingTypeException; +import javax.inject.manager.Manager; import org.jboss.webbeans.util.Reflections; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/InstanceImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/InstanceImpl.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/InstanceImpl.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -21,8 +21,8 @@ import java.util.Collections; import java.util.Set; -import javax.webbeans.Instance; -import javax.webbeans.manager.Manager; +import javax.inject.Instance; +import javax.inject.manager.Manager; /** * Helper implementation for Instance for getting instances @@ -52,8 +52,8 @@ * @param bindingTypes The binding types * @return The instance * - * @see javax.webbeans.Instance#get(Annotation...) - * @see javax.webbeans.manager.Manager#getInstanceByType(Class, Annotation...) + * @see javax.inject.Instance#get(Annotation...) + * @see javax.inject.manager.Manager#getInstanceByType(Class, Annotation...) */ public T get(Annotation... bindingTypes) { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -33,23 +33,23 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; -import javax.webbeans.AmbiguousDependencyException; -import javax.webbeans.BindingType; -import javax.webbeans.ContextNotActiveException; -import javax.webbeans.DeploymentException; -import javax.webbeans.DuplicateBindingTypeException; -import javax.webbeans.Observer; -import javax.webbeans.Production; -import javax.webbeans.Standard; -import javax.webbeans.TypeLiteral; -import javax.webbeans.UnproxyableDependencyException; -import javax.webbeans.UnsatisfiedDependencyException; -import javax.webbeans.manager.Bean; -import javax.webbeans.manager.Context; -import javax.webbeans.manager.Decorator; -import javax.webbeans.manager.InterceptionType; -import javax.webbeans.manager.Interceptor; -import javax.webbeans.manager.Manager; +import javax.context.Context; +import javax.context.ContextNotActiveException; +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.InterceptionType; +import javax.inject.manager.Interceptor; +import javax.inject.manager.Manager; import org.jboss.webbeans.bean.AbstractBean; import org.jboss.webbeans.bean.EnterpriseBean; @@ -175,7 +175,7 @@ * @param bean The bean to register * @return A reference to manager * - * @see javax.webbeans.manager.Manager#addBean(javax.webbeans.manager.Bean) + * @see javax.inject.manager.Manager#addBean(javax.inject.manager.Bean) */ public Manager addBean(Bean<?> bean) { @@ -209,7 +209,7 @@ * @param bindings The binding types to match * @return The set of matching observers * - * @see javax.webbeans.manager.Manager#resolveObservers(java.lang.Object, + * @see javax.inject.manager.Manager#resolveObservers(java.lang.Object, * java.lang.annotation.Annotation[]) */ @SuppressWarnings("unchecked") @@ -265,7 +265,7 @@ * @param bindingTypes The binding types to match * @return The set of matching beans * - * @see javax.webbeans.manager.Manager#resolveByType(java.lang.Class, + * @see javax.inject.manager.Manager#resolveByType(java.lang.Class, * java.lang.annotation.Annotation[]) */ public <T> Set<Bean<T>> resolveByType(Class<T> type, Annotation... bindings) @@ -280,7 +280,7 @@ * @param bindingTypes The binding types to match * @return The set of matching beans * - * @see javax.webbeans.manager.Manager#resolveByType(javax.webbeans.TypeLiteral, + * @see javax.inject.manager.Manager#resolveByType(javax.inject.TypeLiteral, * java.lang.annotation.Annotation[]) */ public <T> Set<Bean<T>> resolveByType(TypeLiteral<T> type, Annotation... bindings) @@ -384,7 +384,7 @@ * @param context The context to add * @return A reference to the manager * - * @see javax.webbeans.manager.Manager#addContext(javax.webbeans.manager.Context) + * @see javax.inject.manager.Manager#addContext(javax.context.Context) */ public Manager addContext(Context context) { @@ -398,7 +398,7 @@ * @param decorator The decorator to register * @return A reference to the manager * - * @see javax.webbeans.manager.Manager#addDecorator(javax.webbeans.manager.Decorator) + * @see javax.inject.manager.Manager#addDecorator(javax.inject.manager.Decorator) */ public Manager addDecorator(Decorator decorator) { @@ -412,7 +412,7 @@ * @param interceptor The interceptor to register * @return A reference to the manager * - * @see javax.webbeans.manager.Manager#addInterceptor(javax.webbeans.manager.Interceptor) + * @see javax.inject.manager.Manager#addInterceptor(javax.inject.manager.Interceptor) */ public Manager addInterceptor(Interceptor interceptor) { @@ -428,7 +428,7 @@ * @param bindings The bindings to match * @return A reference to the manager * - * @see javax.webbeans.manager.Manager#addObserver(javax.webbeans.Observer, + * @see javax.inject.manager.Manager#addObserver(javax.event.Observer, * java.lang.Class, java.lang.annotation.Annotation[]) */ public <T> Manager addObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings) @@ -451,8 +451,8 @@ * @param bindings The bindings to match * @return A reference to the manager * - * @see javax.webbeans.manager.Manager#addObserver(javax.webbeans.Observer, - * javax.webbeans.TypeLiteral, java.lang.annotation.Annotation[]) + * @see javax.inject.manager.Manager#addObserver(javax.event.Observer, + * javax.inject.TypeLiteral, java.lang.annotation.Annotation[]) */ public <T> Manager addObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings) { @@ -466,7 +466,7 @@ * @param event The event object to pass along * @param bindings The binding types to match * - * @see javax.webbeans.manager.Manager#fireEvent(java.lang.Object, + * @see javax.inject.manager.Manager#fireEvent(java.lang.Object, * java.lang.annotation.Annotation[]) */ public void fireEvent(Object event, Annotation... bindings) @@ -500,7 +500,7 @@ * @param scopeType The scope to match * @return A single active context of the given scope * - * @see javax.webbeans.manager.Manager#getContext(java.lang.Class) + * @see javax.inject.manager.Manager#getContext(java.lang.Class) */ public Context getContext(Class<? extends Annotation> scopeType) { @@ -540,7 +540,7 @@ * @param bean The bean to instantiate * @return An instance of the bean * - * @see javax.webbeans.manager.Manager#getInstance(javax.webbeans.manager.Bean) + * @see javax.inject.manager.Manager#getInstance(javax.inject.manager.Bean) */ public <T> T getInstance(Bean<T> bean) { @@ -553,7 +553,7 @@ * @param bean The bean to instantiate * @return An instance of the bean * - * @see javax.webbeans.manager.Manager#getInstance(javax.webbeans.manager.Bean) + * @see javax.inject.manager.Manager#getInstance(javax.inject.manager.Bean) */ public <T> T getInstance(Bean<T> bean, boolean create) { @@ -578,7 +578,7 @@ * @param name The name to match * @return An instance of the bean * - * @see javax.webbeans.manager.Manager#getInstanceByName(java.lang.String) + * @see javax.inject.manager.Manager#getInstanceByName(java.lang.String) */ public Object getInstanceByName(String name) { @@ -604,7 +604,7 @@ * @param bindingTypes The binding types to match * @return An instance of the bean * - * @see javax.webbeans.manager.Manager#getInstanceByType(java.lang.Class, + * @see javax.inject.manager.Manager#getInstanceByType(java.lang.Class, * java.lang.annotation.Annotation[]) */ public <T> T getInstanceByType(Class<T> type, Annotation... bindings) @@ -620,7 +620,7 @@ * @param bindingTypes The binding types to match * @return An instance of the bean * - * @see javax.webbeans.manager.Manager#getInstanceByType(javax.webbeans.TypeLiteral, + * @see javax.inject.manager.Manager#getInstanceByType(javax.inject.TypeLiteral, * java.lang.annotation.Annotation[]) */ public <T> T getInstanceByType(TypeLiteral<T> type, Annotation... bindings) @@ -664,7 +664,7 @@ * @param bindings the binding types to match * @return A reference to the manager * - * @see javax.webbeans.manager.Manager#removeObserver(javax.webbeans.Observer, + * @see javax.inject.manager.Manager#removeObserver(javax.event.Observer, * java.lang.Class, java.lang.annotation.Annotation[]) */ public <T> Manager removeObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings) @@ -681,8 +681,8 @@ * @param bindings the binding types to match * @return A reference to the manager * - * @see javax.webbeans.manager.Manager#removeObserver(javax.webbeans.Observer, - * javax.webbeans.TypeLiteral, java.lang.annotation.Annotation[]) + * @see javax.inject.manager.Manager#removeObserver(javax.event.Observer, + * javax.inject.TypeLiteral, java.lang.annotation.Annotation[]) */ public <T> Manager removeObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings) { @@ -696,7 +696,7 @@ * @param The name to match * @return The set of matching beans * - * @see javax.webbeans.manager.Manager#resolveByName(java.lang.String) + * @see javax.inject.manager.Manager#resolveByName(java.lang.String) */ public Set<Bean<?>> resolveByName(String name) { @@ -710,7 +710,7 @@ * @param bindingTypes The binding types to match * @return A list of matching decorators * - * @see javax.webbeans.manager.Manager#resolveDecorators(java.util.Set, + * @see javax.inject.manager.Manager#resolveDecorators(java.util.Set, * java.lang.annotation.Annotation[]) */ public List<Decorator> resolveDecorators(Set<Type> types, Annotation... bindings) @@ -726,7 +726,7 @@ * @param interceptorBindings The binding types to match * @return A list of matching interceptors * - * @see javax.webbeans.manager.Manager#resolveInterceptors(javax.webbeans.manager.InterceptionType, + * @see javax.inject.manager.Manager#resolveInterceptors(javax.inject.manager.InterceptionType, * java.lang.annotation.Annotation[]) */ public List<Interceptor> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -28,12 +28,12 @@ import java.util.TreeSet; import java.util.concurrent.Callable; -import javax.webbeans.InjectionPoint; -import javax.webbeans.TypeLiteral; -import javax.webbeans.manager.Bean; -import javax.webbeans.manager.Decorator; -import javax.webbeans.manager.InterceptionType; -import javax.webbeans.manager.Interceptor; +import javax.inject.TypeLiteral; +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 org.jboss.webbeans.bean.InjectionPointBean; import org.jboss.webbeans.introspector.AnnotatedItem; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -24,16 +24,16 @@ import java.util.List; import java.util.Set; -import javax.webbeans.BindingType; -import javax.webbeans.DefinitionException; -import javax.webbeans.Dependent; -import javax.webbeans.Event; -import javax.webbeans.InjectionPoint; -import javax.webbeans.Named; -import javax.webbeans.Specializes; -import javax.webbeans.Standard; -import javax.webbeans.Stereotype; -import javax.webbeans.manager.Bean; +import javax.annotation.Named; +import javax.annotation.Stereotype; +import javax.context.Dependent; +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 javax.inject.manager.InjectionPoint; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.context.DependentInstancesStore; @@ -380,7 +380,7 @@ * * @return The set of binding types * - * @see javax.webbeans.manager.Bean#getBindings() + * @see javax.inject.manager.Bean#getBindings() */ public Set<Annotation> getBindings() { @@ -401,7 +401,7 @@ * * @return The deployment type * - * @see javax.webbeans.manager.Bean#getDeploymentType() + * @see javax.inject.manager.Bean#getDeploymentType() */ public Class<? extends Annotation> getDeploymentType() { @@ -443,7 +443,7 @@ * * @return The name * - * @see javax.webbeans.manager.Bean#getName() + * @see javax.inject.manager.Bean#getName() */ public String getName() { @@ -455,7 +455,7 @@ * * @return The scope type * - * @see javax.webbeans.manager.Bean#getScopeType() + * @see javax.inject.manager.Bean#getScopeType() */ public Class<? extends Annotation> getScopeType() { @@ -477,7 +477,7 @@ * * @return The set of API types * - * @see javax.webbeans.manager.Bean#getTypes() + * @see javax.inject.manager.Bean#getTypes() */ @Override public Set<Type> getTypes() @@ -502,7 +502,7 @@ * * @return True if nullable, false otherwise * - * @see javax.webbeans.manager.Bean#isNullable() + * @see javax.inject.manager.Bean#isNullable() */ @Override public boolean isNullable() Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -21,16 +21,16 @@ import java.util.HashSet; import java.util.Set; -import javax.webbeans.BindingType; -import javax.webbeans.DefinitionException; -import javax.webbeans.Dependent; -import javax.webbeans.DeploymentType; -import javax.webbeans.Disposes; -import javax.webbeans.Initializer; -import javax.webbeans.Observes; -import javax.webbeans.Produces; -import javax.webbeans.Production; -import javax.webbeans.ScopeType; +import javax.context.Dependent; +import javax.context.ScopeType; +import javax.event.Observes; +import javax.inject.BindingType; +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.injection.InjectionPointProvider; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -19,9 +19,9 @@ import java.lang.annotation.Annotation; -import javax.webbeans.Dependent; -import javax.webbeans.Production; -import javax.webbeans.Standard; +import javax.context.Dependent; +import javax.inject.Production; +import javax.inject.Standard; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedItem; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -24,13 +24,13 @@ import java.util.HashSet; import java.util.Set; -import javax.webbeans.DefinitionException; -import javax.webbeans.Dependent; -import javax.webbeans.DeploymentType; -import javax.webbeans.IllegalProductException; -import javax.webbeans.Initializer; -import javax.webbeans.Produces; -import javax.webbeans.ScopeType; +import javax.context.Dependent; +import javax.context.ScopeType; +import javax.inject.DefinitionException; +import javax.inject.DeploymentType; +import javax.inject.IllegalProductException; +import javax.inject.Initializer; +import javax.inject.Produces; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.MetaDataCache; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -24,12 +24,12 @@ import javassist.util.proxy.ProxyFactory; import javassist.util.proxy.ProxyObject; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.CreationException; -import javax.webbeans.Decorator; -import javax.webbeans.DefinitionException; -import javax.webbeans.Dependent; -import javax.webbeans.Interceptor; +import javax.context.ApplicationScoped; +import javax.context.Dependent; +import javax.decorator.Decorator; +import javax.inject.CreationException; +import javax.inject.DefinitionException; +import javax.interceptor.Interceptor; import javax.webbeans.Observes; import org.jboss.webbeans.ManagerImpl; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -20,8 +20,8 @@ import java.lang.reflect.Type; -import javax.webbeans.DefinitionException; -import javax.webbeans.Event; +import javax.event.Event; +import javax.inject.DefinitionException; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.context.DependentContext; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -21,8 +21,8 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.webbeans.manager.Bean; -import javax.webbeans.manager.Manager; +import javax.inject.manager.Bean; +import javax.inject.manager.Manager; /** * A delegating bean Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -18,7 +18,7 @@ package org.jboss.webbeans.bean; -import javax.webbeans.Instance; +import javax.inject.Instance; import org.jboss.webbeans.InstanceImpl; import org.jboss.webbeans.ManagerImpl; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -21,8 +21,8 @@ import java.util.HashSet; import java.util.Set; -import javax.webbeans.Dependent; -import javax.webbeans.Standard; +import javax.context.Dependent; +import javax.inject.Standard; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedClass; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -22,8 +22,8 @@ import java.util.HashSet; import java.util.Set; -import javax.webbeans.Dependent; -import javax.webbeans.Standard; +import javax.context.Dependent; +import javax.inject.Standard; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.context.DependentContext; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -21,9 +21,9 @@ import java.lang.reflect.Method; import java.util.Set; -import javax.webbeans.DefinitionException; -import javax.webbeans.Disposes; -import javax.webbeans.Observes; +import javax.event.Observes; +import javax.inject.DefinitionException; +import javax.inject.Disposes; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.MetaDataCache; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -23,13 +23,13 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; +import javax.context.Dependent; +import javax.inject.DefinitionException; +import javax.inject.ExecutionException; +import javax.inject.Initializer; +import javax.inject.manager.InjectionPoint; import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContextType; -import javax.webbeans.DefinitionException; -import javax.webbeans.Dependent; -import javax.webbeans.ExecutionException; -import javax.webbeans.Initializer; -import javax.webbeans.InjectionPoint; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.MetaDataCache; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -22,8 +22,8 @@ import javassist.util.proxy.MethodHandler; -import javax.webbeans.manager.Bean; -import javax.webbeans.manager.Context; +import javax.context.Context; +import javax.inject.manager.Bean; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.log.LogProvider; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -25,8 +25,8 @@ import javassist.util.proxy.ProxyFactory; -import javax.webbeans.DefinitionException; -import javax.webbeans.manager.Bean; +import javax.inject.DefinitionException; +import javax.inject.manager.Bean; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.util.ConcurrentCache; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -8,14 +8,14 @@ import java.util.HashSet; import java.util.Set; -import javax.webbeans.BindingType; -import javax.webbeans.DeploymentType; -import javax.webbeans.Fires; -import javax.webbeans.Initializer; -import javax.webbeans.Observes; -import javax.webbeans.Obtains; -import javax.webbeans.Produces; -import javax.webbeans.Realizes; +import javax.event.Fires; +import javax.event.Observes; +import javax.inject.BindingType; +import javax.inject.DeploymentType; +import javax.inject.Initializer; +import javax.inject.Obtains; +import javax.inject.Produces; +import javax.inject.Realizes; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.AbstractBean; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/PropertiesBasedBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/PropertiesBasedBootstrap.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/PropertiesBasedBootstrap.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -20,7 +20,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import javax.webbeans.ExecutionException; +import javax.inject.ExecutionException; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractBeanMapContext.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractBeanMapContext.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractBeanMapContext.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -19,9 +19,9 @@ import java.lang.annotation.Annotation; -import javax.webbeans.ContextNotActiveException; -import javax.webbeans.manager.Bean; -import javax.webbeans.manager.Contextual; +import javax.context.ContextNotActiveException; +import javax.context.Contextual; +import javax.inject.manager.Bean; import org.jboss.webbeans.context.beanmap.BeanMap; @@ -56,7 +56,7 @@ * @return An instance of the bean * @throws ContextNotActiveException if the context is not active * - * @see javax.webbeans.manager.Context#get(Bean, boolean) + * @see javax.context.Context#get(Bean, boolean) */ public <T> T get(Contextual<T> bean, boolean create) { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractContext.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractContext.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractContext.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -19,7 +19,7 @@ import java.lang.annotation.Annotation; -import javax.webbeans.manager.Context; +import javax.context.Context; /** * Common Context operation @@ -58,7 +58,7 @@ * * @return The scope type * - * @see javax.webbeans.manager.Context#getScopeType() + * @see javax.context.Context#getScopeType() */ public Class<? extends Annotation> getScopeType() { @@ -70,7 +70,7 @@ * * @return The active state * - * @see javax.webbeans.manager.Context#isActive() + * @see javax.context.Context#isActive() */ public boolean isActive() { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ApplicationContext.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ApplicationContext.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ApplicationContext.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -19,7 +19,7 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.webbeans.ApplicationScoped; +import javax.context.ApplicationScoped; import org.jboss.webbeans.context.beanmap.BeanMap; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ContextMap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ContextMap.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ContextMap.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -23,7 +23,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.CopyOnWriteArrayList; -import javax.webbeans.manager.Context; +import javax.context.Context; import org.jboss.webbeans.util.ConcurrentCache; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ContextualInstance.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ContextualInstance.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ContextualInstance.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.context; -import javax.webbeans.manager.Contextual; +import javax.context.Contextual; /** * A representation of a contextual bean plus associated instance Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ConversationContext.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ConversationContext.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ConversationContext.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -17,7 +17,7 @@ package org.jboss.webbeans.context; -import javax.webbeans.ConversationScoped; +import javax.context.ConversationScoped; /** * The conversation context Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -19,9 +19,9 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.webbeans.ContextNotActiveException; -import javax.webbeans.Dependent; -import javax.webbeans.manager.Contextual; +import javax.context.ContextNotActiveException; +import javax.context.Contextual; +import javax.context.Dependent; import org.jboss.webbeans.bean.AbstractClassBean; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/RequestContext.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/RequestContext.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/RequestContext.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -17,7 +17,7 @@ package org.jboss.webbeans.context; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; /** * The request context Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/SessionContext.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -17,7 +17,7 @@ package org.jboss.webbeans.context; -import javax.webbeans.SessionScoped; +import javax.context.SessionScoped; import org.jboss.webbeans.context.beanmap.BeanMap; import org.jboss.webbeans.log.LogProvider; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -21,7 +21,7 @@ import java.util.Enumeration; import java.util.List; -import javax.webbeans.manager.Contextual; +import javax.context.Contextual; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.log.LogProvider; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/BeanMap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/BeanMap.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/BeanMap.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -17,7 +17,7 @@ package org.jboss.webbeans.context.beanmap; -import javax.webbeans.manager.Contextual; +import javax.context.Contextual; /** Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SimpleBeanMap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SimpleBeanMap.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SimpleBeanMap.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -21,8 +21,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.webbeans.manager.Bean; -import javax.webbeans.manager.Contextual; +import javax.context.Contextual; +import javax.inject.manager.Bean; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -22,9 +22,9 @@ import static org.jboss.webbeans.event.ObserverImpl.TransactionObservationPhase.AFTER_SUCCESS; import static org.jboss.webbeans.event.ObserverImpl.TransactionObservationPhase.BEFORE_COMPLETION; +import javax.event.Observer; import javax.transaction.Status; import javax.transaction.Synchronization; -import javax.webbeans.Observer; /** * A synchronization object which will deliver the event to the observer after Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -22,10 +22,10 @@ import java.util.HashSet; import java.util.Set; -import javax.webbeans.Event; -import javax.webbeans.Fires; -import javax.webbeans.Observer; -import javax.webbeans.manager.Manager; +import javax.event.Event; +import javax.event.Fires; +import javax.event.Observer; +import javax.inject.manager.Manager; import org.jboss.webbeans.FacadeImpl; import org.jboss.webbeans.util.Strings; @@ -36,7 +36,7 @@ * @author David Allen * * @param <T> The type of event being wrapped - * @see javax.webbeans.Event + * @see javax.event.Event */ public class EventImpl<T> extends FacadeImpl<T> implements Event<T> { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; -import javax.webbeans.Observer; +import javax.event.Observer; import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.util.Reflections; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -21,9 +21,9 @@ import java.util.ArrayList; import java.util.List; -import javax.webbeans.Current; -import javax.webbeans.DuplicateBindingTypeException; -import javax.webbeans.Observer; +import javax.event.Observer; +import javax.inject.Current; +import javax.inject.DuplicateBindingTypeException; import org.jboss.webbeans.MetaDataCache; import org.jboss.webbeans.util.Reflections; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -22,29 +22,27 @@ import java.util.ArrayList; import java.util.List; +import javax.context.Dependent; +import javax.event.AfterTransactionCompletion; +import javax.event.AfterTransactionFailure; +import javax.event.AfterTransactionSuccess; +import javax.event.BeforeTransactionCompletion; +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.ExecutionException; +import javax.inject.Initializer; +import javax.inject.Produces; +import javax.inject.manager.Bean; import javax.transaction.Status; import javax.transaction.SystemException; -import javax.webbeans.AfterTransactionCompletion; -import javax.webbeans.AfterTransactionFailure; -import javax.webbeans.AfterTransactionSuccess; -import javax.webbeans.BeforeTransactionCompletion; -import javax.webbeans.DefinitionException; -import javax.webbeans.Dependent; -import javax.webbeans.Disposes; -import javax.webbeans.ExecutionException; -import javax.webbeans.IfExists; -import javax.webbeans.Initializer; -import javax.webbeans.Observer; -import javax.webbeans.ObserverException; -import javax.webbeans.Observes; -import javax.webbeans.Produces; -import javax.webbeans.manager.Bean; -import javax.webbeans.manager.Contextual; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.AbstractBean; import org.jboss.webbeans.bean.AbstractClassBean; -import org.jboss.webbeans.context.ContextualInstance; import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.introspector.AnnotatedMethod; import org.jboss.webbeans.introspector.AnnotatedParameter; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exception/NotAScopeException.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exception/NotAScopeException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exception/NotAScopeException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -17,7 +17,7 @@ package org.jboss.webbeans.exception; -import javax.webbeans.DefinitionException; +import javax.inject.DefinitionException; /** * Exception for incorrect scope usage Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointImpl.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointImpl.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -25,11 +25,11 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.webbeans.Dependent; -import javax.webbeans.Initializer; -import javax.webbeans.InjectionPoint; -import javax.webbeans.Standard; -import javax.webbeans.manager.Bean; +import javax.context.Dependent; +import javax.inject.Initializer; +import javax.inject.Standard; +import javax.inject.manager.Bean; +import javax.inject.manager.InjectionPoint; import org.jboss.webbeans.introspector.AnnotatedItem; import org.jboss.webbeans.introspector.AnnotatedMember; @@ -119,7 +119,7 @@ * * @param annotationType The meta-annotation to match * @return The found annotation - * @see javax.webbeans.InjectionPoint#getAnnotation(Class) + * @see javax.inject.manager.InjectionPoint#getAnnotation(Class) */ public <T extends Annotation> T getAnnotation(Class<T> annotationType) { @@ -130,7 +130,7 @@ * Gets the array of annotations on the injection point * * @return The annotations - * @see javax.webbeans.InjectionPoint#getAnnotations() + * @see javax.inject.manager.InjectionPoint#getAnnotations() */ public Annotation[] getAnnotations() { @@ -141,7 +141,7 @@ * Gets the containing bean * * @return The bean - * @see javax.webbeans.InjectionPoint#getBean() + * @see javax.inject.manager.InjectionPoint#getBean() */ public Bean<?> getBean() { @@ -152,7 +152,7 @@ * Gets the bindings of the injection point * * @return The bindings - * @see javax.webbeans.InjectionPoint#getBindings() + * @see javax.inject.manager.InjectionPoint#getBindings() */ public Set<Annotation> getBindings() { @@ -163,7 +163,7 @@ * Gets the member of the injection * * @return The underlying member - * @see javax.webbeans.InjectionPoint#getMember() + * @see javax.inject.manager.InjectionPoint#getMember() */ public Member getMember() { @@ -185,7 +185,7 @@ * Gets the type of the injection point * * @return The type - * @see javax.webbeans.InjectionPoint#getType + * @see javax.inject.manager.InjectionPoint#getType */ public Type getType() { @@ -197,7 +197,7 @@ * * @param annotationType The annotation type to match * @return True if present, false otherwise - * @see javax.webbeans.InjectionPoint#isAnnotationPresent(Class) + * @see javax.inject.manager.InjectionPoint#isAnnotationPresent(Class) */ public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointProvider.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointProvider.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointProvider.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -19,8 +19,8 @@ import java.util.Stack; -import javax.webbeans.InjectionPoint; -import javax.webbeans.manager.Bean; +import javax.inject.manager.Bean; +import javax.inject.manager.InjectionPoint; import org.jboss.webbeans.introspector.AnnotatedItem; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -19,7 +19,7 @@ import java.lang.reflect.Field; -import javax.webbeans.manager.Manager; +import javax.inject.manager.Manager; /** * AnnotatedField provides a uniform access to the annotations on an annotated Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -23,10 +23,10 @@ import java.util.HashSet; import java.util.Set; -import javax.webbeans.BindingType; -import javax.webbeans.DeploymentType; -import javax.webbeans.ScopeType; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.ScopeType; +import javax.inject.BindingType; +import javax.inject.DeploymentType; /** * AnnotatedItem provides a uniform access to the annotations on an annotated Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -24,14 +24,14 @@ import java.util.List; import java.util.Set; -import javax.webbeans.AfterTransactionCompletion; -import javax.webbeans.AfterTransactionFailure; -import javax.webbeans.AfterTransactionSuccess; -import javax.webbeans.BeforeTransactionCompletion; -import javax.webbeans.Disposes; -import javax.webbeans.Fires; -import javax.webbeans.IfExists; -import javax.webbeans.Observes; +import javax.event.AfterTransactionCompletion; +import javax.event.AfterTransactionFailure; +import javax.event.AfterTransactionSuccess; +import javax.event.BeforeTransactionCompletion; +import javax.event.Fires; +import javax.event.IfExists; +import javax.event.Observes; +import javax.inject.Disposes; import org.jboss.webbeans.ManagerImpl; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -20,7 +20,7 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.webbeans.manager.Manager; +import javax.inject.manager.Manager; /** Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Set; -import javax.webbeans.BindingType; +import javax.inject.BindingType; import org.jboss.webbeans.literal.CurrentLiteral; import org.jboss.webbeans.util.Strings; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedField.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedField.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedField.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -20,7 +20,7 @@ import java.lang.reflect.Field; import java.util.Set; -import javax.webbeans.manager.Manager; +import javax.inject.manager.Manager; public abstract class ForwardingAnnotatedField<T> extends ForwardingAnnotatedMember<T, Field> implements AnnotatedField<T> { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -19,7 +19,7 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.webbeans.manager.Manager; +import javax.inject.manager.Manager; public abstract class ForwardingAnnotatedParameter<T> extends ForwardingAnnotatedItem<T, Object> implements AnnotatedParameter<T> { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -26,9 +26,9 @@ import java.util.List; import java.util.Map; -import javax.webbeans.BindingType; -import javax.webbeans.Produces; -import javax.webbeans.manager.Manager; +import javax.inject.BindingType; +import javax.inject.Produces; +import javax.inject.manager.Manager; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.injection.InjectionPointProvider; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -31,7 +31,7 @@ import java.util.Map; import java.util.Set; -import javax.webbeans.TypeLiteral; +import javax.inject.TypeLiteral; import org.jboss.webbeans.introspector.AnnotatedClass; import org.jboss.webbeans.introspector.AnnotatedConstructor; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -26,7 +26,7 @@ import java.util.List; import java.util.Set; -import javax.webbeans.ExecutionException; +import javax.inject.ExecutionException; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedConstructor; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -21,7 +21,7 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import javax.webbeans.manager.Manager; +import javax.inject.manager.Manager; import org.jboss.webbeans.introspector.AnnotatedField; import org.jboss.webbeans.introspector.AnnotatedType; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -21,8 +21,8 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.webbeans.BindingType; -import javax.webbeans.manager.Manager; +import javax.inject.BindingType; +import javax.inject.manager.Manager; import org.jboss.webbeans.introspector.AnnotatedMember; import org.jboss.webbeans.introspector.AnnotatedParameter; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -17,8 +17,8 @@ package org.jboss.webbeans.literal; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.Current; +import javax.inject.AnnotationLiteral; +import javax.inject.Current; /** * Annotation literal for @Current Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -17,8 +17,8 @@ package org.jboss.webbeans.literal; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.manager.Deployed; +import javax.inject.AnnotationLiteral; +import javax.inject.manager.Deployed; /** * Annotation literal for @Deployed Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -17,8 +17,8 @@ package org.jboss.webbeans.literal; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.manager.Initialized; +import javax.inject.AnnotationLiteral; +import javax.inject.manager.Initialized; /** * Annotation literal for @Initialized Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/NewLiteral.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/NewLiteral.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/literal/NewLiteral.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -17,8 +17,8 @@ package org.jboss.webbeans.literal; -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.New; +import javax.inject.AnnotationLiteral; +import javax.inject.New; /** * Annotation literal for @Current Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AnnotationModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AnnotationModel.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AnnotationModel.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -19,7 +19,7 @@ import java.lang.annotation.Annotation; -import javax.webbeans.DefinitionException; +import javax.inject.DefinitionException; import org.jboss.webbeans.introspector.AnnotatedAnnotation; import org.jboss.webbeans.introspector.jlr.AnnotatedAnnotationImpl; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/BindingTypeModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/BindingTypeModel.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/BindingTypeModel.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -20,9 +20,9 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.webbeans.BindingType; -import javax.webbeans.DefinitionException; -import javax.webbeans.NonBinding; +import javax.annotation.NonBinding; +import javax.inject.BindingType; +import javax.inject.DefinitionException; import org.jboss.webbeans.introspector.AnnotatedMethod; import org.jboss.webbeans.util.Reflections; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ScopeModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ScopeModel.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ScopeModel.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -19,7 +19,7 @@ import java.lang.annotation.Annotation; -import javax.webbeans.ScopeType; +import javax.context.ScopeType; /** * Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/StereotypeModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/StereotypeModel.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/StereotypeModel.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -22,13 +22,13 @@ import java.util.HashSet; import java.util.Set; -import javax.webbeans.BindingType; -import javax.webbeans.DefinitionException; -import javax.webbeans.DeploymentType; -import javax.webbeans.InterceptorBindingType; -import javax.webbeans.Named; -import javax.webbeans.ScopeType; -import javax.webbeans.Stereotype; +import javax.annotation.Named; +import javax.annotation.Stereotype; +import javax.context.ScopeType; +import javax.inject.BindingType; +import javax.inject.DefinitionException; +import javax.inject.DeploymentType; +import javax.interceptor.InterceptorBindingType; /** * A meta model for a stereotype, allows us to cache a stereotype and to Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/AbstractNamingContext.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/AbstractNamingContext.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/AbstractNamingContext.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.List; +import javax.inject.ExecutionException; import javax.naming.Context; import javax.naming.NamingException; -import javax.webbeans.ExecutionException; import org.jboss.webbeans.resources.spi.NamingContext; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/DefaultNaming.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/DefaultNaming.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/DefaultNaming.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -17,9 +17,9 @@ package org.jboss.webbeans.resource; +import javax.inject.ExecutionException; import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.webbeans.ExecutionException; /** * The default naming provider Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/transaction/Transaction.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/transaction/Transaction.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/transaction/Transaction.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -16,8 +16,8 @@ */ package org.jboss.webbeans.transaction; -import javax.webbeans.Current; -import javax.webbeans.Produces; +import javax.inject.Current; +import javax.inject.Produces; import org.jboss.webbeans.ManagerImpl; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Beans.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Beans.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Beans.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -19,7 +19,7 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.webbeans.manager.Bean; +import javax.inject.manager.Bean; import org.jboss.webbeans.MetaDataCache; import org.jboss.webbeans.bean.AbstractBean; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -34,8 +34,8 @@ import java.util.List; import java.util.Set; -import javax.webbeans.BindingType; -import javax.webbeans.ExecutionException; +import javax.inject.BindingType; +import javax.inject.ExecutionException; /** Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Game.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Game.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Game.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.examples; -import javax.webbeans.Initializer; +import javax.inject.Initializer; public class Game { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Generator.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Generator.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Generator.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.examples; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.Produces; +import javax.context.ApplicationScoped; +import javax.inject.Produces; @ApplicationScoped public class Generator { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Mock.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Mock.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Mock.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Random.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Random.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Random.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Tests.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Tests.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Tests.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -3,8 +3,8 @@ import java.lang.reflect.Method; import java.util.Arrays; -import javax.webbeans.Production; -import javax.webbeans.Standard; +import javax.inject.Production; +import javax.inject.Standard; import org.jboss.webbeans.bean.ProducerMethodBean; import org.jboss.webbeans.bean.SimpleBean; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.examples; -import javax.webbeans.Initializer; +import javax.inject.Initializer; public class TextTranslator { private SentenceParser sentenceParser; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -4,6 +4,7 @@ import javax.annotation.Resource; import javax.ejb.EJB; +import javax.inject.manager.InjectionPoint; import javax.naming.Context; import javax.persistence.PersistenceContext; import javax.transaction.HeuristicMixedException; @@ -13,7 +14,6 @@ import javax.transaction.SystemException; import javax.transaction.TransactionManager; import javax.transaction.UserTransaction; -import javax.webbeans.InjectionPoint; import org.jboss.webbeans.bootstrap.WebBeansBootstrap; import org.jboss.webbeans.bootstrap.spi.EjbDiscovery; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -3,7 +3,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; -import javax.webbeans.manager.Bean; +import javax.inject.manager.Bean; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.bean.AbstractClassBean; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -4,7 +4,7 @@ import java.util.List; import javax.el.ELContext; -import javax.webbeans.manager.Manager; +import javax.inject.manager.Manager; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.tck.api.Containers; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.List; -import javax.webbeans.manager.Manager; +import javax.inject.manager.Manager; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.tck.api.Managers; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -6,8 +6,8 @@ import java.util.Arrays; import java.util.List; -import javax.webbeans.Production; -import javax.webbeans.Standard; +import javax.inject.Production; +import javax.inject.Standard; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.AbstractClassBean; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/AnotherDeploymentType.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/AnotherDeploymentType.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/AnotherDeploymentType.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.webbeans.manager.Bean; +import javax.inject.manager.Bean; import org.jboss.webbeans.bean.AbstractBean; import org.jboss.webbeans.bean.EnterpriseBean; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Elephant.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Elephant.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Elephant.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Production; +import javax.inject.Production; @Production @Stateful Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Hound.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Hound.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Hound.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.bootstrap; +import javax.annotation.Named; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Named; @Stateful @Tame Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserver.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserver.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserver.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.bootstrap; -import javax.webbeans.Observes; -import javax.webbeans.manager.Initialized; -import javax.webbeans.manager.Manager; +import javax.event.Observes; +import javax.inject.manager.Initialized; +import javax.inject.manager.Manager; class InitializedObserver { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesApplicationContext.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesApplicationContext.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesApplicationContext.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,9 +1,9 @@ package org.jboss.webbeans.test.unit.bootstrap; -import javax.webbeans.Current; -import javax.webbeans.Observes; -import javax.webbeans.manager.Initialized; -import javax.webbeans.manager.Manager; +import javax.event.Observes; +import javax.inject.Current; +import javax.inject.manager.Initialized; +import javax.inject.manager.Manager; class InitializedObserverWhichUsesApplicationContext { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesRequestContext.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesRequestContext.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesRequestContext.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,9 +1,9 @@ package org.jboss.webbeans.test.unit.bootstrap; -import javax.webbeans.Current; -import javax.webbeans.Observes; -import javax.webbeans.manager.Initialized; -import javax.webbeans.manager.Manager; +import javax.event.Observes; +import javax.inject.Current; +import javax.inject.manager.Initialized; +import javax.inject.manager.Manager; class InitializedObserverWhichUsesRequestContext { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/LadybirdSpider.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/LadybirdSpider.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/LadybirdSpider.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap; -import javax.webbeans.ApplicationScoped; +import javax.context.ApplicationScoped; @ApplicationScoped class LadybirdSpider extends Spider Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Panther.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Panther.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Panther.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Production; +import javax.inject.Production; @Production @Stateful Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Salmon.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Salmon.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Salmon.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Named Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/SeaBass.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/SeaBass.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/SeaBass.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; +import javax.inject.Production; @Production @RequestScoped Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Sole.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Sole.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Sole.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Whitefish Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Synchronous.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Synchronous.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Synchronous.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER }) @Retention(RUNTIME) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tame.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tame.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tame.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/TarantulaProducer.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/TarantulaProducer.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/TarantulaProducer.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap; -import javax.webbeans.Produces; +import javax.inject.Produces; public class TarantulaProducer { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tiger.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tiger.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tiger.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.Production; +import javax.inject.Production; @Production @Stateful Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tuna.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tuna.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tuna.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @RequestScoped class Tuna Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Whitefish.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Whitefish.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Whitefish.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,9 +1,9 @@ package org.jboss.webbeans.test.unit.context; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.ConversationScoped; -import javax.webbeans.RequestScoped; -import javax.webbeans.SessionScoped; +import javax.context.ApplicationScoped; +import javax.context.ConversationScoped; +import javax.context.RequestScoped; +import javax.context.SessionScoped; import org.jboss.webbeans.MetaDataCache; import org.testng.annotations.Test; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.RequestScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/Order.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/Order.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/Order.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.definition; -import javax.webbeans.Production; +import javax.inject.Production; @Production class Order Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.RequestScoped; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; @Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class) @Target( { TYPE }) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -2,7 +2,7 @@ import java.util.Arrays; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; import org.jboss.webbeans.model.StereotypeModel; import org.jboss.webbeans.test.unit.AbstractTest; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/AnotherDeploymentType.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/AnotherDeploymentType.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/AnotherDeploymentType.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/Asynchronous.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/Asynchronous.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/Asynchronous.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER }) @Retention(RUNTIME) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -4,8 +4,8 @@ import java.util.Arrays; import java.util.List; -import javax.webbeans.Observes; -import javax.webbeans.Standard; +import javax.event.Observes; +import javax.inject.Standard; import org.jboss.webbeans.bean.SimpleBean; import org.jboss.webbeans.introspector.AnnotatedMethod; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/Tuna.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/Tuna.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/Tuna.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.event; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/Bad.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/Bad.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/Bad.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.implementation; +import javax.context.RequestScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.webbeans.RequestScoped; @Stateful Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/ClassAnnotatedItemTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/ClassAnnotatedItemTest.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/ClassAnnotatedItemTest.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -4,9 +4,9 @@ import java.util.Iterator; import java.util.Set; -import javax.webbeans.DeploymentType; -import javax.webbeans.Production; -import javax.webbeans.Stereotype; +import javax.annotation.Stereotype; +import javax.inject.DeploymentType; +import javax.inject.Production; import org.jboss.webbeans.introspector.AnnotatedClass; import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/Order.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/Order.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/Order.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.implementation; -import javax.webbeans.Production; +import javax.inject.Production; @Production class Order Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -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.webbeans.Named; -import javax.webbeans.SessionScoped; @SessionScoped @Stateful Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedSimpleBean.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedSimpleBean.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedSimpleBean.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.webbeans.Named; -import javax.webbeans.SessionScoped; +import javax.annotation.Named; +import javax.context.SessionScoped; @SessionScoped @Named("Fred") Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/AnotherDeploymentType.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/AnotherDeploymentType.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/AnotherDeploymentType.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.DeploymentType; +import javax.inject.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Chunky.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Chunky.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Chunky.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Cod.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Cod.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Cod.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Expensive.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Expensive.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Expensive.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -10,8 +10,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; -import javax.webbeans.NonBinding; +import javax.annotation.NonBinding; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Farmer.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Farmer.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Farmer.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.lookup; -import javax.webbeans.Production; +import javax.inject.Production; @Production class Farmer<T> Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/FishFarm.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/FishFarm.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/FishFarm.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup; -import javax.webbeans.Current; -import javax.webbeans.Production; +import javax.inject.Current; +import javax.inject.Production; @Production class FishFarm Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Haddock.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Haddock.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Haddock.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Named Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/ResolutionByTypeTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/ResolutionByTypeTest.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/ResolutionByTypeTest.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -2,7 +2,7 @@ import java.util.Set; -import javax.webbeans.manager.Bean; +import javax.inject.manager.Bean; import org.jboss.webbeans.bean.SimpleBean; import org.jboss.webbeans.introspector.AnnotatedClass; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Salmon.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Salmon.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Salmon.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Named Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/SeaBass.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/SeaBass.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/SeaBass.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; +import javax.inject.Production; @Production @RequestScoped Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Sole.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Sole.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Sole.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup; -import javax.webbeans.Named; -import javax.webbeans.Production; +import javax.annotation.Named; +import javax.inject.Production; @Production @Whitefish Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Tuna.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Tuna.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Tuna.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.lookup; -import javax.webbeans.RequestScoped; +import javax.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Whitefish.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Whitefish.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/lookup/Whitefish.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.webbeans.BindingType; +import javax.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbResolver.java =================================================================== --- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbResolver.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbResolver.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -import javax.webbeans.InjectionPoint; +import javax.inject.manager.InjectionPoint; import org.jboss.webbeans.resources.spi.NamingContext; Modified: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/ForwardingEjbResolver.java =================================================================== --- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/ForwardingEjbResolver.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/ForwardingEjbResolver.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -import javax.webbeans.InjectionPoint; +import javax.inject.manager.InjectionPoint; import org.jboss.webbeans.resources.spi.NamingContext; Modified: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceLoadingException.java =================================================================== --- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceLoadingException.java 2009-01-26 14:42:10 UTC (rev 1231) +++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceLoadingException.java 2009-01-26 15:00:55 UTC (rev 1232) @@ -3,7 +3,7 @@ */ package org.jboss.webbeans.resources.spi; -import javax.webbeans.ExecutionException; +import javax.inject.ExecutionException; /** * Exception thrown when errors occur while loading resource