weld-commits January 2009

weld-commits@lists.jboss.org

1 participants
623 discussions

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

by webbeans-commits＠lists.jboss.org

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

16 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1231 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-01-26 09:42:10 -0500 (Mon, 26 Jan 2009) New Revision: 1231 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/EnterpriseBean.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java Log: Fixed one of the event tests and some performance enhancements. 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-25 19:11:28 UTC (rev 1230) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-01-26 14:42:10 UTC (rev 1231) @@ -52,8 +52,8 @@ * * @author Pete Muir * - * @param <T> - * @param <E> + * @param <T> the type of bean + * @param <E> the Class<?> of the bean type */ public abstract class AbstractBean<T, E> extends Bean<T> { @@ -139,7 +139,8 @@ initDefaultBindings(); initType(); initPrimitive(); - log.debug("Building Web Bean bean metadata for " + getType()); + if (log.isDebugEnabled()) + log.debug("Building Web Bean bean metadata for " + getType()); initName(); initDeploymentType(); checkDeploymentType(); @@ -176,7 +177,8 @@ } else { - log.trace("Using binding types " + bindingTypes + " specified by annotations"); + if (log.isTraceEnabled()) + log.trace("Using binding types " + bindingTypes + " specified by annotations"); } } @@ -191,7 +193,8 @@ if (possibleDeploymentTypes.size() > 0) { this.deploymentType = getDeploymentType(manager.getEnabledDeploymentTypes(), possibleDeploymentTypes); - log.trace("Deployment type " + deploymentType + " specified by stereotype"); + if (log.isTraceEnabled()) + log.trace("Deployment type " + deploymentType + " specified by stereotype"); return; } } @@ -219,7 +222,8 @@ } else { - log.trace("Using name " + javaName + " specified by annotations"); + if (log.isTraceEnabled()) + log.trace("Using name " + javaName + " specified by annotations"); this.name = javaName; return; } @@ -273,7 +277,8 @@ if (possibleScopeTypes.size() == 1) { this.scopeType = possibleScopeTypes.iterator().next().annotationType(); - log.trace("Scope " + scopeType + " specified by stereotype"); + if (log.isTraceEnabled()) + log.trace("Scope " + scopeType + " specified by stereotype"); return true; } else if (possibleScopeTypes.size() > 1) @@ -313,7 +318,8 @@ { for (Class<?> requiredType : getMergedStereotypes().getRequiredTypes()) { - log.trace("Checking if required type " + requiredType + " is implemented"); + if (log.isTraceEnabled()) + log.trace("Checking if required type " + requiredType + " is implemented"); if (!requiredType.isAssignableFrom(type)) { throw new DefinitionException("Required type " + requiredType + " isn't implemented on " + type); 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-25 19:11:28 UTC (rev 1230) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-26 14:42:10 UTC (rev 1231) @@ -30,6 +30,7 @@ import javax.webbeans.DefinitionException; import javax.webbeans.Dependent; import javax.webbeans.Interceptor; +import javax.webbeans.Observes; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.proxy.EnterpriseBeanInstance; @@ -49,7 +50,7 @@ * * @author Pete Muir * - * @param <T> + * @param <T> The type (class) of the bean */ public class EnterpriseBean<T> extends AbstractClassBean<T> { @@ -121,6 +122,7 @@ checkEnterpriseBeanTypeAllowed(); checkEnterpriseScopeAllowed(); checkConflictingRoles(); + checkObserverMethods(); } /** @@ -216,6 +218,8 @@ DependentContext.INSTANCE.setActive(true); T instance = proxyClass.newInstance(); ((ProxyObject) instance).setHandler(new EnterpriseBeanProxyMethodHandler(this, ejbDescriptor.getRemoveMethods())); + if (log.isTraceEnabled()) + log.trace("Enterprise bean instance created for bean " + this); return instance; } catch (InstantiationException e) @@ -355,4 +359,21 @@ return specializedBean; } + /** + * If there are any observer methods, they must be static or business + * methods. + */ + protected void checkObserverMethods() + { + for (AnnotatedMethod<?> method : this.annotatedItem.getDeclaredMethodsWithAnnotatedParameters(Observes.class)) + { + if (!method.isStatic()) + { + if (!this.getTypes().contains(method.getMember().getDeclaringClass())) + { + throw new DefinitionException("Observer method must be static or business method: " + method); + } + } + } + } } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java 2009-01-25 19:11:28 UTC (rev 1230) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java 2009-01-26 14:42:10 UTC (rev 1231) @@ -60,7 +60,7 @@ assert observers.size() == 2; } - @Test(groups = { "events", "integration", "broken" }, expectedExceptions=DefinitionException.class) + @Test(groups = { "events", "integration" }, expectedExceptions=DefinitionException.class) @SpecAssertion(section = "8.5") public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails() { @@ -68,7 +68,6 @@ Set<Bean<Object>> beans = manager.resolveByType(Object.class); assert beans.size() >= 2; Set<Observer<String>> observers = manager.resolveObservers("An event"); - assert observers.size() == 0; } /**

16 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1230 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-01-25 14:11:28 -0500 (Sun, 25 Jan 2009) New Revision: 1230 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/HighestDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpecializedTarantulaProducer.java Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaProducer.java Log: Completed all producer field lifecycle tests and fixed some others. Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidow.java 2009-01-25 14:46:28 UTC (rev 1229) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/BlackWidow.java 2009-01-25 19:11:28 UTC (rev 1230) @@ -2,5 +2,9 @@ class BlackWidow extends Spider implements DeadlySpider { - + public void bite() + { + // Test method used for proxy instances to force + // creation of the instance. + } } Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/HighestDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/HighestDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/HighestDeploymentType.java 2009-01-25 19:11:28 UTC (rev 1230) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.tck.unit.implementation.producer.field; + +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; + +import javax.webbeans.DeploymentType; + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface HighestDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/HighestDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-01-25 14:46:28 UTC (rev 1229) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-01-25 19:11:28 UTC (rev 1230) @@ -22,8 +22,9 @@ public class ProducerFieldDefinitionTest extends AbstractTest { - - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.jboss.webbeans.tck.AbstractTest#getEnabledDeploymentTypes() */ @SuppressWarnings("unchecked") @@ -46,15 +47,9 @@ public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception { deployBeans(TarantulaProducer.class, TarantulaConsumer.class); - new RunInDependentContext() - { - public void execute() - { - Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class); - assert !tarantulaBeans.isEmpty(); - assert tarantulaBeans.iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); - } - }.run(); + Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class); + assert !tarantulaBeans.isEmpty(); + assert tarantulaBeans.iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } /* @@ -114,27 +109,24 @@ deployBeans(SpiderProducerWildCardType_Broken.class); } - @Test(groups = { "stub", "producerField", "deployment" }) + /** + * A bean may declare multiple producer fields. + */ + @Test(groups = { "producerField", "deployment" }) @SpecAssertion(section = "3.5") public void testBeanDeclaresMultipleProducerFields() { - assert false; + deployBeans(OtherSpiderProducer.class); } @Test(groups = "producerField") @SpecAssertion(section = { "3.5", "2.3.1" }) - public void testDefaultBindingType() throws Exception + public void testDefaultBindingType() { deployBeans(StaticTarantulaProducer.class); - new RunInDependentContext() - { - public void execute() - { - Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class); - assert !tarantulaBeans.isEmpty(); - assert tarantulaBeans.iterator().next().getBindings().contains(new CurrentBinding()); - } - }.run(); + Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class); + assert !tarantulaBeans.isEmpty(); + assert tarantulaBeans.iterator().next().getBindings().contains(new CurrentBinding()); } /** @@ -146,25 +138,19 @@ */ @Test(groups = "producerField") @SpecAssertion(section = "3.5.1") - public void testApiTypeForClassReturn() throws Exception + public void testApiTypeForClassReturn() { deployBeans(StaticTarantulaProducer.class); - new RunInDependentContext() - { - public void execute() - { - Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class); - assert !tarantulaBeans.isEmpty(); - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getTypes().size() == 6; - assert tarantulaModel.getTypes().contains(Tarantula.class); - assert tarantulaModel.getTypes().contains(DeadlySpider.class); - assert tarantulaModel.getTypes().contains(Spider.class); - assert tarantulaModel.getTypes().contains(Animal.class); - assert tarantulaModel.getTypes().contains(DeadlyAnimal.class); - assert tarantulaModel.getTypes().contains(Object.class); - } - }.run(); + Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class); + assert !tarantulaBeans.isEmpty(); + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getTypes().size() == 6; + assert tarantulaModel.getTypes().contains(Tarantula.class); + assert tarantulaModel.getTypes().contains(DeadlySpider.class); + assert tarantulaModel.getTypes().contains(Spider.class); + assert tarantulaModel.getTypes().contains(Animal.class); + assert tarantulaModel.getTypes().contains(DeadlyAnimal.class); + assert tarantulaModel.getTypes().contains(Object.class); } /** @@ -176,21 +162,15 @@ */ @Test(groups = { "producerField" }) @SpecAssertion(section = "3.5.1") - public void testApiTypeForInterfaceReturn() throws Exception + public void testApiTypeForInterfaceReturn() { deployBeans(SpiderAsAnimalProducer.class); - new RunInDependentContext() - { - public void execute() - { - Set<Bean<Animal>> animalBeans = manager.resolveByType(Animal.class); - assert !animalBeans.isEmpty(); - Bean<Animal> animalModel = animalBeans.iterator().next(); - assert animalModel.getTypes().size() == 2; - assert animalModel.getTypes().contains(Animal.class); - assert animalModel.getTypes().contains(Object.class); - } - }.run(); + Set<Bean<Animal>> animalBeans = manager.resolveByType(Animal.class); + assert !animalBeans.isEmpty(); + Bean<Animal> animalModel = animalBeans.iterator().next(); + assert animalModel.getTypes().size() == 2; + assert animalModel.getTypes().contains(Animal.class); + assert animalModel.getTypes().contains(Object.class); } /** @@ -201,21 +181,15 @@ */ @Test(groups = { "producerField" }) @SpecAssertion(section = "3.5.1") - public void testApiTypeForPrimitiveReturn() throws Exception + public void testApiTypeForPrimitiveReturn() { deployBeans(OtherSpiderProducer.class); - new RunInDependentContext() - { - public void execute() - { - Set<Bean<?>> beans = manager.resolveByName("SpiderSize"); - assert !beans.isEmpty(); - Bean<?> intModel = beans.iterator().next(); - assert intModel.getTypes().size() == 2; - assert intModel.getTypes().contains(int.class); - assert intModel.getTypes().contains(Object.class); - } - }.run(); + Set<Bean<?>> beans = manager.resolveByName("SpiderSize"); + assert !beans.isEmpty(); + Bean<?> intModel = beans.iterator().next(); + assert intModel.getTypes().size() == 2; + assert intModel.getTypes().contains(int.class); + assert intModel.getTypes().contains(Object.class); } /** @@ -226,21 +200,15 @@ */ @Test(groups = { "producerField" }) @SpecAssertion(section = { "3.5.1", "2.2" }) - public void testApiTypeForArrayTypeReturn() throws Exception + public void testApiTypeForArrayTypeReturn() { deployBeans(OtherSpiderProducer.class); - new RunInDependentContext() - { - public void execute() - { - Set<Bean<Spider[]>> spidersModels = manager.resolveByType(Spider[].class); - assert !spidersModels.isEmpty(); - Bean<Spider[]> spidersModel = spidersModels.iterator().next(); - assert spidersModel.getTypes().size() == 2; - assert spidersModel.getTypes().contains(Spider[].class); - assert spidersModel.getTypes().contains(Object.class); - } - }.run(); + Set<Bean<Spider[]>> spidersModels = manager.resolveByType(Spider[].class); + assert !spidersModels.isEmpty(); + Bean<Spider[]> spidersModel = spidersModels.iterator().next(); + assert spidersModel.getTypes().size() == 2; + assert spidersModel.getTypes().contains(Spider[].class); + assert spidersModel.getTypes().contains(Object.class); } /** @@ -251,20 +219,14 @@ */ @Test(groups = "producerField") @SpecAssertion(section = "3.5.2") - public void testBindingType() throws Exception + public void testBindingType() { deployBeans(TameTarantulaProducer.class); - new RunInDependentContext() - { - public void execute() - { - Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class, new TameAnnotationLiteral()); - assert !tarantulaBeans.isEmpty(); - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getBindings().size() == 1; - assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class); - } - }.run(); + Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class, new TameAnnotationLiteral()); + assert !tarantulaBeans.isEmpty(); + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getBindings().size() == 1; + assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class); } /** @@ -275,19 +237,13 @@ */ @Test(groups = "producerField") @SpecAssertion(section = "3.5.2") - public void testScopeType() throws Exception + public void testScopeType() { deployBeans(TameTarantulaProducer.class); - new RunInDependentContext() - { - public void execute() - { - Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class, new TameAnnotationLiteral()); - assert !tarantulaBeans.isEmpty(); - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getScopeType().equals(RequestScoped.class); - } - }.run(); + Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class, new TameAnnotationLiteral()); + assert !tarantulaBeans.isEmpty(); + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getScopeType().equals(RequestScoped.class); // TODO Inherit scope from returned web bean? } @@ -300,19 +256,13 @@ */ @Test(groups = "producerField") @SpecAssertion(section = "3.5.2") - public void testDeploymentType() throws Exception + public void testDeploymentType() { deployBeans(TameTarantulaProducer.class); - new RunInDependentContext() - { - public void execute() - { - Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class, new TameAnnotationLiteral()); - assert !tarantulaBeans.isEmpty(); - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getDeploymentType().equals(Production.class); - } - }.run(); + Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class, new TameAnnotationLiteral()); + assert !tarantulaBeans.isEmpty(); + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getDeploymentType().equals(Production.class); } /** @@ -323,21 +273,15 @@ */ @Test(groups = "producerField") @SpecAssertion(section = "3.5.2") - public void testNamedField() throws Exception + public void testNamedField() { deployBeans(BlackWidowProducer.class); - new RunInDependentContext() - { - public void execute() - { - Set<Bean<?>> beans = manager.resolveByName("blackWidow"); - assert !beans.isEmpty(); + Set<Bean<?>> beans = manager.resolveByName("blackWidow"); + assert !beans.isEmpty(); - @SuppressWarnings("unchecked") - Bean<BlackWidow> blackWidowModel = (Bean<BlackWidow>) beans.iterator().next(); - assert blackWidowModel.getName().equals("blackWidow"); - } - }.run(); + @SuppressWarnings("unchecked") + Bean<BlackWidow> blackWidowModel = (Bean<BlackWidow>) beans.iterator().next(); + assert blackWidowModel.getName().equals("blackWidow"); } /** @@ -347,89 +291,15 @@ */ @Test(groups = { "producerField" }) @SpecAssertion(section = { "2.6.3", "3.5.4" }) - public void testDefaultNamedField() throws Exception + public void testDefaultNamedField() { deployBeans(StaticTarantulaProducer.class); - new RunInDependentContext() - { - public void execute() - { - Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class); - assert !tarantulaBeans.isEmpty(); - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getName().equals("produceTarantula"); - } - }.run(); + Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class); + assert !tarantulaBeans.isEmpty(); + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getName().equals("produceTarantula"); } - @Test(groups = { "stub", "disposalField" }) - @SpecAssertion(section = "3.3.5") - public void testDisposalFieldNonStatic() - { - // TODO Placeholder - assert false; - } - - @Test(groups = { "stub", "disposalField" }) - @SpecAssertion(section = "3.3.5") - public void testDisposalFieldFieldDeclaredOnWebBeanImplementationClass() - { - // TODO Placeholder - assert false; - } - - @Test(groups = { "stub", "disposalField" }) - @SpecAssertion(section = "3.3.5") - public void testDisposalFieldBindingAnnotations() - { - // TODO Placeholder - assert false; - } - - @Test(groups = { "stub", "disposalField" }) - @SpecAssertion(section = "3.3.5") - public void testDisposalFieldDefaultBindingAnnotations() - { - // TODO Placeholder - assert false; - } - - @Test(groups = { "stub", "disposalField" }) - @SpecAssertion(section = "3.3.5") - public void testDisposalFieldDoesNotResolveToProducerField() - { - // TODO Placeholder - assert false; - } - - @Test(groups = { "stub", "disposalField" }) - @SpecAssertion(section = "3.3.5") - public void testDisposalFieldDeclaredOnEnabledBean() - { - // TODO Placeholder - // TODO Move this - - assert false; - } - - @Test(groups = { "stub", "disposalField" }) - @SpecAssertion(section = "3.3.5") - public void testBeanCanDeclareMultipleDisposalFields() - { - // TODO move this - // TODO Placeholder - assert false; - } - - @Test(groups = { "stub", "disposalField" }) - @SpecAssertion(section = "3.3.5") - public void testProducerFieldHasNoMoreThanOneDisposalField() - { - // TODO move this - // TODO Placeholder - assert false; - } - /** * A producer field may also specify scope, name, deployment type, * stereotypes and/or bindings. @@ -438,20 +308,14 @@ */ @Test(groups = "producerField") @SpecAssertion(section = { "2.7.2", "3.5.2", "2.2" }) - public void testStereotype() throws Exception + public void testStereotype() { deployBeans(StaticTarantulaProducer.class); - new RunInDependentContext() - { - public void execute() - { - Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class); - assert !tarantulaBeans.isEmpty(); - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getScopeType().equals(RequestScoped.class); - assert tarantulaModel.getDeploymentType().equals(Production.class); - } - }.run(); + Set<Bean<Tarantula>> tarantulaBeans = manager.resolveByType(Tarantula.class); + assert !tarantulaBeans.isEmpty(); + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getScopeType().equals(RequestScoped.class); + assert tarantulaModel.getDeploymentType().equals(Production.class); } @Test(groups = "producerField") Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-01-25 14:46:28 UTC (rev 1229) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-01-25 19:11:28 UTC (rev 1230) @@ -1,6 +1,14 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; +import java.lang.annotation.Annotation; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + import javax.webbeans.IllegalProductException; +import javax.webbeans.Production; +import javax.webbeans.Standard; + import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; import org.jboss.webbeans.tck.impl.SpecVersion; @@ -9,6 +17,18 @@ @SpecVersion("PRD2") public class ProducerFieldLifecycleTest extends AbstractTest { + /* + * (non-Javadoc) + * + * @see org.jboss.webbeans.tck.AbstractTest#getEnabledDeploymentTypes() + */ + @SuppressWarnings("unchecked") + @Override + protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() + { + // Add a local deployment type used in tests + return Collections.unmodifiableList(Arrays.asList(Standard.class, Production.class, AnotherDeploymentType.class, HighestDeploymentType.class)); + } /** * When the create() method of a Bean object that represents a producer field @@ -72,12 +92,21 @@ }.run(); } - @Test(groups = { "stub", "specialization" }) - @SpecAssertion(section = "3.3.3") - public void testSpecializedBeanAlwaysUsed() + @Test(groups = { "producerField", "specialization" }) + @SpecAssertion(section = "6.8") + public void testSpecializedBeanAlwaysUsed() throws Exception { - // TODO Placeholder - assert false; + deployBeans(TarantulaProducer.class, SpecializedTarantulaProducer.class, TarantulaConsumer.class); + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + TarantulaConsumer spiderConsumer = manager.getInstanceByType(TarantulaConsumer.class); + assert spiderConsumer.getConsumedTarantula() != null; + assert spiderConsumer.getConsumedTarantula() instanceof DefangedTarantula; + } + }.run(); } /** @@ -104,12 +133,12 @@ /** * Otherwise, if the producer field contains a null value, and the scope of - * the producer method is not @Dependent, the cre- method throws an - * IllegalProductException. ate() + * the producer method is not @Dependent, the create() method throws an + * IllegalProductException. * * @throws Exception */ - @Test(groups = { "producerField", "broken" }, expectedExceptions = IllegalProductException.class) + @Test(groups = { "producerField" }, expectedExceptions = IllegalProductException.class) @SpecAssertion(section = { "3.5", "6.8" }) public void testProducerFieldReturnsNullIsNotDependent() throws Exception { @@ -119,7 +148,20 @@ @Override protected void execute() throws Exception { - manager.getInstanceByType(NullSpiderConsumer.class); + NullSpiderConsumer consumer = manager.getInstanceByType(NullSpiderConsumer.class); + // The injected spider is proxied since it is in the request scope. + // So to actually create the bean instance, we need to invoke + // some method on the proxy. + if (consumer.getInjectedSpider() == null) + { + // No proxy in this impl, and no exception = fail + assert false; + } + else + { + // Proxy is assumed, so invoke some method + consumer.getInjectedSpider().bite(); + } } }.run(); } Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpecializedTarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpecializedTarantulaProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpecializedTarantulaProducer.java 2009-01-25 19:11:28 UTC (rev 1230) @@ -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 org.jboss.webbeans.tck.unit.implementation.producer.field; + +import javax.webbeans.Produces; +import javax.webbeans.Specializes; + +/** + * This bean contains a producer field and specializes another bean + * which has the same producer field. + * + * @author David Allen + * + */ +@Specializes +@HighestDeploymentType +public class SpecializedTarantulaProducer extends TarantulaProducer +{ + @Produces public Tarantula produceTarantula = new DefangedTarantula(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/SpecializedTarantulaProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaProducer.java 2009-01-25 14:46:28 UTC (rev 1229) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaProducer.java 2009-01-25 19:11:28 UTC (rev 1230) @@ -5,6 +5,6 @@ @AnotherDeploymentType public class TarantulaProducer { - @Produces public Tarantula produceTarantula = new DefangedTarantula(); + @Produces public Tarantula produceTarantula = new Tarantula(); }

16 years, 8 months

1
0
0 / 0

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

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-01-25 09:46:28 -0500 (Sun, 25 Jan 2009) New Revision: 1229 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/AbstractProducerBean.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java Log: A couple more broken tests fixed. 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-24 20:53:14 UTC (rev 1228) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-01-25 14:46:28 UTC (rev 1229) @@ -109,8 +109,6 @@ private boolean primitive; // The Web Beans manager protected ManagerImpl manager; - // Cached values - private Type declaredBeanType; /** * Constructor 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-24 20:53:14 UTC (rev 1228) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-01-25 14:46:28 UTC (rev 1229) @@ -272,7 +272,7 @@ if (this.deploymentType == null) { this.deploymentType = getDefaultDeploymentType(); - log.trace("Using default @Production deployment type"); + log.trace("Using default " + this.deploymentType + " deployment type"); return; } } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-01-24 20:53:14 UTC (rev 1228) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-01-25 14:46:28 UTC (rev 1229) @@ -26,20 +26,20 @@ @SuppressWarnings("unchecked") public class AbstractTest { - - protected abstract static class RunInDependentContext + + protected abstract static class RunInDependentContext { - + protected void setup() { AbstractTest.activateDependentContext(); } - + protected void cleanup() { AbstractTest.deactivateDependentContext(); } - + public final void run() throws Exception { try @@ -52,15 +52,15 @@ cleanup(); } } - + protected abstract void execute() throws Exception; - + } - + private static final List<Class<? extends Annotation>> STANDARD_DEPLOYMENT_TYPES = Collections.unmodifiableList(Arrays.asList(Standard.class, Production.class)); - + protected static final int BUILT_IN_BEANS = 3; - + protected Manager manager; public static boolean visited = false; @@ -77,28 +77,28 @@ manager = configuration().getManagers().createManager(); } } - + @AfterMethod public void after() { manager = null; } - + public <T> Bean<T> createSimpleBean(Class<T> beanClass) { return configuration().getBeans().createSimpleBean(beanClass); } - + public <T> Bean<T> createEnterpriseBean(Class<T> beanClass) { return configuration().getBeans().createEnterpriseBean(beanClass); } - + public <T> Bean<T> createProducerMethodBean(Method method, Bean<?> producerBean) { return configuration().getBeans().createProducerMethodBean(method, producerBean); } - + public <T> Bean<T> createProducerFieldBean(Field field, Bean<?> producerBean) { return configuration().getBeans().createProducerFieldBean(field, producerBean); @@ -115,12 +115,18 @@ manager = configuration().getContainers().deploy(classes); } } - + protected final List<Class<? extends Annotation>> getStandardDeploymentTypes() { - return new ArrayList<Class<? extends Annotation>>(STANDARD_DEPLOYMENT_TYPES); + return new ArrayList<Class<? extends Annotation>>(STANDARD_DEPLOYMENT_TYPES); } - + + /** + * This method should be overridden by test classes which need to enable + * additional deployment types beyond the normal ones. + * + * @return the list of enabled deployment types + */ protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { return Collections.emptyList(); @@ -144,8 +150,8 @@ { configuration().getContexts().setActive(configuration().getContexts().getDependentContext()); } - - protected static void deactivateDependentContext() + + protected static void deactivateDependentContext() { configuration().getContexts().setInactive(configuration().getContexts().getDependentContext()); } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java 2009-01-24 20:53:14 UTC (rev 1228) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java 2009-01-25 14:46:28 UTC (rev 1229) @@ -19,6 +19,7 @@ import java.util.Set; +import javax.webbeans.DefinitionException; import javax.webbeans.Observer; import javax.webbeans.manager.Bean; @@ -59,7 +60,7 @@ assert observers.size() == 2; } - @Test(groups = { "events", "integration" }) + @Test(groups = { "events", "integration", "broken" }, expectedExceptions=DefinitionException.class) @SpecAssertion(section = "8.5") public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails() { @@ -67,7 +68,7 @@ Set<Bean<Object>> beans = manager.resolveByType(Object.class); assert beans.size() >= 2; Set<Observer<String>> observers = manager.resolveObservers("An event"); - assert observers.size() == 1; + assert observers.size() == 0; } /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java 2009-01-24 20:53:14 UTC (rev 1228) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java 2009-01-25 14:46:28 UTC (rev 1229) @@ -1,5 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; +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; @@ -10,11 +11,11 @@ import javax.webbeans.DeploymentType; -@Target( { TYPE, METHOD }) +@Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @Documented @DeploymentType -@interface AnotherDeploymentType +public @interface AnotherDeploymentType { -} +} \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-01-24 20:53:14 UTC (rev 1228) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-01-25 14:46:28 UTC (rev 1229) @@ -1,10 +1,15 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; +import java.lang.annotation.Annotation; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import java.util.Set; import javax.webbeans.DefinitionException; import javax.webbeans.Production; import javax.webbeans.RequestScoped; +import javax.webbeans.Standard; import javax.webbeans.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; @@ -17,6 +22,18 @@ public class ProducerFieldDefinitionTest extends AbstractTest { + + /* (non-Javadoc) + * @see org.jboss.webbeans.tck.AbstractTest#getEnabledDeploymentTypes() + */ + @SuppressWarnings("unchecked") + @Override + protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() + { + // Add a local deployment type used in tests + return Collections.unmodifiableList(Arrays.asList(Standard.class, Production.class, AnotherDeploymentType.class)); + } + /** * By default, if no deployment type annotation is explicitly specified, a * producer method or field inherits the deployment type of the bean in which @@ -24,7 +41,7 @@ * * @throws Exception */ - @Test(groups = { "producerField", "broken" }) + @Test(groups = { "producerField" }) @SpecAssertion(section = "2.5.3") public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception { @@ -182,7 +199,7 @@ * * @throws Exception */ - @Test(groups = { "producerField", "broken" }) + @Test(groups = { "producerField" }) @SpecAssertion(section = "3.5.1") public void testApiTypeForPrimitiveReturn() throws Exception { @@ -207,7 +224,7 @@ * * @throws Exception */ - @Test(groups = { "producerField", "broken" }) + @Test(groups = { "producerField" }) @SpecAssertion(section = { "3.5.1", "2.2" }) public void testApiTypeForArrayTypeReturn() throws Exception {

16 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1228 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event and 2 other directories.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-01-24 15:53:14 -0500 (Sat, 24 Jan 2009) New Revision: 1228 Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDiscovery.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Greyhound_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Labrador.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Leopard.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java Log: Fixed a few more tests and added Singleton as EJB type. Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDiscovery.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDiscovery.java 2009-01-24 18:47:01 UTC (rev 1227) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDiscovery.java 2009-01-24 20:53:14 UTC (rev 1228) @@ -6,6 +6,7 @@ import java.util.Set; import javax.ejb.MessageDriven; +import javax.ejb.Singleton; import javax.ejb.Stateful; import javax.ejb.Stateless; @@ -37,7 +38,7 @@ Set<Class<?>> ejbs = new HashSet<Class<?>>(); for (Class<?> clazz : webBeanClasses) { - if (clazz.isAnnotationPresent(Stateless.class) || clazz.isAnnotationPresent(Stateful.class) || clazz.isAnnotationPresent(MessageDriven.class)) + if (clazz.isAnnotationPresent(Stateless.class) || clazz.isAnnotationPresent(Stateful.class) || clazz.isAnnotationPresent(MessageDriven.class) || clazz.isAnnotationPresent(Singleton.class)) { ejbs.add(clazz); } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-01-24 18:47:01 UTC (rev 1227) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-01-24 20:53:14 UTC (rev 1228) @@ -30,8 +30,7 @@ @SpecVersion("20081206") public class EventTest extends AbstractTest { - - + @Override protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { @@ -40,7 +39,7 @@ deploymentTypes.add(AnotherDeploymentType.class); return deploymentTypes; } - + public static class AnEventType { } @@ -272,11 +271,11 @@ assert observer2.wasNotified; } - @Test(groups = { "events", "broken" }) + @Test(groups = { "events" }) @SpecAssertion(section = "8.4") public void testObserverThrowsExceptionAbortsNotifications() { - AnObserver observer = new AnObserver(); + AnObserverWithException observer = new AnObserverWithException(); AnObserverWithException anotherObserver = new AnObserverWithException(); manager.addObserver(anotherObserver, AnEventType.class); manager.addObserver(observer, AnEventType.class); @@ -290,14 +289,13 @@ } catch (Exception e) { - if (anotherObserver.theException.equals(e)) + if (e.equals(observer.theException) || e.equals(anotherObserver.theException)) fireFailed = true; } assert fireFailed; - - assert anotherObserver.wasNotified; - // TODO This cannot properly test for event processing abort - // assert !observer.wasNotified; + // Only one of the observers can be notified if processing + // is aborted + assert observer.wasNotified ^ anotherObserver.wasNotified; } @Test(groups = { "events" }) @@ -312,7 +310,7 @@ // Resolve the observers for String and Integer Set<Observer<String>> resolvedStringObservers = manager.resolveObservers("A new event"); assert resolvedStringObservers.size() == 1; - + Set<Observer<Integer>> resolvedIntegerObservers = manager.resolveObservers(new Integer(42)); assert resolvedIntegerObservers.size() == 1; } @@ -920,7 +918,7 @@ { assert false; } - + @Test @SpecAssertion(section = "4.2") public void testNonStaticObserverMethodNotInherited() @@ -928,8 +926,9 @@ deployBeans(LazyFarmer.class); assert manager.resolveObservers(new Egg()).isEmpty(); } - - @Test @SpecAssertion(section="8.5.8") + + @Test + @SpecAssertion(section = "8.5.8") public void testObserverCalledOnMostSpecializedInstance() { Shop.deliveryObservedBy = null; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-01-24 18:47:01 UTC (rev 1227) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-01-24 20:53:14 UTC (rev 1228) @@ -10,11 +10,9 @@ /** * Sections * - * 3.3. Enterprise Web Beans - * 3.3.1. Which EJBs are enterprise Web Beans? - * 3.3.2. API types of an enterprise Web Bean - * 3.3.3. Declaring an enterprise Web Bean using annotations - * 3.3.4. Declaring an enterprise Web Bean using XML + * 3.3. Enterprise Web Beans 3.3.1. Which EJBs are enterprise Web Beans? 3.3.2. + * API types of an enterprise Web Bean 3.3.3. Declaring an enterprise Web Bean + * using annotations 3.3.4. Declaring an enterprise Web Bean using XML * * @author Nicklas Karlsson */ @@ -94,12 +92,11 @@ * illegal scope, a DefinitionException is thrown by the Web Bean manager at * initialization time */ - @Test(groups = { "enterpriseBeans" ,"broken"}) + @Test(groups = { "enterpriseBeans" }) @SpecAssertion(section = "3.3") public void testSingletonWithDependentScopeOK() { deployBeans(Labrador.class); - assert false; } /** @@ -108,7 +105,7 @@ * illegal scope, a DefinitionException is thrown by the Web Bean manager at * initialization time */ - @Test(groups = { "enterpriseBeans" , "broken"}, expectedExceptions = DefinitionException.class) + @Test(groups = { "enterpriseBeans" }, expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3") public void testSingletonWithRequestScopeFails() { @@ -314,7 +311,7 @@ * Bean declared in XML is a message-driven bean, a DefinitionException is * thrown by the Web Bean manager at initialization time. */ - @Test(expectedExceptions = DefinitionException.class, groups = {"enterpriseBeans", "broken"}) + @Test(expectedExceptions = DefinitionException.class, groups = { "enterpriseBeans" }) @SpecAssertion(section = "3.3") public void testMessageDrivenBeansNotOK() { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Greyhound_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Greyhound_Broken.java 2009-01-24 18:47:01 UTC (rev 1227) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Greyhound_Broken.java 2009-01-24 20:53:14 UTC (rev 1228) @@ -1,8 +1,9 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.ejb.Singleton; import javax.webbeans.RequestScoped; -//@Singleton +@Singleton @RequestScoped class Greyhound_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Labrador.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Labrador.java 2009-01-24 18:47:01 UTC (rev 1227) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Labrador.java 2009-01-24 20:53:14 UTC (rev 1228) @@ -1,8 +1,9 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.ejb.Singleton; import javax.webbeans.Dependent; -//@Singleton +@Singleton @Dependent class Labrador { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Leopard.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Leopard.java 2009-01-24 18:47:01 UTC (rev 1227) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Leopard.java 2009-01-24 20:53:14 UTC (rev 1228) @@ -1,10 +1,11 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; +import javax.ejb.MessageDriven; import javax.webbeans.Production; @Production -//@MessageDriven -class Leopard /*implements javax.jms.MessageListener*/ +@MessageDriven +class Leopard /*implements MessageListener*/ { public void onMessage(/*Message message*/) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-01-24 18:47:01 UTC (rev 1227) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-01-24 20:53:14 UTC (rev 1228) @@ -18,7 +18,7 @@ * • If the producer method is static, the container must access the field * value. */ - @Test(groups = { "producerField", "broken" }) + @Test(groups = { "producerField" }) @SpecAssertion(section = "5.6") public void testProducerStaticFieldBean() { @@ -56,7 +56,7 @@ * * @throws Exception */ - @Test(groups = { "producerField", "broken" }) + @Test(groups = { "producerField" }) @SpecAssertion(section = "6.8") public void testProducerFieldBeanCreate() throws Exception {

16 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1227 - doc/trunk/reference/pot.

by webbeans-commits＠lists.jboss.org

Author: nico.ben Date: 2009-01-24 13:47:01 -0500 (Sat, 24 Jan 2009) New Revision: 1227 Modified: doc/trunk/reference/pot/Author_Group.pot doc/trunk/reference/pot/Book_Info.pot doc/trunk/reference/pot/decorators.pot doc/trunk/reference/pot/ee.pot doc/trunk/reference/pot/events.pot doc/trunk/reference/pot/example.pot doc/trunk/reference/pot/extend.pot doc/trunk/reference/pot/injection.pot doc/trunk/reference/pot/interceptors.pot doc/trunk/reference/pot/intro.pot doc/trunk/reference/pot/master.pot doc/trunk/reference/pot/messages.mo doc/trunk/reference/pot/next.pot doc/trunk/reference/pot/part1.pot doc/trunk/reference/pot/part2.pot doc/trunk/reference/pot/part3.pot doc/trunk/reference/pot/part4.pot doc/trunk/reference/pot/producermethods.pot doc/trunk/reference/pot/ri-spi.pot doc/trunk/reference/pot/ri.pot doc/trunk/reference/pot/scopescontexts.pot doc/trunk/reference/pot/specialization.pot doc/trunk/reference/pot/stereotypes.pot doc/trunk/reference/pot/xml.pot Log: Regenerated POT and updated all POs Modified: doc/trunk/reference/pot/Author_Group.pot =================================================================== --- doc/trunk/reference/pot/Author_Group.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/Author_Group.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" Modified: doc/trunk/reference/pot/Book_Info.pot =================================================================== --- doc/trunk/reference/pot/Book_Info.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/Book_Info.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" Modified: doc/trunk/reference/pot/decorators.pot =================================================================== --- doc/trunk/reference/pot/decorators.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/decorators.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" Modified: doc/trunk/reference/pot/ee.pot =================================================================== --- doc/trunk/reference/pot/ee.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/ee.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" @@ -312,7 +312,7 @@ #, no-c-format msgid "" "Web Beans doesn't define any special deployment archive. You can package Web " -"Beans in JARs, EJB-JARs or WARsany deployment location in the " +"Beans in JARs, EJB-JARs or WARs  any deployment location in the " "application classpath. However, each archive that contains Web Beans must " "include a file named <literal>web-beans.xml</literal> in the <literal>META-" "INF</literal> or <literal>WEB-INF</literal> directory. The file may be " Modified: doc/trunk/reference/pot/events.pot =================================================================== --- doc/trunk/reference/pot/events.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/events.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" @@ -118,10 +118,10 @@ #: events.xml:48 #, no-c-format msgid "" -"An observer method need not specify any event bindingsin this case it " -"is interested in <emphasis>all</emphasis> events of a particular type. If it " -"does specify event bindings, it is only interested in events which also have " -"those event bindings." +"An observer method need not specify any event bindings  in this case " +"it is interested in <emphasis>all</emphasis> events of a particular type. If " +"it does specify event bindings, it is only interested in events which also " +"have those event bindings." msgstr "" #. Tag: para Modified: doc/trunk/reference/pot/example.pot =================================================================== --- doc/trunk/reference/pot/example.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/example.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" Modified: doc/trunk/reference/pot/extend.pot =================================================================== --- doc/trunk/reference/pot/extend.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/extend.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" Modified: doc/trunk/reference/pot/injection.pot =================================================================== --- doc/trunk/reference/pot/injection.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/injection.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" @@ -654,9 +654,10 @@ #, no-c-format msgid "" "If you've been paying attention, you're probably wondering how the Web Bean " -"manager decides which implementation<literal>ExternalPaymentProcessor</" -"literal> or <literal>MockPaymentProcessor</literal>to choose. Consider " -"what happens when the manager encounters this injection point:" +"manager decides which implementation  " +"<literal>ExternalPaymentProcessor</literal> or " +"<literal>MockPaymentProcessor</literal>  to choose. Consider what " +"happens when the manager encounters this injection point:" msgstr "" #. Tag: programlisting @@ -795,7 +796,7 @@ msgid "" "To fix an <literal>UnsatisfiedDependencyException</literal>, simply provide " "a Web Bean which implements the API type and has the binding types of the " -"injection pointor enable the deployment type of a Web Bean that " +"injection point  or enable the deployment type of a Web Bean that " "already implements the API type and has the binding types." msgstr "" @@ -974,8 +975,8 @@ #, no-c-format msgid "" "If the binding type has an annotation member, we can't use an anonymous " -"subclass of <literal>AnnotationLiteral</literal>instead we'll need to " -"create a named subclass:" +"subclass of <literal>AnnotationLiteral</literal>  instead we'll need " +"to create a named subclass:" msgstr "" #. Tag: programlisting @@ -1054,8 +1055,8 @@ #: injection.xml:442 #, no-c-format msgid "" -"There are certain kinds of dependent objectsWeb Beans with scope " -"<literal>@Dependent</literal>that need to know something about the " +"There are certain kinds of dependent objects  Web Beans with scope " +"<literal>@Dependent</literal>  that need to know something about the " "object or injection point into which they are injected in order to be able " "to do what they do. For example:" msgstr "" Modified: doc/trunk/reference/pot/interceptors.pot =================================================================== --- doc/trunk/reference/pot/interceptors.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/interceptors.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" @@ -487,7 +487,7 @@ msgid "" "Well, fortunately, Web Beans works around this missing feature of Java. We " "may annotate one interceptor binding type with other interceptor binding " -"types. The interceptor bindings are transitiveany Web Bean with the " +"types. The interceptor bindings are transitive  any Web Bean with the " "first interceptor binding inherits the interceptor bindings declared as meta-" "annotations." msgstr "" @@ -561,8 +561,8 @@ #: interceptors.xml:212 #, no-c-format msgid "" -"the interceptor ordering is non-globalit is determined by the order in " -"which interceptors are listed at the class level." +"the interceptor ordering is non-global  it is determined by the order " +"in which interceptors are listed at the class level." msgstr "" #. Tag: para Modified: doc/trunk/reference/pot/intro.pot =================================================================== --- doc/trunk/reference/pot/intro.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/intro.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" @@ -46,9 +46,9 @@ "Furthermore, every EJB 3-style session bean is a Web Bean. Sure, the " "JavaBeans and EJBs you've been writing every day have not been able to take " "advantage of the new services defined by the Web Beans specification, but " -"you'll be able to use every one of them as Web Beansinjecting them " +"you'll be able to use every one of them as Web Beans  injecting them " "into other Web Beans, configuring them via the Web Beans XML configuration " -"facility, even adding interceptors and decorators to themwithout " +"facility, even adding interceptors and decorators to them  without " "touching your existing code." msgstr "" @@ -202,9 +202,9 @@ msgid "" "At system initialization time, the Web Bean manager must validate that " "exactly one Web Bean exists which satisfies each injection point. In our " -"example, if no implementation of <literal>Translator</literal> " -"availableif the <literal>SentenceTranslator</literal> EJB was not " -"deployedthe Web Bean manager would throw an " +"example, if no implementation of <literal>Translator</literal> available " +" if the <literal>SentenceTranslator</literal> EJB was not deployed " +" the Web Bean manager would throw an " "<literal>UnsatisfiedDependencyException</literal>. If more than one " "implementation of <literal>Translator</literal> was available, the Web Bean " "manager would throw an <literal>AmbiguousDependencyException</literal>." @@ -331,8 +331,9 @@ #, no-c-format msgid "" "Note that not all clients of a Web Bean are Web Beans. Other objects such as " -"Servlets or Message-Driven Beanswhich are by nature not injectable, " -"contextual objectsmay also obtain references to Web Beans by injection." +"Servlets or Message-Driven Beans  which are by nature not injectable, " +"contextual objects  may also obtain references to Web Beans by " +"injection." msgstr "" #. Tag: para @@ -682,8 +683,8 @@ #: intro.xml:289 #, no-c-format msgid "" -"In this case, the name defaults to <literal>shoppingCart</literal>the " -"unqualified class name, with the first character changed to lowercase." +"In this case, the name defaults to <literal>shoppingCart</literal>  " +"the unqualified class name, with the first character changed to lowercase." msgstr "" #. Tag: title @@ -826,8 +827,8 @@ msgid "" "The specification says that all EJB 3-style session and singleton beans are " "<emphasis>enterprise</emphasis> Web Beans. Message driven beans are not Web " -"Beanssince they are not intended to be injected into other " -"objectsbut they can take advantage of most of the functionality of Web " +"Beans  since they are not intended to be injected into other objects " +" but they can take advantage of most of the functionality of Web " "Beans, including dependency injection and interceptors." msgstr "" Modified: doc/trunk/reference/pot/master.pot =================================================================== --- doc/trunk/reference/pot/master.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/master.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" Modified: doc/trunk/reference/pot/messages.mo =================================================================== (Binary files differ) Modified: doc/trunk/reference/pot/next.pot =================================================================== --- doc/trunk/reference/pot/next.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/next.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" Modified: doc/trunk/reference/pot/part1.pot =================================================================== --- doc/trunk/reference/pot/part1.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/part1.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" Modified: doc/trunk/reference/pot/part2.pot =================================================================== --- doc/trunk/reference/pot/part2.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/part2.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" Modified: doc/trunk/reference/pot/part3.pot =================================================================== --- doc/trunk/reference/pot/part3.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/part3.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" @@ -29,9 +29,9 @@ #, no-c-format msgid "" "You don't see string-based identifiers in Web Beans code, not because the " -"framework is hiding them from you using clever defaulting rulesso-" -"called \"configuration by convention\"but because there are simply no " -"strings there to begin with!" +"framework is hiding them from you using clever defaulting rules  so-" +"called \"configuration by convention\"  but because there are simply " +"no strings there to begin with!" msgstr "" #. Tag: para Modified: doc/trunk/reference/pot/part4.pot =================================================================== --- doc/trunk/reference/pot/part4.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/part4.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" Modified: doc/trunk/reference/pot/producermethods.pot =================================================================== --- doc/trunk/reference/pot/producermethods.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/producermethods.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" Modified: doc/trunk/reference/pot/ri-spi.pot =================================================================== --- doc/trunk/reference/pot/ri-spi.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/ri-spi.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" Modified: doc/trunk/reference/pot/ri.pot =================================================================== --- doc/trunk/reference/pot/ri.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/ri.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" Modified: doc/trunk/reference/pot/scopescontexts.pot =================================================================== --- doc/trunk/reference/pot/scopescontexts.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/scopescontexts.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" @@ -422,8 +422,8 @@ "The Web Bean manager is permitted to destroy a conversation and all state " "held in its context at any time in order to preserve resources. A Web Bean " "manager implementation will normally do this on the basis of some kind of " -"timeoutthough this is not required by the Web Beans specification. The " -"timeout is the period of inactivity before the conversation is destroyed." +"timeout  though this is not required by the Web Beans specification. " +"The timeout is the period of inactivity before the conversation is destroyed." msgstr "" #. Tag: para Modified: doc/trunk/reference/pot/specialization.pot =================================================================== --- doc/trunk/reference/pot/specialization.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/specialization.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" Modified: doc/trunk/reference/pot/stereotypes.pot =================================================================== --- doc/trunk/reference/pot/stereotypes.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/stereotypes.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n" Modified: doc/trunk/reference/pot/xml.pot =================================================================== --- doc/trunk/reference/pot/xml.pot 2009-01-24 18:23:35 UTC (rev 1226) +++ doc/trunk/reference/pot/xml.pot 2009-01-24 18:47:01 UTC (rev 1227) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2009-01-18 16:31+0000\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"

16 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1226 - doc/trunk/reference/it-IT.

by webbeans-commits＠lists.jboss.org

Author: nico.ben Date: 2009-01-24 13:23:35 -0500 (Sat, 24 Jan 2009) New Revision: 1226 Modified: doc/trunk/reference/it-IT/injection.po Log: Update italian translation Modified: doc/trunk/reference/it-IT/injection.po =================================================================== --- doc/trunk/reference/it-IT/injection.po 2009-01-24 04:41:15 UTC (rev 1225) +++ doc/trunk/reference/it-IT/injection.po 2009-01-24 18:23:35 UTC (rev 1226) @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: master.xml\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-19 20:26+0000\n" -"PO-Revision-Date: 2009-01-20 21:28+0100\n" +"POT-Creation-Date: 2009-01-24 18:19+0000\n" +"PO-Revision-Date: 2009-01-24 19:22+0100\n" "Last-Translator: Nicola Benaglia <nico.benaz(a)gmail.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -672,8 +672,8 @@ #. Tag: para #: injection.xml:246 #, no-c-format -msgid "If you've been paying attention, you're probably wondering how the Web Bean manager decides which implementation<literal>ExternalPaymentProcessor</literal> or <literal>MockPaymentProcessor</literal>to choose. Consider what happens when the manager encounters this injection point:" -msgstr "Se avete prestato attenzione, vi state probabilmente chiedendo come il manager Web Bean decida quale implementazione  <literal>ExternalPaymentProcessor</literal> o <literal>MockPaymentProcessor</literal>  scegliere. Si consideri cosa succede quando il manager incontra questo punto di iniezione:" +msgid "If you've been paying attention, you're probably wondering how the Web Bean manager decides which implementation  <literal>ExternalPaymentProcessor</literal> or <literal>MockPaymentProcessor</literal>  to choose. Consider what happens when the manager encounters this injection point:" +msgstr "Se avete prestato attenzione, vi state probabilmente chiedendo come il manager Web Bean decida quale implementazione scegliere  <literal>ExternalPaymentProcessor</literal> o <literal>MockPaymentProcessor</literal>  Si consideri cosa succede quando il manager incontra questo punto di iniezione:" #. Tag: programlisting #: injection.xml:251 @@ -770,8 +770,8 @@ #. Tag: para #: injection.xml:323 #, no-c-format -msgid "To fix an <literal>UnsatisfiedDependencyException</literal>, simply provide a Web Bean which implements the API type and has the binding types of the injection pointor enable the deployment type of a Web Bean that already implements the API type and has the binding types." -msgstr "Per rimediare ad una <literal>UnsatisfiedDependencyException</literal>, si deve semplicemente fornire un Web Bean che implementi il tipo dell'API in uso e abbia gli stessi tipi di binding del punto di iniezione#151;o si deve abilitare il tipo di deploy di un Web Bean che già implementa il tipo dell'API in uso e possiede i tipi di binding in esame." +msgid "To fix an <literal>UnsatisfiedDependencyException</literal>, simply provide a Web Bean which implements the API type and has the binding types of the injection point  or enable the deployment type of a Web Bean that already implements the API type and has the binding types." +msgstr "Per rimediare ad una <literal>UnsatisfiedDependencyException</literal>, si deve semplicemente fornire un Web Bean che implementi il tipo dell'API in uso e abbia gli stessi tipi di binding del punto di iniezione #151; o si deve abilitare il tipo di deploy di un Web Bean che già implementa il tipo dell'API in uso e possiede i tipi di binding in esame." # tipo di binding o binding type (qui e altrove)? #. Tag: para @@ -903,8 +903,8 @@ #. Tag: para #: injection.xml:410 #, no-c-format -msgid "If the binding type has an annotation member, we can't use an anonymous subclass of <literal>AnnotationLiteral</literal>instead we'll need to create a named subclass:" -msgstr "Se il tipo di binding ha un membro annotazione, non è possibile utilizzare una sottoclasse anonima di <literal>AnnotationLiteral</literal>sarà invece necessario creare una sottoclasse non anonima:" +msgid "If the binding type has an annotation member, we can't use an anonymous subclass of <literal>AnnotationLiteral</literal>  instead we'll need to create a named subclass:" +msgstr "Se il tipo di binding ha un membro annotazione, non è possibile utilizzare una sottoclasse anonima di <literal>AnnotationLiteral</literal>  sarà invece necessario creare una sottoclasse non anonima:" #. Tag: programlisting #: injection.xml:413 @@ -972,8 +972,8 @@ #. Tag: para #: injection.xml:442 #, no-c-format -msgid "There are certain kinds of dependent objectsWeb Beans with scope <literal>@Dependent</literal>that need to know something about the object or injection point into which they are injected in order to be able to do what they do. For example:" -msgstr "Certi tipi di oggetti dipendentiWeb Bean con scope <literal>@Dependent</literal>hanno bisogno di avere informazioni riguardo l'oggetto o il punto in cui sono iniettati per fare quello che devono. Per esempio:" +msgid "There are certain kinds of dependent objects  Web Beans with scope <literal>@Dependent</literal>  that need to know something about the object or injection point into which they are injected in order to be able to do what they do. For example:" +msgstr "Certi tipi di oggetti dipendenti  Web Bean con scope <literal>@Dependent</literal>  hanno bisogno di avere informazioni riguardo l'oggetto o il punto in cui sono iniettati per fare quello che devono. Per esempio:" #. Tag: para #: injection.xml:448

16 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1225 - doc/trunk/reference/de-DE.

by webbeans-commits＠lists.jboss.org

Author: jdimanos Date: 2009-01-23 23:41:15 -0500 (Fri, 23 Jan 2009) New Revision: 1225 Modified: doc/trunk/reference/de-DE/xml.po Log: update Modified: doc/trunk/reference/de-DE/xml.po =================================================================== --- doc/trunk/reference/de-DE/xml.po 2009-01-24 04:40:21 UTC (rev 1224) +++ doc/trunk/reference/de-DE/xml.po 2009-01-24 04:41:15 UTC (rev 1225) @@ -1,3 +1,4 @@ +# translation of xml.po to # Language de-DE translations for Introduction_to_Web_Beans package. # Automatically generated, 2009. # @@ -3,13 +4,14 @@ msgid "" msgstr "" -"Project-Id-Version: Introduction_to_Web_Beans VERSION\n" +"Project-Id-Version: xml\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2009-01-10 14:18+0000\n" -"PO-Revision-Date: 2009-01-10 14:18+0000\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2009-01-24 15:41+1100\n" +"Last-Translator: \n" +"Language-Team: <en(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" #. Tag: title @@ -37,8 +39,7 @@ #. Tag: para #: xml.xml:15 #, no-c-format -msgid "" -"when there should be multiple Web Beans with the same implementation class." +msgid "when there should be multiple Web Beans with the same implementation class." msgstr "" #. Tag: para @@ -128,6 +129,12 @@ "\n" "</WebBeans>]]>" msgstr "" +"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n" +" xmlns:util=\"urn:java:java.util\">\n" +"\n" +" <util:Date/>\n" +"\n" +"</WebBeans>]]>" #. Tag: para #: xml.xml:58 @@ -142,7 +149,7 @@ #: xml.xml:62 #, no-c-format msgid "<![CDATA[@Current Date date]]>" -msgstr "" +msgstr "<![CDATA[@Current Date date]]>" #. Tag: title #: xml.xml:67 @@ -168,6 +175,11 @@ " <myfwk:Secure/>\n" "</myapp:ShoppingCart>]]>" msgstr "" +"<![CDATA[<myapp:ShoppingCart>\n" +" <SessionScoped/>\n" +" <myfwk:Transactional requiresNew=\"true\"/>\n" +" <myfwk:Secure/>\n" +"</myapp:ShoppingCart>]]>" #. Tag: para #: xml.xml:74 @@ -195,6 +207,21 @@ " <Named>systemStartTime</Named>\n" "</util:Date>]]>" msgstr "" +"<![CDATA[<util:Date>\n" +" <Named>currentTime</Named>\n" +"</util:Date>\n" +"\n" +"<util:Date>\n" +" <SessionScoped/>\n" +" <myapp:Login/>\n" +" <Named>loginTime</Named>\n" +"</util:Date>\n" +"\n" +"<util:Date>\n" +" <ApplicationScoped/>\n" +" <myapp:SystemStart/>\n" +" <Named>systemStartTime</Named>\n" +"</util:Date>]]>" #. Tag: para #: xml.xml:78 @@ -212,6 +239,9 @@ "@Login Date loginTime;\n" "@SystemStart Date systemStartTime;]]>" msgstr "" +"<![CDATA[@Current Date currentTime;\n" +"@Login Date loginTime;\n" +"@SystemStart Date systemStartTime;]]>" #. Tag: para #: xml.xml:83 @@ -228,6 +258,10 @@ " <myapp:Asynchronous/>\n" "</myapp:AsynchronousChequePaymentProcessor>]]>" msgstr "" +"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n" +" <myapp:PayByCheque/>\n" +" <myapp:Asynchronous/>\n" +"</myapp:AsynchronousChequePaymentProcessor>]]>" #. Tag: para #: xml.xml:87 @@ -246,6 +280,10 @@ " <myfwk:Transactional/>\n" "</myfwk:TransactionInterceptor>]]>" msgstr "" +"<![CDATA[<myfwk:TransactionInterceptor>\n" +" <Interceptor/>\n" +" <myfwk:Transactional/>\n" +"</myfwk:TransactionInterceptor>]]>" #. Tag: title #: xml.xml:95 @@ -257,7 +295,7 @@ #: xml.xml:97 #, no-c-format msgid "TODO!" -msgstr "" +msgstr "TODO!" #. Tag: title #: xml.xml:104 @@ -286,6 +324,16 @@ " </myapp:admin>\n" "</myapp:System>]]>" msgstr "" +"<![CDATA[<myapp:System>\n" +" <ApplicationScoped/>\n" +" <myapp:admin>\n" +" <myapp:Name>\n" +" <myapp:firstname>Gavin</myapp:firstname>\n" +" <myapp:lastname>King</myapp:lastname>\n" +" <myapp:email>gavin(a)hibernate.org</myapp:email>\n" +" </myapp:Name>\n" +" </myapp:admin>\n" +"</myapp:System>]]>" #. Tag: para #: xml.xml:110 @@ -341,6 +389,19 @@ "\n" "</WebBeans>]]>" msgstr "" +"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n" +" xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n" +" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +" xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun.com/" +"jee/web-beans-1.0.xsd\n" +" urn:java:com.mydomain.myapp http://mydomain." +"com/xsd/myapp-1.2.xsd\">\n" +"\n" +" <myapp:System>\n" +" ...\n" +" </myapp:System>\n" +"\n" +"</WebBeans>]]>" #. Tag: para #: xml.xml:132 @@ -350,3 +411,4 @@ "will provide a tool which automatically generates the XML schema from " "compiled Java code." msgstr "" +

16 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1224 - doc/trunk/reference/de-DE.

by webbeans-commits＠lists.jboss.org

Author: jdimanos Date: 2009-01-23 23:40:21 -0500 (Fri, 23 Jan 2009) New Revision: 1224 Modified: doc/trunk/reference/de-DE/stereotypes.po Log: update Modified: doc/trunk/reference/de-DE/stereotypes.po =================================================================== --- doc/trunk/reference/de-DE/stereotypes.po 2009-01-24 04:39:30 UTC (rev 1223) +++ doc/trunk/reference/de-DE/stereotypes.po 2009-01-24 04:40:21 UTC (rev 1224) @@ -1,3 +1,4 @@ +# translation of stereotypes.po to # Language de-DE translations for Introduction_to_Web_Beans package. # Automatically generated, 2009. # @@ -3,13 +4,14 @@ msgid "" msgstr "" -"Project-Id-Version: Introduction_to_Web_Beans VERSION\n" +"Project-Id-Version: stereotypes\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2009-01-10 14:18+0000\n" -"PO-Revision-Date: 2009-01-10 14:18+0000\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2009-01-24 15:40+1100\n" +"Last-Translator: \n" +"Language-Team: <en(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" #. Tag: title @@ -102,6 +104,10 @@ "@Stereotype\n" "public @interface Action {}]]>" msgstr "" +"<![CDATA[@Retention(RUNTIME)\n" +"@Target(TYPE)\n" +"@Stereotype\n" +"public @interface Action {}]]>" #. Tag: para #: stereotypes.xml:46 @@ -116,6 +122,8 @@ "<![CDATA[@Action \n" "public class LoginAction { ... }]]>" msgstr "" +"<![CDATA[@Action \n" +"public class LoginAction { ... }]]>" #. Tag: title #: stereotypes.xml:51 @@ -145,6 +153,12 @@ "@Stereotype\n" "public @interface Action {}]]>" msgstr "" +"<![CDATA[@Retention(RUNTIME)\n" +"@Target(TYPE)\n" +"@RequestScoped\n" +"@WebTier\n" +"@Stereotype\n" +"public @interface Action {}]]>" #. Tag: para #: stereotypes.xml:61 @@ -161,12 +175,13 @@ "<![CDATA[@Dependent @Mock @Action \n" "public class MockLoginAction { ... }]]>" msgstr "" +"<![CDATA[@Dependent @Mock @Action \n" +"public class MockLoginAction { ... }]]>" #. Tag: para #: stereotypes.xml:66 #, no-c-format -msgid "" -"If we want to force all actions to a particular scope, we can do that too." +msgid "If we want to force all actions to a particular scope, we can do that too." msgstr "" #. Tag: title @@ -195,6 +210,12 @@ "@Stereotype(supportedScopes=RequestScoped.class)\n" "public @interface Action {}]]>" msgstr "" +"<![CDATA[@Retention(RUNTIME)\n" +"@Target(TYPE)\n" +"@RequestScoped\n" +"@WebTier\n" +"@Stereotype(supportedScopes=RequestScoped.class)\n" +"public @interface Action {}]]>" #. Tag: para #: stereotypes.xml:80 @@ -224,6 +245,12 @@ "@Stereotype(requiredTypes=AbstractAction.class)\n" "public @interface Action {}]]>" msgstr "" +"<![CDATA[@Retention(RUNTIME)\n" +"@Target(TYPE)\n" +"@RequestScoped\n" +"@WebTier\n" +"@Stereotype(requiredTypes=AbstractAction.class)\n" +"public @interface Action {}]]>" #. Tag: para #: stereotypes.xml:89 @@ -261,6 +288,14 @@ "@Stereotype\n" "public @interface Action {}]]>" msgstr "" +"<![CDATA[@Retention(RUNTIME)\n" +"@Target(TYPE)\n" +"@RequestScoped\n" +"@Transactional(requiresNew=true)\n" +"@Secure\n" +"@WebTier\n" +"@Stereotype\n" +"public @interface Action {}]]>" #. Tag: para #: stereotypes.xml:103 @@ -300,6 +335,15 @@ "@Stereotype\n" "public @interface Action {}]]>" msgstr "" +"<![CDATA[@Retention(RUNTIME)\n" +"@Target(TYPE)\n" +"@RequestScoped\n" +"@Transactional(requiresNew=true)\n" +"@Secure\n" +"@Named\n" +"@WebTier\n" +"@Stereotype\n" +"public @interface Action {}]]>" #. Tag: para #: stereotypes.xml:118 @@ -341,6 +385,12 @@ "@Retention(RUNTIME) \n" "public @interface Model {} ]]>" msgstr "" +"<![CDATA[@Named \n" +"@RequestScoped \n" +"@Stereotype \n" +"@Target({TYPE, METHOD}) \n" +"@Retention(RUNTIME) \n" +"public @interface Model {} ]]>" #. Tag: para #: stereotypes.xml:133 @@ -350,3 +400,4 @@ "beans, just annotate a Web Bean <literal>@Model</literal>, and use it " "directly in your JSF page." msgstr "" +

16 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1223 - doc/trunk/reference/de-DE.

by webbeans-commits＠lists.jboss.org

Author: jdimanos Date: 2009-01-23 23:39:30 -0500 (Fri, 23 Jan 2009) New Revision: 1223 Modified: doc/trunk/reference/de-DE/specialization.po Log: update Modified: doc/trunk/reference/de-DE/specialization.po =================================================================== --- doc/trunk/reference/de-DE/specialization.po 2009-01-24 04:38:48 UTC (rev 1222) +++ doc/trunk/reference/de-DE/specialization.po 2009-01-24 04:39:30 UTC (rev 1223) @@ -1,3 +1,4 @@ +# translation of specialization.po to # Language de-DE translations for Introduction_to_Web_Beans package. # Automatically generated, 2009. # @@ -3,13 +4,14 @@ msgid "" msgstr "" -"Project-Id-Version: Introduction_to_Web_Beans VERSION\n" +"Project-Id-Version: specialization\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2009-01-10 14:18+0000\n" -"PO-Revision-Date: 2009-01-10 14:18+0000\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2009-01-24 15:39+1100\n" +"Last-Translator: \n" +"Language-Team: <en(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" #. Tag: title @@ -39,6 +41,11 @@ " ...\n" "}" msgstr "" +"@CreditCard @Stateless\n" +"public class CreditCardPaymentProcessor \n" +" implements PaymentProcessor {\n" +" ...\n" +"}" #. Tag: para #: specialization.xml:13 @@ -58,6 +65,11 @@ " ...\n" "}" msgstr "" +"@CreditCard @Stateless @Staging\n" +"public class StagingCreditCardPaymentProcessor \n" +" implements PaymentProcessor {\n" +" ...\n" +"}" #. Tag: para #: specialization.xml:18 @@ -75,7 +87,7 @@ #: specialization.xml:24 #, no-c-format msgid "@CreditCard PaymentProcessor ccpp" -msgstr "" +msgstr "@CreditCard PaymentProcessor ccpp" #. Tag: para #: specialization.xml:26 @@ -187,6 +199,11 @@ " ...\n" "}" msgstr "" +"@Stateless @Staging @Specializes\n" +"public class StagingCreditCardPaymentProcessor \n" +" extends CreditCardPaymentProcessor {\n" +" ...\n" +"}" #. Tag: para #: specialization.xml:79 @@ -269,8 +286,7 @@ #. Tag: para #: specialization.xml:124 #, no-c-format -msgid "" -"there is no other enabled Web Bean that also specializes the superclass." +msgid "there is no other enabled Web Bean that also specializes the superclass." msgstr "" #. Tag: para @@ -289,3 +305,4 @@ "emphasis> be called in any deployment of the system where the Web Bean " "annotated <literal>@Specializes</literal> is deployed and enabled." msgstr "" +

16 years, 8 months

1
0
0 / 0

← Newer
1
...
12
13
14
15
16
17
18
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits January 2009