Author: pete.muir(a)jboss.org Date: 2009-08-30 15:44:25 -0400 (Sun, 30 Aug 2009) New Revision: 3617 Added: ri/trunk/api/src/main/java/javax/enterprise/context/NormalScope.java ri/trunk/api/src/main/java/javax/enterprise/inject/Alternative.java ri/trunk/api/src/main/java/javax/enterprise/inject/Nonbinding.java ri/trunk/api/src/main/java/javax/interceptor/InterceptorBinding.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DefaultLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeLiteral.java Removed: ri/trunk/api/src/main/java/javax/enterprise/context/ScopeType.java ri/trunk/api/src/main/java/javax/enterprise/inject/BindingType.java ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java ri/trunk/api/src/main/java/javax/enterprise/inject/Initializer.java ri/trunk/api/src/main/java/javax/enterprise/inject/Named.java ri/trunk/api/src/main/java/javax/enterprise/inject/NonBinding.java ri/trunk/api/src/main/java/javax/enterprise/inject/Policy.java ri/trunk/api/src/main/java/javax/interceptor/InterceptorBindingType.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeTypeLiteral.java Modified: ri/trunk/api/pom.xml ri/trunk/api/src/main/java/javax/enterprise/context/ApplicationScoped.java ri/trunk/api/src/main/java/javax/enterprise/context/ConversationScoped.java ri/trunk/api/src/main/java/javax/enterprise/context/Dependent.java ri/trunk/api/src/main/java/javax/enterprise/context/RequestScoped.java ri/trunk/api/src/main/java/javax/enterprise/context/SessionScoped.java ri/trunk/api/src/main/java/javax/enterprise/context/spi/Context.java ri/trunk/api/src/main/java/javax/enterprise/inject/Any.java ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java ri/trunk/api/src/main/java/javax/enterprise/inject/New.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Bean.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Decorator.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java ri/trunk/api/src/main/java/javax/enterprise/inject/stereotype/Model.java ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractReceiverBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingDecorator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractBuiltInBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/ExtensionBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/AbstractFacadeBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/EventBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/FacadeBeanResolvableTransformer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/InstanceBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/InstanceImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeforeBeanDiscoveryImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/AbstractConversationManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/el/ELCreationalContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverMethodImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBAnnotated.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotated.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBAnnotated.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/BindingTypeLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InterceptorBindingTypeLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/AnnotationModel.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/BindingTypeModel.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/ScopeModel.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/NewResolvableTransformer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/Resolvable.java ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ResolvableFactory.java ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeBeanResolver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeDecoratorResolver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeDisposerResolver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeObserverResolver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeResolver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/BeansXmlParser.java ri/trunk/jboss-as/build.xml ri/trunk/spi/pom.xml ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Game.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/MockSentenceTranslator.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Random.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Dummy.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Field.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SameBeanTypeInChildActivityTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SpecialBindingType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dummy.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dusk.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/ELCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/EventCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Field.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Horse.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InactiveScopeTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InjectedManagerCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InstanceCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/JndiManagerCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScope.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScopeTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/AnnotatedTypeDecoratorTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotated.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedCallable.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Foo.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Hound.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Synchronous.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Salmon.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Sole.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Whitefish.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Hound.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/StringHolder.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Beer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/BeerProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Hound.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Salmon.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Sole.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Whitefish.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Random.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Mainz.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Marburg.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Updated.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Large.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named/Important.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named/NamedBeanWithBinding.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/WrappedSimpleBean.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/IntegerCollectionInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListStringInstance.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedListInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/Target.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/FooProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/Important.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducerWithBinding.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/Foo.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupFoo.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/Special.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bar.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLooping.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Farm.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Fish.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Foo.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLooping.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Water.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntFactory.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/SomeBean.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/External.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/Random.java ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/examples/beans.xml ri/trunk/version-matrix/pom.xml Log: initial work on switch to 330 annotations Modified: ri/trunk/api/pom.xml =================================================================== --- ri/trunk/api/pom.xml 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/pom.xml 2009-08-30 19:44:25 UTC (rev 3617) @@ -19,9 +19,16 @@ <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </dependency> + <dependency> <groupId>javax.ejb</groupId> <artifactId>ejb-api</artifactId> + <optional>true</optional> </dependency> + + <dependency> + <groupId>javax.inject</groupId> + <artifactId>inject-api</artifactId> + </dependency> </dependencies> </project> Modified: ri/trunk/api/src/main/java/javax/enterprise/context/ApplicationScoped.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/ApplicationScoped.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/context/ApplicationScoped.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -38,7 +38,7 @@ @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @Documented -@ScopeType +@NormalScope @Inherited public @interface ApplicationScoped { Modified: ri/trunk/api/src/main/java/javax/enterprise/context/ConversationScoped.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/ConversationScoped.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/context/ConversationScoped.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -36,7 +36,7 @@ @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @Documented -@ScopeType(passivating = true) +@NormalScope(passivating = true) public @interface ConversationScoped { } Modified: ri/trunk/api/src/main/java/javax/enterprise/context/Dependent.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/Dependent.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/context/Dependent.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -27,6 +27,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import javax.inject.Scope; + /** * Specifies that a bean is dependent scoped. * @@ -37,7 +39,7 @@ @Target( { METHOD, TYPE, FIELD }) @Retention(RUNTIME) @Documented -@ScopeType(normal = false) +@Scope @Inherited public @interface Dependent { Copied: ri/trunk/api/src/main/java/javax/enterprise/context/NormalScope.java (from rev 3615, ri/trunk/api/src/main/java/javax/enterprise/context/ScopeType.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/NormalScope.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/NormalScope.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.context; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that an annotation type is a scope type. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target(ANNOTATION_TYPE) +@Retention(RUNTIME) +@Documented +public @interface NormalScope +{ + + /** + * @return true if this is a passivating scope (beans with this scope + * type must be serializable) + */ + boolean passivating() default false; + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/NormalScope.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/api/src/main/java/javax/enterprise/context/RequestScoped.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/RequestScoped.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/context/RequestScoped.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -37,7 +37,7 @@ @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @Documented -@ScopeType +@NormalScope @Inherited public @interface RequestScoped { Deleted: ri/trunk/api/src/main/java/javax/enterprise/context/ScopeType.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/ScopeType.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/context/ScopeType.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -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.enterprise.context; - -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that an annotation type is a scope type. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target(ANNOTATION_TYPE) -@Retention(RUNTIME) -@Documented -public @interface ScopeType -{ - - /** - * @return true if this is a normal scope - */ - boolean normal() default true; - - /** - * @return true if this is a passivating scope (beans with this scope - * type must be serializable) - */ - boolean passivating() default false; - -} Modified: ri/trunk/api/src/main/java/javax/enterprise/context/SessionScoped.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/SessionScoped.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/context/SessionScoped.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -37,7 +37,7 @@ @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @Documented -@ScopeType(passivating = true) +@NormalScope(passivating = true) @Inherited public @interface SessionScoped { Modified: ri/trunk/api/src/main/java/javax/enterprise/context/spi/Context.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/spi/Context.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/context/spi/Context.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -37,7 +37,7 @@ * * @return the scope */ - public Class<? extends Annotation> getScopeType(); + public Class<? extends Annotation> getScope(); /** * Return an existing instance of a contextual type or create a new instance Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Alternative.java (from rev 3567, ri/trunk/api/src/main/java/javax/enterprise/inject/Policy.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Alternative.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Alternative.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -0,0 +1,41 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package javax.enterprise.inject; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.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 annotation type is a deployment type. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target({TYPE, METHOD, FIELD}) +@Retention(RUNTIME) +@Documented +public @interface Alternative +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/Alternative.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/Any.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Any.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Any.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -27,6 +27,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import javax.inject.Qualifier; + /** * A built-in binding type that is implicitly applied to all beans which do not * have the {@link New} built-in binding type. @@ -35,7 +37,7 @@ * @author David Allen */ -@BindingType +@Qualifier @Retention(RUNTIME) @Target( { TYPE, METHOD, FIELD, PARAMETER }) @Documented Deleted: ri/trunk/api/src/main/java/javax/enterprise/inject/BindingType.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/BindingType.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/BindingType.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -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.enterprise.inject; - -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * - * Specifies that an annotation type is a binding type. - * - * @author Pete Muir - * @author Gavin King - */ - -@Target(ANNOTATION_TYPE) -@Retention(RUNTIME) -@Documented -public @interface BindingType -{ -} Deleted: ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -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.enterprise.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; - -/** - * The default binding type. - * - * @author Pete Muir - */ - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -public @interface Current -{ -} Deleted: ri/trunk/api/src/main/java/javax/enterprise/inject/Initializer.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Initializer.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Initializer.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -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.enterprise.inject; - -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that a method of a bean is a bean initializer method, or that a - * constructor is the bean constructor. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { METHOD, CONSTRUCTOR }) -@Retention(RUNTIME) -@Documented -public @interface Initializer -{ -} Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -19,7 +19,9 @@ import java.lang.annotation.Annotation; +import javax.inject.Provider; + /** * An interface for looking up beans of a particular type. * @@ -29,7 +31,7 @@ * the type of the event object */ -public interface Instance<T> extends Iterable<T> +public interface Instance<T> extends Iterable<T>, Provider<T> { /** * Get an instance of a bean of the specified type. Deleted: ri/trunk/api/src/main/java/javax/enterprise/inject/Named.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Named.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Named.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,57 +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.enterprise.inject; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies the name of a bean. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -public @interface Named -{ - - /** - * If no name is explicitly specified, the default name is used. - * - * For simple beans and session beans the default name is the unqualified - * class name of the bean class, after converting the first character to - * lower case. - * - * For producer methods the default name is the method name, unless the - * method follows the JavaBeans property getter naming convention, in which - * case the default name is the JavaBeans property name. - * - * @return the bean name - */ - public String value() default ""; - -} Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/New.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/New.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/New.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -27,6 +27,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import javax.inject.Qualifier; + /** * The special binding type. * @@ -37,7 +39,7 @@ @Target( { FIELD, PARAMETER, METHOD, TYPE }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier public @interface New { Deleted: ri/trunk/api/src/main/java/javax/enterprise/inject/NonBinding.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/NonBinding.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/NonBinding.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -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.enterprise.inject; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that a member of a binding type or interceptor binding type is to - * be ignored for the purposes of resolution. - * - * @author Gavin King - * - */ -@Retention(RUNTIME) -@Target(METHOD) -public @interface NonBinding -{ -} Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Nonbinding.java (from rev 3567, ri/trunk/api/src/main/java/javax/enterprise/inject/NonBinding.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Nonbinding.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Nonbinding.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that a member of a binding type or interceptor binding type is to + * be ignored for the purposes of resolution. + * + * @author Gavin King + * + */ +@Retention(RUNTIME) +@Target(METHOD) +public @interface Nonbinding +{ +} Deleted: ri/trunk/api/src/main/java/javax/enterprise/inject/Policy.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Policy.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Policy.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -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.enterprise.inject; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that an annotation type is a deployment type. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target({TYPE, METHOD, FIELD}) -@Retention(RUNTIME) -@Documented -public @interface Policy -{ -} Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Bean.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Bean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Bean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -38,14 +38,14 @@ * * @return the bindings */ - public Set<Annotation> getBindings(); + public Set<Annotation> getQualifiers(); /** * The scope of a bean * * @return the scope */ - public Class<? extends Annotation> getScopeType(); + public Class<? extends Annotation> getScope(); /** * The name of a bean @@ -74,7 +74,7 @@ * * @return true if the bean is a policy */ - public boolean isPolicy(); + public boolean isAlternative(); /** * The nullability of a bean Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -24,7 +24,6 @@ import javax.el.ELResolver; import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.ScopeType; import javax.enterprise.context.spi.Context; import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; @@ -209,12 +208,16 @@ /** * Determine if the given annotationType is a scope type */ - public boolean isScopeType(Class<? extends Annotation> annotationType); + public boolean isScope(Class<? extends Annotation> annotationType); + + public boolean isNormalScope(Class<? extends Annotation> annotationType); + + public boolean isPassivatingScope(Class<? extends Annotation> annotationType); /** * Determine if the given annotationType is a binding type */ - public boolean isBindingType(Class<? extends Annotation> annotationType); + public boolean isQualifier(Class<? extends Annotation> annotationType); /** * Determine if the given annotationType is an interceptor binding type @@ -227,12 +230,6 @@ public boolean isStereotype(Class<? extends Annotation> annotationType); /** - * Return a ScopeType definition type for a given annotation representing a - * scope type - */ - public ScopeType getScopeDefinition(Class<? extends Annotation> scopeType); - - /** * Obtain the set of interceptor binding types meta-annotatinos for the given * binding type annotation */ Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -25,9 +25,9 @@ */ public interface BeforeBeanDiscovery { - public void addBindingType(Class<? extends Annotation> bindingType); + public void addQualifier(Class<? extends Annotation> bindingType); - public void addScopeType(Class<? extends Annotation> scopeType, boolean normal, boolean passivating); + public void addScope(Class<? extends Annotation> scopeType, boolean normal, boolean passivating); public void addStereotype(Class<? extends Annotation> stereotype, Annotation... stereotypeDef); Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Decorator.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Decorator.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Decorator.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -43,7 +43,7 @@ * * @return */ - public Set<Annotation> getDelegateBindings(); + public Set<Annotation> getDelegateQualifiers(); /** * Obtains the decorated types Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -55,7 +55,7 @@ * * @return the declared binding types of the injection point */ - public Set<Annotation> getBindings(); + public Set<Annotation> getQualifiers(); /** * Get the Bean object representing the Web Bean that defines the injection Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -13,7 +13,7 @@ public Type getObservedType(); - public Set<Annotation> getObservedBindings(); + public Set<Annotation> getObservedQualifiers(); public Notify getNotify(); Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/stereotype/Model.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/stereotype/Model.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/stereotype/Model.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -9,7 +9,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Named; +import javax.inject.Named; /** * A stereotype for MVC model objects Copied: ri/trunk/api/src/main/java/javax/interceptor/InterceptorBinding.java (from rev 3567, ri/trunk/api/src/main/java/javax/interceptor/InterceptorBindingType.java) =================================================================== --- ri/trunk/api/src/main/java/javax/interceptor/InterceptorBinding.java (rev 0) +++ ri/trunk/api/src/main/java/javax/interceptor/InterceptorBinding.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -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.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 an interceptor binding. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target(ANNOTATION_TYPE) +@Retention(RUNTIME) +@Documented +public @interface InterceptorBinding {} Property changes on: ri/trunk/api/src/main/java/javax/interceptor/InterceptorBinding.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/api/src/main/java/javax/interceptor/InterceptorBindingType.java =================================================================== --- ri/trunk/api/src/main/java/javax/interceptor/InterceptorBindingType.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/api/src/main/java/javax/interceptor/InterceptorBindingType.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -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.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 an interceptor binding type. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target(ANNOTATION_TYPE) -@Retention(RUNTIME) -@Documented -public @interface InterceptorBindingType {} Modified: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java =================================================================== --- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -26,7 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; /** * The conversation context concurrent access wait timeout on a lock @@ -36,7 +36,7 @@ @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier public @interface ConversationConcurrentAccessTimeout { } Modified: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java =================================================================== --- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -26,7 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; /** * The conversation id request parameter name @@ -36,7 +36,7 @@ @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier public @interface ConversationIdName { } Modified: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java =================================================================== --- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -26,7 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; /** * The conversation context inactivity timeout @@ -36,7 +36,7 @@ @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier public @interface ConversationInactivityTimeout { } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -42,12 +42,10 @@ import javax.el.ELResolver; import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.ScopeType; import javax.enterprise.context.spi.Context; import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.AmbiguousResolutionException; -import javax.enterprise.inject.BindingType; import javax.enterprise.inject.InjectionException; import javax.enterprise.inject.UnproxyableResolutionException; import javax.enterprise.inject.UnsatisfiedResolutionException; @@ -59,6 +57,7 @@ import javax.enterprise.inject.spi.InterceptionType; import javax.enterprise.inject.spi.Interceptor; import javax.enterprise.inject.spi.ObserverMethod; +import javax.inject.Qualifier; import org.jboss.webbeans.bean.DecoratorBean; import org.jboss.webbeans.bean.EnterpriseBean; @@ -74,11 +73,12 @@ import org.jboss.webbeans.el.WebBeansELResolver; import org.jboss.webbeans.introspector.WBAnnotated; import org.jboss.webbeans.literal.AnyLiteral; -import org.jboss.webbeans.literal.CurrentLiteral; +import org.jboss.webbeans.literal.DefaultLiteral; import org.jboss.webbeans.log.Log; import org.jboss.webbeans.log.Logging; import org.jboss.webbeans.manager.api.WebBeansManager; import org.jboss.webbeans.metadata.cache.MetaAnnotationStore; +import org.jboss.webbeans.metadata.cache.ScopeModel; import org.jboss.webbeans.resolution.NameBasedResolver; import org.jboss.webbeans.resolution.ResolvableFactory; import org.jboss.webbeans.resolution.ResolvableWBClass; @@ -565,7 +565,7 @@ HashSet<Annotation> bindingAnnotations = new HashSet<Annotation>(Arrays.asList(bindings)); if (bindingAnnotations.size() == 0) { - bindingAnnotations.add(new CurrentLiteral()); + bindingAnnotations.add(new DefaultLiteral()); } bindingAnnotations.add(new AnyLiteral()); checkEventType(clazz); @@ -703,7 +703,7 @@ // throw new IllegalArgumentException("Cannot resolve a type parameterized with a type parameter " + element); // } // } - if (bindings != null && bindings.length > element.getMetaAnnotations(BindingType.class).size()) + if (bindings != null && bindings.length > element.getMetaAnnotations(Qualifier.class).size()) { throw new IllegalArgumentException("Duplicate bindings (" + Arrays.asList(bindings) + ") type passed " + element.toString()); } @@ -720,7 +720,7 @@ currentInjectionPoint.get().push(injectionPoint); } // TODO Do this properly - Set<Bean<?>> beans = getBeans(ResolvableWBClass.of(injectionPoint.getType(), injectionPoint.getBindings().toArray(new Annotation[0]), this)); + Set<Bean<?>> beans = getBeans(ResolvableWBClass.of(injectionPoint.getType(), injectionPoint.getQualifiers().toArray(new Annotation[0]), this)); Set<Bean<?>> injectableBeans = new HashSet<Bean<?>>(); for (Bean<?> bean : beans) { @@ -798,7 +798,7 @@ public void addContext(Context context) { - contexts.put(context.getScopeType(), context); + contexts.put(context.getScope(), context); } /** @@ -877,9 +877,9 @@ { creationalContext = ((WBCreationalContext<?>) creationalContext).getCreationalContext(bean); } - if (getServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScopeType()).isNormal()) + if (getServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScope()).isNormal()) { - if (creationalContext != null || (creationalContext == null && getContext(bean.getScopeType()).get(bean) != null)) + if (creationalContext != null || (creationalContext == null && getContext(bean.getScope()).get(bean) != null)) { return clientProxyProvider.getClientProxy(this, bean); } @@ -890,7 +890,7 @@ } else { - return getContext(bean.getScopeType()).get((Contextual) bean, creationalContext); + return getContext(bean.getScope()).get((Contextual) bean, creationalContext); } } @@ -922,7 +922,7 @@ { currentInjectionPoint.get().push(injectionPoint); } - if (getServices().get(MetaAnnotationStore.class).getScopeModel(resolvedBean.getScopeType()).isNormal() && !Proxies.isTypeProxyable(injectionPoint.getType())) + if (getServices().get(MetaAnnotationStore.class).getScopeModel(resolvedBean.getScope()).isNormal() && !Proxies.isTypeProxyable(injectionPoint.getType())) { throw new UnproxyableResolutionException("Attempting to inject an unproxyable normal scoped bean " + resolvedBean + " into " + injectionPoint); } @@ -956,7 +956,7 @@ public Object getInjectableReference(InjectionPoint injectionPoint, CreationalContext<?> creationalContext) { - WBAnnotated<?, ?> element = ResolvableWBClass.of(injectionPoint.getType(), injectionPoint.getBindings().toArray(new Annotation[0]), this); + WBAnnotated<?, ?> element = ResolvableWBClass.of(injectionPoint.getType(), injectionPoint.getQualifiers().toArray(new Annotation[0]), this); Bean<?> resolvedBean = getBean(element, element.getBindingsAsArray()); return getReference(injectionPoint, resolvedBean, creationalContext); } @@ -990,7 +990,7 @@ throw new UnsatisfiedResolutionException(element + "Unable to resolve any Web Beans"); } - boolean normalScoped = getServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScopeType()).isNormal(); + boolean normalScoped = getServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScope()).isNormal(); if (normalScoped && !Beans.isBeanProxyable(bean)) { throw new UnproxyableResolutionException("Normal scoped bean " + bean + " is not proxyable"); @@ -1329,18 +1329,6 @@ throw new UnsupportedOperationException("Not yet implemented"); } - public ScopeType getScopeDefinition(Class<? extends Annotation> scopeType) - { - if (isScopeType(scopeType)) - { - return getServices().get(MetaAnnotationStore.class).getScopeModel(scopeType).getMetaAnnnotation(); - } - else - { - throw new IllegalArgumentException("Not a scope type " + scopeType); - } - } - public Set<Annotation> getStereotypeDefinition(Class<? extends Annotation> stereotype) { if (getServices().get(MetaAnnotationStore.class).getStereotype(stereotype).isValid()) @@ -1353,7 +1341,7 @@ } } - public boolean isBindingType(Class<? extends Annotation> annotationType) + public boolean isQualifier(Class<? extends Annotation> annotationType) { return getServices().get(MetaAnnotationStore.class).getBindingTypeModel(annotationType).isValid(); } @@ -1363,8 +1351,20 @@ throw new UnsupportedOperationException("Not yet implemented"); } - public boolean isScopeType(Class<? extends Annotation> annotationType) + public boolean isNormalScope(Class<? extends Annotation> annotationType) { + ScopeModel<?> scope = getServices().get(MetaAnnotationStore.class).getScopeModel(annotationType); + return scope.isValid() && scope.isNormal(); + } + + public boolean isPassivatingScope(Class<? extends Annotation> annotationType) + { + ScopeModel<?> scope = getServices().get(MetaAnnotationStore.class).getScopeModel(annotationType); + return scope.isValid() && scope.isPassivating(); + } + + public boolean isScope(Class<? extends Annotation> annotationType) + { return getServices().get(MetaAnnotationStore.class).getScopeModel(annotationType).isValid(); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -33,7 +33,7 @@ import javax.enterprise.inject.IllegalProductException; import javax.enterprise.inject.Instance; import javax.enterprise.inject.New; -import javax.enterprise.inject.Policy; +import javax.enterprise.inject.Alternative; import javax.enterprise.inject.UnproxyableResolutionException; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.Decorator; @@ -75,7 +75,7 @@ { validateInjectionPoint(ij, beanManager); } - boolean normalScoped = beanManager.getServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScopeType()).isNormal(); + boolean normalScoped = beanManager.getServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScope()).isNormal(); if (normalScoped && !Beans.isBeanProxyable(bean)) { throw new UnproxyableResolutionException("Normal scoped bean " + bean + " is not proxyable"); @@ -137,7 +137,7 @@ */ public void validateInjectionPoint(InjectionPoint ij, BeanManagerImpl beanManager) { - if (ij.getAnnotated().getAnnotation(New.class) != null && ij.getBindings().size() > 1) + if (ij.getAnnotated().getAnnotation(New.class) != null && ij.getQualifiers().size() > 1) { throw new DefinitionException("The injection point " + ij + " is annotated with @New which cannot be combined with other binding types"); } @@ -145,7 +145,7 @@ { throw new DefinitionException("Cannot inject an Injection point into a class which isn't a bean " + ij); } - if (ij.getType().equals(InjectionPoint.class) && !Dependent.class.equals(ij.getBean().getScopeType())) + if (ij.getType().equals(InjectionPoint.class) && !Dependent.class.equals(ij.getBean().getScope())) { throw new DefinitionException("Cannot inject an InjectionPoint into a non @Dependent scoped bean " + ij); } @@ -170,19 +170,19 @@ } checkFacadeInjectionPoint(ij, Instance.class); checkFacadeInjectionPoint(ij, Event.class); - Annotation[] bindings = ij.getBindings().toArray(new Annotation[0]); + Annotation[] bindings = ij.getQualifiers().toArray(new Annotation[0]); WBAnnotated<?, ?> annotatedItem = ResolvableWBClass.of(ij.getType(), bindings, beanManager); Set<?> resolvedBeans = beanManager.getBeanResolver().resolve(beanManager.getInjectableBeans(ij)); if (resolvedBeans.isEmpty()) { - throw new DeploymentException("The injection point " + ij + " with binding types " + Names.annotationsToString(ij.getBindings()) + " in " + ij.getBean() + " has unsatisfied dependencies with binding types "); + throw new DeploymentException("The injection point " + ij + " with binding types " + Names.annotationsToString(ij.getQualifiers()) + " in " + ij.getBean() + " has unsatisfied dependencies with binding types "); } if (resolvedBeans.size() > 1) { - throw new DeploymentException("The injection point " + ij + " with binding types " + Names.annotationsToString(ij.getBindings()) + " in " + ij.getBean() + " has ambiguous dependencies " + resolvedBeans); + throw new DeploymentException("The injection point " + ij + " with binding types " + Names.annotationsToString(ij.getQualifiers()) + " in " + ij.getBean() + " has ambiguous dependencies " + resolvedBeans); } Bean<?> resolvedBean = (Bean<?>) resolvedBeans.iterator().next(); - if (beanManager.getServices().get(MetaAnnotationStore.class).getScopeModel(resolvedBean.getScopeType()).isNormal() && !Proxies.isTypeProxyable(ij.getType())) + if (beanManager.getServices().get(MetaAnnotationStore.class).getScopeModel(resolvedBean.getScope()).isNormal() && !Proxies.isTypeProxyable(ij.getType())) { throw new UnproxyableResolutionException("The injection point " + ij + " has non-proxyable dependencies"); } @@ -200,7 +200,7 @@ { if (!ij.isTransient() && !Beans.isPassivationCapableBean(resolvedBean)) { - if (resolvedBean.getScopeType().equals(Dependent.class) && resolvedBean instanceof AbstractProducerBean<?,?>) + if (resolvedBean.getScope().equals(Dependent.class) && resolvedBean instanceof AbstractProducerBean<?,?>) { throw new IllegalProductException("The bean " + ij.getBean() + " declares a passivating scope but the producer returned a non-serializable bean for injection: " + resolvedBean); } @@ -298,7 +298,7 @@ List<Class<?>> seenPolicies = new ArrayList<Class<?>>(); for (Class<? extends Annotation> stereotype : beanManager.getEnabledPolicyStereotypes()) { - if (!stereotype.isAnnotationPresent(Policy.class)) + if (!stereotype.isAnnotationPresent(Alternative.class)) { throw new DeploymentException("Enabled policy sterotype " + stereotype + " is not annotated @Policy"); } @@ -310,7 +310,7 @@ } for (Class<?> clazz : beanManager.getEnabledPolicyClasses()) { - if (!clazz.isAnnotationPresent(Policy.class)) + if (!clazz.isAnnotationPresent(Alternative.class)) { throw new DeploymentException("Enabled policy bean class " + clazz + " is not annotated @Policy"); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -23,12 +23,12 @@ import javax.decorator.Decorates; import javax.enterprise.context.Dependent; -import javax.enterprise.inject.BindingType; -import javax.enterprise.inject.Named; -import javax.enterprise.inject.Policy; +import javax.enterprise.inject.Alternative; import javax.enterprise.inject.Specializes; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.stereotype.Stereotype; +import javax.inject.Named; +import javax.inject.Qualifier; import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.DefinitionException; @@ -38,7 +38,7 @@ import org.jboss.webbeans.introspector.WBField; import org.jboss.webbeans.introspector.WBParameter; import org.jboss.webbeans.literal.AnyLiteral; -import org.jboss.webbeans.literal.CurrentLiteral; +import org.jboss.webbeans.literal.DefaultLiteral; import org.jboss.webbeans.log.Log; import org.jboss.webbeans.log.Logging; import org.jboss.webbeans.metadata.cache.MergedStereotypes; @@ -57,7 +57,7 @@ { private static final Annotation ANY_LITERAL = new AnyLiteral(); - private static final Annotation CURRENT_LITERAL = new CurrentLiteral(); + private static final Annotation CURRENT_LITERAL = new DefaultLiteral(); private boolean proxyable; @@ -180,7 +180,7 @@ protected void initBindings() { this.bindings = new HashSet<Annotation>(); - this.bindings.addAll(getAnnotatedItem().getMetaAnnotations(BindingType.class)); + this.bindings.addAll(getAnnotatedItem().getMetaAnnotations(Qualifier.class)); initDefaultBindings(); log.trace("Using binding types " + bindings + " specified by annotations"); } @@ -197,7 +197,7 @@ protected void initPolicy() { - if (getAnnotatedItem().isAnnotationPresent(Policy.class)) + if (getAnnotatedItem().isAnnotationPresent(Alternative.class)) { this.policy = true; } @@ -252,14 +252,14 @@ private boolean checkInjectionPointsAreSerializable() { - boolean passivating = manager.getServices().get(MetaAnnotationStore.class).getScopeModel(this.getScopeType()).isPassivating(); + boolean passivating = manager.getServices().get(MetaAnnotationStore.class).getScopeModel(this.getScope()).isPassivating(); for (WBInjectionPoint<?, ?> injectionPoint : getAnnotatedInjectionPoints()) { - Annotation[] bindings = injectionPoint.getMetaAnnotationsAsArray(BindingType.class); + Annotation[] bindings = injectionPoint.getMetaAnnotationsAsArray(Qualifier.class); Bean<?> resolvedBean = manager.getBeans(injectionPoint.getJavaClass(), bindings).iterator().next(); if (passivating) { - if (Dependent.class.equals(resolvedBean.getScopeType()) && !Reflections.isSerializable(resolvedBean.getBeanClass()) && (((injectionPoint instanceof WBField<?, ?>) && !((WBField<?, ?>) injectionPoint).isTransient()) || (injectionPoint instanceof WBParameter<?, ?>))) + if (Dependent.class.equals(resolvedBean.getScope()) && !Reflections.isSerializable(resolvedBean.getBeanClass()) && (((injectionPoint instanceof WBField<?, ?>) && !((WBField<?, ?>) injectionPoint).isTransient()) || (injectionPoint instanceof WBParameter<?, ?>))) { return false; } @@ -299,7 +299,7 @@ { throw new DefinitionException("Cannot put name on specializing and specialized class " + getAnnotatedItem()); } - this.bindings.addAll(getSpecializedBean().getBindings()); + this.bindings.addAll(getSpecializedBean().getQualifiers()); if (isSpecializing() && getSpecializedBean().getAnnotatedItem().isAnnotationPresent(Named.class)) { this.name = getSpecializedBean().getName(); @@ -329,9 +329,9 @@ * * @return The set of binding types * - * @see org.jboss.webbeans.bean.BaseBean#getBindings() + * @see org.jboss.webbeans.bean.BaseBean#getQualifiers() */ - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return bindings; } @@ -379,9 +379,9 @@ * * @return The scope type * - * @see org.jboss.webbeans.bean.BaseBean#getScopeType() + * @see org.jboss.webbeans.bean.BaseBean#getScope() */ - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return scopeType; } @@ -476,10 +476,10 @@ @Override public boolean isDependent() { - return Dependent.class.equals(getScopeType()); + return Dependent.class.equals(getScope()); } - public boolean isPolicy() + public boolean isAlternative() { return policy; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -29,11 +29,12 @@ import javassist.util.proxy.ProxyObject; import javax.enterprise.context.Dependent; -import javax.enterprise.context.ScopeType; +import javax.enterprise.context.NormalScope; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Decorator; import javax.enterprise.inject.spi.InjectionPoint; import javax.enterprise.inject.spi.InjectionTarget; +import javax.inject.Scope; import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.DefinitionException; @@ -125,7 +126,7 @@ protected void initDecorators() { - this.decorators = getManager().resolveDecorators(getTypes(), getBindings()); + this.decorators = getManager().resolveDecorators(getTypes(), getQualifiers()); } public boolean hasDecorators() @@ -246,8 +247,9 @@ { for (WBClass<?> clazz = getAnnotatedItem(); clazz != null; clazz = clazz.getWBSuperclass()) { - Set<Annotation> scopeTypes = clazz.getDeclaredMetaAnnotations(ScopeType.class); - scopeTypes = clazz.getDeclaredMetaAnnotations(ScopeType.class); + Set<Annotation> scopeTypes = new HashSet<Annotation>(); + scopeTypes.addAll(clazz.getDeclaredMetaAnnotations(Scope.class)); + scopeTypes.addAll(clazz.getDeclaredMetaAnnotations(NormalScope.class)); if (scopeTypes.size() == 1) { if (getAnnotatedItem().isAnnotationPresent(scopeTypes.iterator().next().annotationType())) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -29,13 +29,14 @@ import java.util.Set; import javax.enterprise.context.Dependent; -import javax.enterprise.context.ScopeType; +import javax.enterprise.context.NormalScope; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.IllegalProductException; -import javax.enterprise.inject.Initializer; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.InjectionPoint; import javax.enterprise.inject.spi.Producer; +import javax.inject.Inject; +import javax.inject.Scope; import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.DefinitionException; @@ -188,7 +189,7 @@ } else if (instance != null) { - boolean passivating = manager.getServices().get(MetaAnnotationStore.class).getScopeModel(getScopeType()).isPassivating(); + boolean passivating = manager.getServices().get(MetaAnnotationStore.class).getScopeModel(getScope()).isPassivating(); if (passivating && !Reflections.isSerializable(instance.getClass())) { throw new IllegalProductException("Producers cannot declare passivating scope and return a non-serializable class"); @@ -210,7 +211,7 @@ else if (injectionPoint.getMember() instanceof Method) { Method method = (Method) injectionPoint.getMember(); - if (method.isAnnotationPresent(Initializer.class)) + if (method.isAnnotationPresent(Inject.class)) { throw new IllegalProductException("Producers cannot produce non-serializable instances for injection into parameters of intializers of beans declaring passivating scope. Bean " + toString() + " being injected into " + injectionPoint.toString()); } @@ -230,7 +231,9 @@ @Override protected void initScopeType() { - Set<Annotation> scopeAnnotations = getAnnotatedItem().getMetaAnnotations(ScopeType.class); + Set<Annotation> scopeAnnotations = new HashSet<Annotation>(); + scopeAnnotations.addAll(getAnnotatedItem().getMetaAnnotations(Scope.class)); + scopeAnnotations.addAll(getAnnotatedItem().getMetaAnnotations(NormalScope.class)); if (scopeAnnotations.size() > 1) { throw new DefinitionException("At most one scope may be specified"); @@ -294,7 +297,7 @@ public String toString() { StringBuilder buffer = new StringBuilder(); - buffer.append("Annotated " + Names.scopeTypeToString(getScopeType())); + buffer.append("Annotated " + Names.scopeTypeToString(getScope())); if (getName() == null) { buffer.append("unnamed producer bean"); @@ -303,7 +306,7 @@ { buffer.append("simple producer bean '" + getName() + "'"); } - buffer.append(" [" + getBeanClass().getName() + "] for class type [" + getType().getName() + "] API types " + getTypes() + ", binding types " + getBindings()); + buffer.append(" [" + getBeanClass().getName() + "] for class type [" + getType().getName() + "] API types " + getTypes() + ", binding types " + getQualifiers()); return buffer.toString(); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractReceiverBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractReceiverBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractReceiverBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -19,7 +19,7 @@ import java.lang.reflect.Member; import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.Policy; +import javax.enterprise.inject.Alternative; import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; @@ -95,7 +95,7 @@ * @see org.jboss.webbeans.bean.AbstractBean#isPolicy() */ @Override - public boolean isPolicy() + public boolean isAlternative() { return policy; } @@ -103,11 +103,11 @@ @Override protected void initPolicy() { - if (getDeclaringBean().isPolicy()) + if (getDeclaringBean().isAlternative()) { this.policy = true; } - else if (getAnnotatedItem().isAnnotationPresent(Policy.class)) + else if (getAnnotatedItem().isAnnotationPresent(Alternative.class)) { this.policy = true; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -24,8 +24,8 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.inject.Initializer; import javax.enterprise.inject.spi.Decorator; +import javax.inject.Inject; import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.DefinitionException; @@ -43,9 +43,9 @@ { @Override - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { - return delegate().getDelegateBindings(); + return delegate().getDelegateQualifiers(); } @Override @@ -118,7 +118,7 @@ { for (WBInjectionPoint<?, ?> injectionPoint : getDelegateInjectionPoints()) { - if (injectionPoint instanceof MethodInjectionPoint<?, ?> && !injectionPoint.isAnnotationPresent(Initializer.class)) + if (injectionPoint instanceof MethodInjectionPoint<?, ?> && !injectionPoint.isAnnotationPresent(Inject.class)) { throw new DefinitionException("Method with @Decorates parameter must be an initializer method " + injectionPoint); } @@ -136,7 +136,7 @@ protected void initDelegateBindings() { this.delegateBindings = new HashSet<Annotation>(); - this.delegateBindings.addAll(this.delegateInjectionPoint.getBindings()); + this.delegateBindings.addAll(this.delegateInjectionPoint.getQualifiers()); } protected void initDelegateType() @@ -179,7 +179,7 @@ } } - public Set<Annotation> getDelegateBindings() + public Set<Annotation> getDelegateQualifiers() { return delegateBindings; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -26,8 +26,8 @@ import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.event.Observes; import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Initializer; import javax.enterprise.inject.Produces; +import javax.inject.Inject; import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.DefinitionException; @@ -83,7 +83,7 @@ { // At least 1 parameter exists, already checked in constructor this.bindings = new HashSet<Annotation>(); - this.bindings.addAll(disposalMethodInjectionPoint.getWBParameters().get(0).getBindings()); + this.bindings.addAll(disposalMethodInjectionPoint.getWBParameters().get(0).getQualifiers()); initDefaultBindings(); } @@ -107,7 +107,7 @@ } @Override - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return null; } @@ -179,7 +179,7 @@ { throw new DefinitionException("@Observes is not allowed on disposal method, see " + disposalMethodInjectionPoint.toString()); } - if (disposalMethodInjectionPoint.getAnnotation(Initializer.class) != null) + if (disposalMethodInjectionPoint.getAnnotation(Inject.class) != null) { throw new DefinitionException("@Intitializer is not allowed on a disposal method, see " + disposalMethodInjectionPoint.toString()); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -168,11 +168,11 @@ { if (ejbDescriptor.isStateless() && !isDependent()) { - throw new DefinitionException("Scope " + getScopeType() + " is not allowed on stateless enterpise beans for " + getType() + ". Only @Dependent is allowed on stateless enterprise beans"); + throw new DefinitionException("Scope " + getScope() + " is not allowed on stateless enterpise beans for " + getType() + ". Only @Dependent is allowed on stateless enterprise beans"); } - if (ejbDescriptor.isSingleton() && !(isDependent() || getScopeType().equals(ApplicationScoped.class))) + if (ejbDescriptor.isSingleton() && !(isDependent() || getScope().equals(ApplicationScoped.class))) { - throw new DefinitionException("Scope " + getScopeType() + " is not allowed on singleton enterpise beans for " + getType() + ". Only @Dependent or @ApplicationScoped is allowed on singleton enterprise beans"); + throw new DefinitionException("Scope " + getScope() + " is not allowed on singleton enterpise beans for " + getType() + ". Only @Dependent or @ApplicationScoped is allowed on singleton enterprise beans"); } } @@ -308,7 +308,7 @@ buffer.append(" enterprise bean '" + getName() + "'"); } buffer.append(" [" + getType().getName() + "] "); - buffer.append("API types " + getTypes() + ", binding types " + getBindings()); + buffer.append("API types " + getTypes() + ", binding types " + getQualifiers()); return buffer.toString(); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -82,9 +82,9 @@ * * @return The binding types */ - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { - return delegate().getBindings(); + return delegate().getQualifiers(); } public Set<InjectionPoint> getInjectionPoints() @@ -117,9 +117,9 @@ * * @return The scope type */ - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { - return delegate().getScopeType(); + return delegate().getScope(); } /** @@ -153,9 +153,9 @@ return delegate().isNullable(); } - public boolean isPolicy() + public boolean isAlternative() { - return delegate().isPolicy(); + return delegate().isAlternative(); } /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingDecorator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingDecorator.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingDecorator.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -33,9 +33,9 @@ return delegate().getDecoratedTypes(); } - public Set<Annotation> getDelegateBindings() + public Set<Annotation> getDelegateQualifiers() { - return delegate().getDelegateBindings(); + return delegate().getDelegateQualifiers(); } public Type getDelegateType() Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -78,13 +78,13 @@ * @return @Dependent */ @Override - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dependent.class; } @Override - public boolean isPolicy() + public boolean isAlternative() { return false; } @@ -106,7 +106,7 @@ * @returns @New */ @Override - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return bindings; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -75,13 +75,13 @@ * @return @Dependent */ @Override - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dependent.class; } @Override - public boolean isPolicy() + public boolean isAlternative() { return false; } @@ -103,7 +103,7 @@ * @returns @New */ @Override - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return bindings; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -129,7 +129,7 @@ public String toString() { StringBuilder buffer = new StringBuilder(); - buffer.append("Annotated " + Names.scopeTypeToString(getScopeType())); + buffer.append("Annotated " + Names.scopeTypeToString(getScope())); if (getName() == null) { buffer.append("unnamed producer field bean"); @@ -138,7 +138,7 @@ { buffer.append("simple producer field bean '" + getName() + "'"); } - buffer.append(" [" + getBeanClass().getName() + "] for class type [" + getType().getName() + "] API types " + getTypes() + ", binding types " + getBindings()); + buffer.append(" [" + getBeanClass().getName() + "] for class type [" + getType().getName() + "] API types " + getTypes() + ", binding types " + getQualifiers()); return buffer.toString(); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -163,7 +163,7 @@ */ protected void initDisposalMethod(BeanDeployerEnvironment environment) { - Set<DisposalMethodBean<?>> disposalBeans = environment.resolveDisposalBeans(getTypes(), getBindings(), getDeclaringBean()); + Set<DisposalMethodBean<?>> disposalBeans = environment.resolveDisposalBeans(getTypes(), getQualifiers(), getDeclaringBean()); if (disposalBeans.size() == 1) { @@ -240,7 +240,7 @@ public String toString() { StringBuilder buffer = new StringBuilder(); - buffer.append(Names.scopeTypeToString(getScopeType())); + buffer.append(Names.scopeTypeToString(getScope())); if (getName() == null) { buffer.append("unnamed producer method bean"); @@ -249,7 +249,7 @@ { buffer.append("simple producer method bean '" + getName() + "'"); } - buffer.append(" [" + getBeanClass().getName() + "] for class type [" + getType().getName() + "] API types " + getTypes() + ", binding types " + getBindings()); + buffer.append(" [" + getBeanClass().getName() + "] for class type [" + getType().getName() + "] API types " + getTypes() + ", binding types " + getQualifiers()); return buffer.toString(); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -72,7 +72,7 @@ public boolean isDependent() { - return getScopeType().equals(Dependent.class); + return getScope().equals(Dependent.class); } public abstract boolean isProxyable(); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -332,7 +332,7 @@ protected String toString(String beanType) { StringBuilder buffer = new StringBuilder(); - buffer.append(Names.scopeTypeToString(getScopeType())); + buffer.append(Names.scopeTypeToString(getScope())); if (getName() == null) { buffer.append("unnamed ").append(beanType); @@ -342,7 +342,7 @@ buffer.append(beanType).append(" '" + getName() + "'"); } buffer.append(" ").append(getType().getName()).append(", "); - buffer.append(" API types = ").append(Names.typesToString(getTypes())).append(", binding types = " + Names.annotationsToString(getBindings())); + buffer.append(" API types = ").append(Names.typesToString(getTypes())).append(", binding types = " + Names.annotationsToString(getQualifiers())); return buffer.toString(); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractBuiltInBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractBuiltInBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractBuiltInBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -29,12 +29,12 @@ import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; import org.jboss.webbeans.injection.WBInjectionPoint; import org.jboss.webbeans.literal.AnyLiteral; -import org.jboss.webbeans.literal.CurrentLiteral; +import org.jboss.webbeans.literal.DefaultLiteral; public abstract class AbstractBuiltInBean<T> extends RIBean<T> { - private static final Annotation[] DEFAULT_BINDING_ARRAY = { new CurrentLiteral(), new AnyLiteral() }; + private static final Annotation[] DEFAULT_BINDING_ARRAY = { new DefaultLiteral(), new AnyLiteral() }; private static final Set<Annotation> DEFAULT_BINDING = new HashSet<Annotation>(Arrays.asList(DEFAULT_BINDING_ARRAY)); private final String id; @@ -52,12 +52,12 @@ } - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return DEFAULT_BINDING; } - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dependent.class; } @@ -101,7 +101,7 @@ return false; } - public boolean isPolicy() + public boolean isAlternative() { return false; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/ExtensionBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/ExtensionBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/ExtensionBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -72,7 +72,7 @@ } @Override - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return ApplicationScoped.class; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/AbstractFacadeBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/AbstractFacadeBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/AbstractFacadeBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -48,7 +48,7 @@ if (genericType instanceof ParameterizedType ) { Type type = ((ParameterizedType) genericType).getActualTypeArguments()[0]; - return newInstance(type, injectionPoint.getBindings()); + return newInstance(type, injectionPoint.getQualifiers()); } else { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/EventBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/EventBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/EventBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -63,7 +63,7 @@ } @Override - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return DEFAULT_BINDINGS; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/FacadeBeanResolvableTransformer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/FacadeBeanResolvableTransformer.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/FacadeBeanResolvableTransformer.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -70,7 +70,7 @@ } @Override - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return Collections.unmodifiableSet(bindings); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/InstanceBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/InstanceBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/InstanceBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -63,7 +63,7 @@ } @Override - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return DEFAULT_BINDINGS; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/InstanceImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/InstanceImpl.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/InstanceImpl.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -68,6 +68,11 @@ T instance = (T) getManager().getReference(bean, getType(), getManager().createCreationalContext(bean)); return instance; } + + public T get() + { + return get(EMPTY_BINDINGS); + } /** * Gets a string representation Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -134,7 +134,7 @@ } try { - Context context = manager.getContext(bean.getScopeType()); + Context context = manager.getContext(bean.getScope()); return context.get(bean, creationalContext); } finally Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -22,11 +22,11 @@ import javax.enterprise.event.Observes; import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Initializer; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.AnnotatedMethod; import javax.enterprise.inject.spi.ObserverMethod; import javax.enterprise.inject.spi.ProcessObserverMethod; +import javax.inject.Inject; import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.bean.AbstractClassBean; @@ -230,7 +230,7 @@ private static boolean hasSimpleWebBeanConstructor(WBClass<?> type) { - return type.getNoArgsWBConstructor() != null || type.getAnnotatedWBConstructors(Initializer.class).size() > 0; + return type.getNoArgsWBConstructor() != null || type.getAnnotatedWBConstructors(Inject.class).size() > 0; } public BeanDeployerEnvironment getEnvironment() Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeforeBeanDiscoveryImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeforeBeanDiscoveryImpl.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeforeBeanDiscoveryImpl.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -27,7 +27,8 @@ import org.jboss.webbeans.bootstrap.spi.Deployment; import org.jboss.webbeans.literal.BindingTypeLiteral; import org.jboss.webbeans.literal.InterceptorBindingTypeLiteral; -import org.jboss.webbeans.literal.ScopeTypeLiteral; +import org.jboss.webbeans.literal.NormalScopeLiteral; +import org.jboss.webbeans.literal.ScopeLiteral; public class BeforeBeanDiscoveryImpl extends AbstractBeanDiscoveryEvent implements BeforeBeanDiscovery { @@ -37,7 +38,7 @@ super(beanDeployments, deploymentManager, deployment); } - public void addBindingType(Class<? extends Annotation> bindingType) + public void addQualifier(Class<? extends Annotation> bindingType) { getTypeStore().add(bindingType, new BindingTypeLiteral()); } @@ -47,10 +48,17 @@ getTypeStore().add(bindingType, new InterceptorBindingTypeLiteral()); } - public void addScopeType(Class<? extends Annotation> scopeType, + public void addScope(Class<? extends Annotation> scopeType, boolean normal, boolean passivating) { - getTypeStore().add(scopeType, new ScopeTypeLiteral(normal, passivating)); + if (normal) + { + getTypeStore().add(scopeType, new NormalScopeLiteral(passivating)); + } + else + { + getTypeStore().add(scopeType, new ScopeLiteral()); + } } public void addStereotype(Class<? extends Annotation> stereotype, Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -57,9 +57,9 @@ * * @return The scope type * - * @see javax.enterprise.context.spi.Context#getScopeType() + * @see javax.enterprise.context.spi.Context#getScope() */ - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return scopeType; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/AbstractConversationManager.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/AbstractConversationManager.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/AbstractConversationManager.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -30,7 +30,8 @@ import java.util.concurrent.Future; import javax.enterprise.context.Conversation; -import javax.enterprise.inject.Current; +import javax.enterprise.inject.Any; +import javax.inject.Inject; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.context.ConversationContext; @@ -49,11 +50,11 @@ private static LogProvider log = Logging.getLogProvider(AbstractConversationManager.class); // The conversation terminator - @Current + @Inject private ConversationTerminator conversationTerminator; // The current conversation - @Current + @Inject @Any private ConversationImpl currentConversation; // The conversation timeout in milliseconds waiting for access to a blocked Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -20,8 +20,9 @@ import javax.enterprise.context.Conversation; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Initializer; -import javax.enterprise.inject.Named; +import javax.enterprise.inject.Default; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; @@ -34,6 +35,7 @@ */ @RequestScoped @Named("javax.enterprise.context.conversation") +@Default public class ConversationImpl implements Conversation, Serializable { @@ -78,7 +80,7 @@ * @param conversationIdGenerator The conversation ID generator * @param timeout The conversation inactivity timeout */ - @Initializer + @Inject public void init(ConversationIdGenerator conversationIdGenerator, @ConversationInactivityTimeout long timeout) { this.id = conversationIdGenerator.nextId(); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -25,9 +25,9 @@ import java.io.Serializable; import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Current; import javax.enterprise.inject.Instance; import javax.enterprise.inject.Produces; +import javax.inject.Inject; import javax.servlet.http.HttpSession; import org.jboss.webbeans.context.api.BeanStore; @@ -52,7 +52,7 @@ private static final long CONVERSATION_CONCURRENT_ACCESS_TIMEOUT_IN_MS = 1 * 1000; private static final String CONVERSATION_ID_NAME = "cid"; - @Current Instance<HttpSession> httpSession; + @Inject Instance<HttpSession> httpSession; @Override public BeanStore getBeanStore(String cid) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/el/ELCreationalContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/el/ELCreationalContext.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/el/ELCreationalContext.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -36,7 +36,7 @@ public Object putIfAbsent(Bean<?> bean, Callable<Object> value) throws Exception { - if (bean.getScopeType().equals(Dependent.class)) + if (bean.getScope().equals(Dependent.class)) { if (dependentInstances.containsKey(bean.getName())) { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverMethodImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverMethodImpl.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverMethodImpl.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -31,10 +31,10 @@ import javax.enterprise.event.Observes; import javax.enterprise.event.TransactionPhase; import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Initializer; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.ObserverMethod; +import javax.inject.Inject; import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.DefinitionException; @@ -94,7 +94,7 @@ { // Make sure exactly one and only one parameter is annotated with Observes List<WBParameter<?, ?>> eventObjects = this.observerMethod.getAnnotatedParameters(Observes.class); - if (this.notifyType.equals(Notify.IF_EXISTS) && declaringBean.getScopeType().equals(Dependent.class)) + if (this.notifyType.equals(Notify.IF_EXISTS) && declaringBean.getScope().equals(Dependent.class)) { throw new DefinitionException(this + " is invalid because it is a conditional observer method, and is declared by a @Dependent scoped bean"); } @@ -134,7 +134,7 @@ { throw new DefinitionException(this + " cannot be annotated with @Produces"); } - if (this.observerMethod.isAnnotationPresent(Initializer.class)) + if (this.observerMethod.isAnnotationPresent(Inject.class)) { throw new DefinitionException(this + " cannot be annotated with @Initializer"); } @@ -162,7 +162,7 @@ return notifyType; } - public Set<Annotation> getObservedBindings() + public Set<Annotation> getObservedQualifiers() { return bindings; } @@ -225,7 +225,7 @@ } finally { - if (creationalContext != null && Dependent.class.equals(declaringBean.getScopeType())) + if (creationalContext != null && Dependent.class.equals(declaringBean.getScope())) { creationalContext.release(); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -92,9 +92,9 @@ return declaringBean; } - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { - return delegate().getBindings(); + return delegate().getQualifiers(); } public T newInstance(BeanManagerImpl manager, CreationalContext<?> creationalContext) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -66,9 +66,9 @@ return declaringBean; } - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { - return delegate().getBindings(); + return delegate().getQualifiers(); } public void inject(Object declaringInstance, BeanManagerImpl manager, CreationalContext<?> creationalContext) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -92,9 +92,9 @@ return declaringBean; } - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { - return delegate().getBindings(); + return delegate().getQualifiers(); } public T invoke(Object declaringInstance, BeanManagerImpl manager, CreationalContext<?> creationalContext, Class<? extends RuntimeException> exceptionTypeToThrow) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -63,9 +63,9 @@ return declaringBean; } - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { - return delegate().getBindings(); + return delegate().getQualifiers(); } public Member getJavaMember() Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -28,9 +28,9 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; -import org.jboss.webbeans.literal.CurrentLiteral; +import org.jboss.webbeans.literal.DefaultLiteral; import org.jboss.webbeans.metadata.TypeStore; import com.google.common.base.Supplier; @@ -41,7 +41,7 @@ { // The array of default binding types - private static final Annotation[] DEFAULT_BINDING_ARRAY = { new CurrentLiteral() }; + private static final Annotation[] DEFAULT_BINDING_ARRAY = { new DefaultLiteral() }; // The set of default binding types private static final Set<Annotation> DEFAULT_BINDING = new HashSet<Annotation>(Arrays.asList(DEFAULT_BINDING_ARRAY)); @@ -244,9 +244,9 @@ @Deprecated public Set<Annotation> getBindings() { - if (getMetaAnnotations(BindingType.class).size() > 0) + if (getMetaAnnotations(Qualifier.class).size() > 0) { - return Collections.unmodifiableSet(getMetaAnnotations(BindingType.class)); + return Collections.unmodifiableSet(getMetaAnnotations(Qualifier.class)); } else { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBAnnotated.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBAnnotated.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBAnnotated.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -47,9 +47,9 @@ } @Deprecated - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { - return delegate().getBindings(); + return delegate().getQualifiers(); } @Deprecated Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotated.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotated.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotated.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -22,10 +22,11 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.context.ScopeType; -import javax.enterprise.inject.BindingType; +import javax.enterprise.context.NormalScope; import javax.enterprise.inject.spi.Annotated; import javax.enterprise.inject.stereotype.Stereotype; +import javax.inject.Qualifier; +import javax.inject.Scope; /** * AnnotatedItem provides a uniform access to the annotations on an annotated @@ -39,7 +40,7 @@ // The set of meta-annotations to map @SuppressWarnings("unchecked") - public static final Set<Class<? extends Annotation>> MAPPED_METAANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(BindingType.class, Stereotype.class, ScopeType.class)); + public static final Set<Class<? extends Annotation>> MAPPED_METAANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Qualifier.class, Stereotype.class, Scope.class, NormalScope.class)); /** * Gets all annotations which are annotated with the given meta annotation @@ -52,8 +53,8 @@ public Set<Annotation> getMetaAnnotations(Class<? extends Annotation> metaAnnotationType); /** - * Gets all annotations which are declared on this annotated item - * with the given meta annotation type + * Gets all annotations which are declared on this annotated item with the + * given meta annotation type * * @param The meta annotation to match * @return A set of matching meta-annotations. Returns an empty set if there @@ -76,17 +77,19 @@ * * @returns A set of binding types present on the type. Returns an empty set * if there are no matches. - * @deprecated This reflection type should not know about JSR-299 binding types + * @deprecated This reflection type should not know about JSR-299 binding + * types */ @Deprecated - public Set<Annotation> getBindings(); + public Set<Annotation> getQualifiers(); /** * Gets the binding types for this element * * @returns An array of binding types present on the type. Returns an empty * array if there are no matches. - * @deprecated This reflection type should not know about JSR-299 binding types + * @deprecated This reflection type should not know about JSR-299 binding + * types */ @Deprecated public Annotation[] getBindingsAsArray(); @@ -153,7 +156,8 @@ public boolean isStatic(); /** - * Indicates if this AnnotatedItem represents a final element + * Indicates if this AnnotatedItem represents a final element + * * @return True if final, false otherwise */ public boolean isFinal(); @@ -171,7 +175,7 @@ * @return if public, returns true */ public boolean isPublic(); - + public boolean isPrivate(); /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBAnnotated.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBAnnotated.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBAnnotated.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -219,7 +219,7 @@ } @Deprecated - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return getAnnotationStore().getBindings(); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/BindingTypeLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/BindingTypeLiteral.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/BindingTypeLiteral.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -17,9 +17,9 @@ package org.jboss.webbeans.literal; import javax.enterprise.inject.AnnotationLiteral; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; -public class BindingTypeLiteral extends AnnotationLiteral<BindingType> implements BindingType +public class BindingTypeLiteral extends AnnotationLiteral<Qualifier> implements Qualifier { } \ No newline at end of file Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,27 +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 org.jboss.webbeans.literal; - -import javax.enterprise.inject.AnnotationLiteral; -import javax.enterprise.inject.Current; - -/** - * Annotation literal for @Current - * - * @author Pete Muir - */ -public class CurrentLiteral extends AnnotationLiteral<Current> implements Current {} Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DefaultLiteral.java (from rev 3567, ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DefaultLiteral.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DefaultLiteral.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -0,0 +1,27 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES 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.literal; + +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.Default; + +/** + * Annotation literal for @Current + * + * @author Pete Muir + */ +public class DefaultLiteral extends AnnotationLiteral<Default> implements Default {} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DefaultLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InterceptorBindingTypeLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InterceptorBindingTypeLiteral.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InterceptorBindingTypeLiteral.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -17,9 +17,9 @@ package org.jboss.webbeans.literal; import javax.enterprise.inject.AnnotationLiteral; -import javax.interceptor.InterceptorBindingType; +import javax.interceptor.InterceptorBinding; -public class InterceptorBindingTypeLiteral extends AnnotationLiteral<InterceptorBindingType> implements InterceptorBindingType +public class InterceptorBindingTypeLiteral extends AnnotationLiteral<InterceptorBinding> implements InterceptorBinding { } \ No newline at end of file Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeLiteral.java (from rev 3616, ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeTypeLiteral.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeLiteral.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeLiteral.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -0,0 +1,22 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES 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.literal; + +import javax.enterprise.inject.AnnotationLiteral; +import javax.inject.Scope; + +public class ScopeLiteral extends AnnotationLiteral<Scope> implements Scope {} \ No newline at end of file Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeTypeLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeTypeLiteral.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeTypeLiteral.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -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 org.jboss.webbeans.literal; - -import javax.enterprise.context.ScopeType; -import javax.enterprise.inject.AnnotationLiteral; - -public class ScopeTypeLiteral extends AnnotationLiteral<ScopeType> implements ScopeType -{ - - private final boolean normal; - private final boolean passivating; - - public ScopeTypeLiteral(boolean normal, boolean passivating) - { - this.normal = normal; - this.passivating = passivating; - } - - public boolean normal() - { - return normal; - } - - public boolean passivating() - { - return passivating; - } - -} \ No newline at end of file Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/AnnotationModel.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/AnnotationModel.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/AnnotationModel.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -19,6 +19,7 @@ import java.lang.annotation.Annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.Set; import org.jboss.webbeans.DefinitionException; import org.jboss.webbeans.introspector.WBAnnotation; @@ -67,7 +68,7 @@ { if (!Annotation.class.isAssignableFrom(getRawType())) { - throw new DefinitionException(getMetaAnnotationType().toString() + " can only be applied to an annotation, it was applied to " + getRawType()); + throw new DefinitionException(getMetaAnnotationTypes().toString() + " can only be applied to an annotation, it was applied to " + getRawType()); } } @@ -76,10 +77,13 @@ */ protected void initValid() { - this.valid = true; - if (!annotatedAnnotation.isAnnotationPresent(getMetaAnnotationType())) + this.valid = false; + for (Class<? extends Annotation> annotationType : getMetaAnnotationTypes()) { - this.valid = false; + if (annotatedAnnotation.isAnnotationPresent(annotationType)) + { + this.valid = true; + } } if (annotatedAnnotation.isAnnotationPresent(Retention.class) && !annotatedAnnotation.getAnnotation(Retention.class).value().equals(RetentionPolicy.RUNTIME)) { @@ -104,7 +108,7 @@ * * @return */ - protected abstract Class<? extends Annotation> getMetaAnnotationType(); + protected abstract Set<Class<? extends Annotation>> getMetaAnnotationTypes(); /** * Indicates if the annotation is valid Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/BindingTypeModel.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/BindingTypeModel.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/BindingTypeModel.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -16,18 +16,12 @@ */ package org.jboss.webbeans.metadata.cache; -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 java.lang.annotation.Annotation; -import java.lang.annotation.Target; import java.lang.reflect.InvocationTargetException; import java.util.Set; -import javax.enterprise.inject.BindingType; -import javax.enterprise.inject.NonBinding; +import javax.enterprise.inject.Nonbinding; +import javax.inject.Qualifier; import org.jboss.webbeans.DefinitionException; import org.jboss.webbeans.introspector.WBMethod; @@ -46,6 +40,9 @@ */ public class BindingTypeModel<T extends Annotation> extends AnnotationModel<T> { + + + private static final Set<Class<? extends Annotation>> META_ANNOTATIONS = Arrays2.<Class<? extends Annotation>>asSet(Qualifier.class); private static final Log log = Logging.getLog(BindingTypeModel.class); // The non-binding types @@ -72,22 +69,6 @@ initNonBindingTypes(); checkArrayAndAnnotationValuedMembers(); } - - @Override - protected void initValid() - { - super.initValid(); - if (!getAnnotatedAnnotation().isAnnotationPresent(Target.class)) - { - this.valid = false; - log.debug("#0 is missing @Target annotation.", getAnnotatedAnnotation()); - } - else if (!Arrays2.unorderedEquals(getAnnotatedAnnotation().getAnnotation(Target.class).value(), METHOD, FIELD, PARAMETER, TYPE)) - { - this.valid = false; - log.debug("#0 is has incorrect @Target annotation. Should be @Target(METHOD, FIELD, TYPE, PARAMETER).", getAnnotatedAnnotation()); - } - } /** * Validates the members @@ -110,9 +91,9 @@ * @return The BindingType class */ @Override - protected Class<? extends Annotation> getMetaAnnotationType() + protected Set<Class<? extends Annotation>> getMetaAnnotationTypes() { - return BindingType.class; + return META_ANNOTATIONS; } /** @@ -141,7 +122,7 @@ */ protected void initNonBindingTypes() { - nonBindingTypes = getAnnotatedAnnotation().getAnnotatedMembers(NonBinding.class); + nonBindingTypes = getAnnotatedAnnotation().getAnnotatedMembers(Nonbinding.class); } /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/ScopeModel.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/ScopeModel.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/ScopeModel.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -22,10 +22,11 @@ import java.lang.annotation.Annotation; import java.lang.annotation.Target; +import java.util.Set; -import javax.enterprise.context.ScopeType; +import javax.enterprise.context.NormalScope; +import javax.inject.Scope; -import org.jboss.webbeans.literal.ScopeTypeLiteral; import org.jboss.webbeans.log.Log; import org.jboss.webbeans.log.Logging; import org.jboss.webbeans.resources.ClassTransformer; @@ -40,9 +41,11 @@ */ public class ScopeModel<T extends Annotation> extends AnnotationModel<T> { + + private static final Set<Class<? extends Annotation>> META_ANNOTATIONS = Arrays2.asSet(Scope.class, NormalScope.class); + private static final Log log = Logging.getLog(ScopeModel.class); - - private final ScopeType metaAnnotation; + private final boolean normal; private final boolean passivating; @@ -56,15 +59,21 @@ super(scope, classTransformer); if (isValid()) { - this.normal = getAnnotatedAnnotation().getAnnotation(ScopeType.class).normal(); - this.passivating = getAnnotatedAnnotation().getAnnotation(ScopeType.class).passivating(); - this.metaAnnotation = new ScopeTypeLiteral(normal, passivating); + if (getAnnotatedAnnotation().isAnnotationPresent(NormalScope.class)) + { + this.passivating = getAnnotatedAnnotation().getAnnotation(NormalScope.class).passivating(); + this.normal = true; + } + else + { + this.normal = false; + this.passivating = false; + } } else { this.normal = false; this.passivating = false; - this.metaAnnotation = null; } } @@ -109,16 +118,10 @@ * * @return The ScopeType class */ - @Override - protected Class<? extends Annotation> getMetaAnnotationType() + protected Set<Class<? extends Annotation>> getMetaAnnotationTypes() { - return ScopeType.class; + return META_ANNOTATIONS; } - - public ScopeType getMetaAnnnotation() - { - return metaAnnotation; - } /** * Gets a string representation of the scope model Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -22,14 +22,16 @@ import java.lang.annotation.Annotation; import java.lang.annotation.Target; +import java.util.HashSet; import java.util.Set; -import javax.enterprise.context.ScopeType; -import javax.enterprise.inject.BindingType; -import javax.enterprise.inject.Named; -import javax.enterprise.inject.Policy; +import javax.enterprise.context.NormalScope; +import javax.enterprise.inject.Alternative; import javax.enterprise.inject.stereotype.Stereotype; -import javax.interceptor.InterceptorBindingType; +import javax.inject.Named; +import javax.inject.Qualifier; +import javax.inject.Scope; +import javax.interceptor.InterceptorBinding; import org.jboss.webbeans.DefinitionException; import org.jboss.webbeans.log.Log; @@ -46,6 +48,7 @@ */ public class StereotypeModel<T extends Annotation> extends AnnotationModel<T> { + private static final Set<Class<? extends Annotation>> META_ANNOTATIONS = Arrays2.<Class<? extends Annotation>>asSet(Stereotype.class); private static final Log log = Logging.getLog(StereotypeModel.class); // Is the stereotype a policy @@ -83,10 +86,16 @@ */ private void checkBindings() { - Set<Annotation> bindings = getAnnotatedAnnotation().getMetaAnnotations(BindingType.class); + Set<Annotation> bindings = getAnnotatedAnnotation().getMetaAnnotations(Qualifier.class); if (bindings.size() > 0) { - throw new DefinitionException("Cannot declare binding types on a stereotype " + getAnnotatedAnnotation()); + for (Annotation annotation : bindings) + { + if (!annotation.annotationType().equals(Named.class)) + { + throw new DefinitionException("Cannot declare binding types on a stereotype " + getAnnotatedAnnotation()); + } + } } } @@ -95,7 +104,7 @@ */ private void initInterceptorBindings() { - interceptorBindings = getAnnotatedAnnotation().getMetaAnnotations(InterceptorBindingType.class); + interceptorBindings = getAnnotatedAnnotation().getMetaAnnotations(InterceptorBinding.class); } private void initInheritedStereotypes() @@ -123,7 +132,9 @@ */ private void initDefaultScopeType() { - Set<Annotation> scopeTypes = getAnnotatedAnnotation().getMetaAnnotations(ScopeType.class); + Set<Annotation> scopeTypes = new HashSet<Annotation>(); + scopeTypes.addAll(getAnnotatedAnnotation().getMetaAnnotations(Scope.class)); + scopeTypes.addAll(getAnnotatedAnnotation().getMetaAnnotations(NormalScope.class)); if (scopeTypes.size() > 1) { throw new DefinitionException("At most one scope type may be specified for " + getAnnotatedAnnotation()); @@ -139,7 +150,7 @@ */ private void initPolicy() { - if (getAnnotatedAnnotation().isAnnotationPresent(Policy.class)) + if (getAnnotatedAnnotation().isAnnotationPresent(Alternative.class)) { this.policy = true; } @@ -204,10 +215,9 @@ * * @return The Stereotype class */ - @Override - protected Class<? extends Annotation> getMetaAnnotationType() + protected Set<Class<? extends Annotation>> getMetaAnnotationTypes() { - return Stereotype.class; + return META_ANNOTATIONS; } /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -27,9 +27,9 @@ protected abstract Resolvable delegate(); - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { - return delegate().getBindings(); + return delegate().getQualifiers(); } public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/NewResolvableTransformer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/NewResolvableTransformer.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/NewResolvableTransformer.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -38,7 +38,7 @@ New originalNewAnnotation = element.getAnnotation(New.class); if (originalNewAnnotation.value().equals(New.class)) { - final Set<Annotation> bindings = new HashSet<Annotation>(element.getBindings()); + final Set<Annotation> bindings = new HashSet<Annotation>(element.getQualifiers()); final New newNewAnnotation = new NewLiteral() { @@ -61,7 +61,7 @@ } @Override - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return bindings; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/Resolvable.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/Resolvable.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/Resolvable.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -38,7 +38,7 @@ * * @return the bindings */ - public Set<Annotation> getBindings(); + public Set<Annotation> getQualifiers(); /** * Check if an annotation is present Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ResolvableFactory.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ResolvableFactory.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ResolvableFactory.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -26,7 +26,7 @@ import org.jboss.webbeans.bean.AbstractClassBean; import org.jboss.webbeans.introspector.WBAnnotated; -import org.jboss.webbeans.literal.CurrentLiteral; +import org.jboss.webbeans.literal.DefaultLiteral; import org.jboss.webbeans.util.Reflections; public class ResolvableFactory @@ -42,7 +42,7 @@ { Set<Type> types = new HashSet<Type>(); types.add(element.getBaseType()); - return new ResolvableImpl(element.getBindings(), types, null); + return new ResolvableImpl(element.getQualifiers(), types, null); } } @@ -71,7 +71,7 @@ this.bindings = bindings; if (bindings.size() == 0) { - this.bindings.add(new CurrentLiteral()); + this.bindings.add(new DefaultLiteral()); } this.annotations = new HashMap<Class<? extends Annotation>, Annotation>(); this.typeClosure = typeClosure; @@ -82,7 +82,7 @@ this.declaringBean = declaringBean; } - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return bindings; } @@ -121,7 +121,7 @@ @Override public String toString() { - return "Types: " + getTypeClosure() + "; Bindings: " + getBindings(); + return "Types: " + getTypeClosure() + "; Bindings: " + getQualifiers(); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeBeanResolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeBeanResolver.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeBeanResolver.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -60,7 +60,7 @@ @Override protected boolean matches(Resolvable resolvable, T bean) { - return Reflections.isAssignableFrom(resolvable.getTypeClosure(), bean.getTypes()) && Beans.containsAllBindings(resolvable.getBindings(), bean.getBindings(), manager); + return Reflections.isAssignableFrom(resolvable.getTypeClosure(), bean.getTypes()) && Beans.containsAllBindings(resolvable.getQualifiers(), bean.getQualifiers(), manager); } /** @@ -104,7 +104,7 @@ for (Bean<? extends X> bean : beans) { - if (policyPresent ? bean.isPolicy() : true && !Beans.isSpecialized(bean, beans, manager.getSpecializedBeans())) + if (policyPresent ? bean.isAlternative() : true && !Beans.isSpecialized(bean, beans, manager.getSpecializedBeans())) { disambiguatedBeans.add(bean); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeDecoratorResolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeDecoratorResolver.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeDecoratorResolver.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -41,7 +41,7 @@ @Override protected boolean matches(Resolvable resolvable, DecoratorBean<?> bean) { - return Reflections.isAssignableFrom(bean.getDelegateTypes(), resolvable.getTypeClosure()) && Beans.containsAllBindings(bean.getDelegateBindings(), resolvable.getBindings(), getManager()) && getManager().getEnabledDecoratorClasses().contains(bean.getType()); + return Reflections.isAssignableFrom(bean.getDelegateTypes(), resolvable.getTypeClosure()) && Beans.containsAllBindings(bean.getDelegateQualifiers(), resolvable.getQualifiers(), getManager()) && getManager().getEnabledDecoratorClasses().contains(bean.getType()); } @Override Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeDisposerResolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeDisposerResolver.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeDisposerResolver.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -42,7 +42,7 @@ @Override protected boolean matches(Resolvable resolvable, DisposalMethodBean<?> disposer) { - return resolvable.getDeclaringBean().equals(disposer.getDeclaringBean()) && Reflections.isAssignableFrom(disposer.getType(), resolvable.getTypeClosure()) && Beans.containsAllBindings(disposer.getBindings(), resolvable.getBindings(), manager); + return resolvable.getDeclaringBean().equals(disposer.getDeclaringBean()) && Reflections.isAssignableFrom(disposer.getType(), resolvable.getTypeClosure()) && Beans.containsAllBindings(disposer.getQualifiers(), resolvable.getQualifiers(), manager); } /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeObserverResolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeObserverResolver.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeObserverResolver.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -43,7 +43,7 @@ @Override protected boolean matches(Resolvable resolvable, ObserverMethod<?,?> observer) { - return Reflections.isAssignableFrom(observer.getObservedType(), resolvable.getTypeClosure()) && Beans.containsAllBindings(observer.getObservedBindings(), resolvable.getBindings(), manager); + return Reflections.isAssignableFrom(observer.getObservedType(), resolvable.getTypeClosure()) && Beans.containsAllBindings(observer.getObservedQualifiers(), resolvable.getQualifiers(), manager); } /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeResolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeResolver.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeResolver.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -55,7 +55,7 @@ if (obj instanceof Resolvable) { Resolvable that = (Resolvable) obj; - return this.getTypeClosure().equals(that.getTypeClosure()) && this.getBindings().equals(that.getBindings()); + return this.getTypeClosure().equals(that.getTypeClosure()) && this.getQualifiers().equals(that.getQualifiers()); } else { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -29,12 +29,11 @@ import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.event.Observes; -import javax.enterprise.inject.BindingType; import javax.enterprise.inject.CreationException; import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Initializer; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.Bean; +import javax.inject.Inject; import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.DefinitionException; @@ -87,7 +86,7 @@ } else { - return manager.getServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScopeType()).isPassivating(); + return manager.getServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScope()).isPassivating(); } } @@ -135,7 +134,7 @@ public static Set<FieldInjectionPoint<?, ?>> getFieldInjectionPoints(Bean<?> declaringBean, WBClass<?> annotatedItem) { Set<FieldInjectionPoint<?, ?>> injectableFields = new HashSet<FieldInjectionPoint<?, ?>>(); - for (WBField<?, ?> annotatedField : annotatedItem.getMetaAnnotatedWBFields(BindingType.class)) + for (WBField<?, ?> annotatedField : annotatedItem.getAnnotatedWBFields(Inject.class)) { addFieldInjectionPoint(annotatedField, injectableFields, declaringBean); } @@ -264,7 +263,7 @@ public static Set<MethodInjectionPoint<?, ?>> getInitializerMethods(Bean<?> declaringBean, WBClass<?> type) { Set<MethodInjectionPoint<?, ?>> initializerMethods = new HashSet<MethodInjectionPoint<?, ?>>(); - for (WBMethod<?, ?> method : type.getAnnotatedWBMethods(Initializer.class)) + for (WBMethod<?, ?> method : type.getAnnotatedWBMethods(Inject.class)) { if (method.isStatic()) { @@ -393,7 +392,7 @@ public static boolean isBeanEnabled(Bean<?> bean, Collection<Class<?>> enabledPolicyClasses, Collection<Class<? extends Annotation>> enabledPolicySterotypes) { - if (bean.isPolicy()) + if (bean.isAlternative()) { if (enabledPolicyClasses.contains(bean.getBeanClass())) { @@ -427,7 +426,7 @@ { for (Bean<?> bean : beans) { - if (bean.isPolicy()) + if (bean.isAlternative()) { return true; } @@ -458,7 +457,7 @@ public static <T> ConstructorInjectionPoint<T> getBeanConstructor(Bean<?> declaringBean, WBClass<T> type) { ConstructorInjectionPoint<T> constructor = null; - Set<WBConstructor<T>> initializerAnnotatedConstructors = type.getAnnotatedWBConstructors(Initializer.class); + Set<WBConstructor<T>> initializerAnnotatedConstructors = type.getAnnotatedWBConstructors(Inject.class); log.trace("Found " + initializerAnnotatedConstructors + " constructors annotated with @Initializer for " + type); if (initializerAnnotatedConstructors.size() > 1) { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -35,7 +35,7 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; import org.jboss.webbeans.util.reflection.ParameterizedTypeImpl; @@ -610,7 +610,7 @@ public static boolean isBindings(Annotation binding) { boolean isBindingAnnotation = false; - if (binding.annotationType().isAnnotationPresent(BindingType.class) && + if (binding.annotationType().isAnnotationPresent(Qualifier.class) && binding.annotationType().isAnnotationPresent(Retention.class) && binding.annotationType().getAnnotation(Retention.class).value().equals(RetentionPolicy.RUNTIME)) { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/BeansXmlParser.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/BeansXmlParser.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/BeansXmlParser.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -158,7 +158,7 @@ Element beans = document.getDocumentElement(); for (Node child : new NodeListIterable(beans.getChildNodes())) { - if (child instanceof Element && "policies".equals(child.getNodeName())) + if (child instanceof Element && "alternatives".equals(child.getNodeName())) { policiesElements.add(new XmlElement(url, (Element) child)); } @@ -177,7 +177,7 @@ if (policiesElements.size() > 1) { - throw new DeploymentException("<policies> can only be specified once, but it is specified muliple times " + policiesElements); + throw new DeploymentException("<alternatives> can only be specified once, but it is specified muliple times " + policiesElements); } else if (policiesElements.size() == 1) { Modified: ri/trunk/jboss-as/build.xml =================================================================== --- ri/trunk/jboss-as/build.xml 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/jboss-as/build.xml 2009-08-30 19:44:25 UTC (rev 3617) @@ -43,12 +43,17 @@ <copy todir="target/webbeans.deployer/lib-int/" overwrite="true"> <fileset dir="target/dependency/lib"> <include name="webbeans-core.jar" /> - <include name="webbeans-api.jar" /> - <include name="jsr299-api.jar" /> - <include name="webbeans-logger.jar" /> </fileset> </copy> + <copy todir="target/webbeans.deployer/" overwrite="true"> + <fileset dir="target/dependency/lib"> + <include name="webbeans-api.jar" /> + <include name="jsr299-api.jar" /> + <include name="webbeans-logger.jar" /> + </fileset> + </copy> + <delete dir="target/dependency" /> <copy todir="${jboss.home}/server/default/deployers/webbeans.deployer"> Modified: ri/trunk/spi/pom.xml =================================================================== --- ri/trunk/spi/pom.xml 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/spi/pom.xml 2009-08-30 19:44:25 UTC (rev 3617) @@ -64,6 +64,12 @@ <artifactId>jsf-api</artifactId> <optional>true</optional> </dependency> + + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + <optional>true</optional> + </dependency> </dependencies> Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Game.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Game.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Game.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,12 +1,12 @@ package org.jboss.webbeans.test.examples; -import javax.enterprise.inject.Initializer; +import javax.inject.Inject; public class Game { private final int number; - @Initializer + @Inject Game(@Random int number) { this.number = number; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/MockSentenceTranslator.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/MockSentenceTranslator.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/MockSentenceTranslator.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.examples; -import javax.enterprise.inject.Policy; +import javax.enterprise.inject.Alternative; -@Policy +@Alternative public class MockSentenceTranslator implements Translator { public String translate(String sentence) { return "Lorem ipsum dolor sit amet"; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Random.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Random.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Random.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier public @interface Random { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,12 +1,12 @@ package org.jboss.webbeans.test.examples; -import javax.enterprise.inject.Initializer; +import javax.inject.Inject; public class TextTranslator { private SentenceParser sentenceParser; private Translator sentenceTranslator; - @Initializer + @Inject TextTranslator(SentenceParser sentenceParser, Translator sentenceTranslator) { this.sentenceParser = sentenceParser; this.sentenceTranslator = sentenceTranslator; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -21,7 +21,7 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.bean.ForwardingBean; -import org.jboss.webbeans.literal.CurrentLiteral; +import org.jboss.webbeans.literal.DefaultLiteral; import org.jboss.webbeans.test.AbstractWebBeansTest; import org.testng.annotations.Test; @@ -39,7 +39,7 @@ static { - DEFAULT_BINDINGS.add(new CurrentLiteral()); + DEFAULT_BINDINGS.add(new DefaultLiteral()); } private Bean<?> createDummyBean(BeanManager beanManager, final Type injectionPointType) @@ -52,7 +52,7 @@ final Bean<?> bean = new Bean<Object>() { - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return bindings; } @@ -67,7 +67,7 @@ return null; } - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dependent.class; } @@ -97,7 +97,7 @@ return Object.class; } - public boolean isPolicy() + public boolean isAlternative() { return false; } @@ -116,7 +116,7 @@ return bean; } - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return DEFAULT_BINDINGS; } @@ -164,7 +164,7 @@ return null; } - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dummy.class; } @@ -264,7 +264,7 @@ } @Override - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return bindingTypes; } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Dummy.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Dummy.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Dummy.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -13,11 +13,11 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.context.ScopeType; +import javax.inject.Scope; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @Documented -@ScopeType +@Scope @Inherited @interface Dummy {} \ No newline at end of file Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Field.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Field.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Field.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,11 +1,12 @@ package org.jboss.webbeans.test.unit.activities; import javax.enterprise.inject.Instance; +import javax.inject.Inject; class Field { - @Tame Instance<Cow> instance; + @Inject @Tame Instance<Cow> instance; public Cow get() { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Tame.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Tame.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier @interface Tame { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SameBeanTypeInChildActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SameBeanTypeInChildActivityTest.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SameBeanTypeInChildActivityTest.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -15,7 +15,7 @@ import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.literal.CurrentLiteral; +import org.jboss.webbeans.literal.DefaultLiteral; import org.jboss.webbeans.manager.api.WebBeansManager; import org.jboss.webbeans.test.AbstractWebBeansTest; import org.testng.annotations.Test; @@ -32,7 +32,7 @@ static { - DEFAULT_BINDINGS.add(new CurrentLiteral()); + DEFAULT_BINDINGS.add(new DefaultLiteral()); } private Bean<?> createDummyBean(BeanManager beanManager) @@ -45,7 +45,7 @@ final Bean<?> bean = new Bean<MyBean>() { - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return bindings; } @@ -60,7 +60,7 @@ return null; } - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dependent.class; } @@ -90,7 +90,7 @@ return MyBean.class; } - public boolean isPolicy() + public boolean isAlternative() { return false; } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SpecialBindingType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SpecialBindingType.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SpecialBindingType.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -9,11 +9,11 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Retention(RUNTIME) @Target({TYPE, METHOD, FIELD, PARAMETER}) -@BindingType +@Qualifier @interface SpecialBindingType { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dummy.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dummy.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dummy.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -13,11 +13,11 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.context.ScopeType; +import javax.enterprise.context.NormalScope; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @Documented -@ScopeType +@NormalScope @Inherited @interface Dummy {} \ No newline at end of file Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dusk.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dusk.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dusk.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -2,12 +2,12 @@ import javax.enterprise.event.Event; import javax.enterprise.inject.Any; -import javax.enterprise.inject.Initializer; +import javax.inject.Inject; class Dusk { - @Initializer + @Inject public Dusk(@Any Event<NightTime> event) { event.fire(new NightTime()); Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/ELCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/ELCurrentActivityTest.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/ELCurrentActivityTest.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -53,7 +53,7 @@ return null; } - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dummy.class; } @@ -89,7 +89,7 @@ { } - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return BINDING_TYPES; } @@ -104,7 +104,7 @@ return "daisy"; } - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dependent.class; } @@ -140,7 +140,7 @@ return Cow.class; } - public boolean isPolicy() + public boolean isAlternative() { return false; } @@ -160,7 +160,7 @@ assert getBeans(Cow.class).size() == 1; WebBeansManager childActivity = getCurrentManager().createActivity(); childActivity.addBean(new Daisy(childActivity)); - childActivity.setCurrent(dummyContext.getScopeType()); + childActivity.setCurrent(dummyContext.getScope()); assert evaluateValueExpression("#{daisy}", Cow.class) != null; } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/EventCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/EventCurrentActivityTest.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/EventCurrentActivityTest.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -44,7 +44,7 @@ return null; } - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dummy.class; } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Field.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Field.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Field.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,11 +1,12 @@ package org.jboss.webbeans.test.unit.activities.current; import javax.enterprise.inject.Instance; +import javax.inject.Inject; class Field { - @Tame Instance<Cow> instance; + @Inject @Tame Instance<Cow> instance; public Cow get() { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Horse.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Horse.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Horse.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,12 +1,12 @@ package org.jboss.webbeans.test.unit.activities.current; -import javax.enterprise.inject.Current; import javax.enterprise.inject.spi.BeanManager; +import javax.inject.Inject; class Horse { - @Current BeanManager beanManager; + @Inject BeanManager beanManager; public BeanManager getManager() { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InactiveScopeTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InactiveScopeTest.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InactiveScopeTest.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -45,7 +45,7 @@ return null; } - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dummy.class; } @@ -69,7 +69,7 @@ dummyContext.setActive(false); getCurrentManager().addContext(dummyContext); WebBeansManager childActivity = getCurrentManager().createActivity(); - childActivity.setCurrent(dummyContext.getScopeType()); + childActivity.setCurrent(dummyContext.getScope()); } } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InjectedManagerCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InjectedManagerCurrentActivityTest.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InjectedManagerCurrentActivityTest.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -43,7 +43,7 @@ return null; } - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dummy.class; } @@ -67,7 +67,7 @@ getCurrentManager().addContext(dummyContext); assert getBeans(Cow.class).size() == 1; WebBeansManager childActivity = getCurrentManager().createActivity(); - childActivity.setCurrent(dummyContext.getScopeType()); + childActivity.setCurrent(dummyContext.getScope()); assert createContextualInstance(Horse.class).getManager().equals(childActivity); } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InstanceCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InstanceCurrentActivityTest.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InstanceCurrentActivityTest.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -55,7 +55,7 @@ return null; } - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dummy.class; } @@ -76,7 +76,7 @@ { @Override - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return NonNormalScope.class; } @@ -102,7 +102,7 @@ { } - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return BINDING_TYPES; } @@ -117,7 +117,7 @@ return "daisy"; } - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dependent.class; } @@ -148,7 +148,7 @@ return Cow.class; } - public boolean isPolicy() + public boolean isAlternative() { return false; } @@ -168,7 +168,7 @@ assert getBeans(Cow.class).size() == 1; WebBeansManager childActivity = getCurrentManager().createActivity(); childActivity.addBean(new Daisy(childActivity)); - childActivity.setCurrent(dummyContext.getScopeType()); + childActivity.setCurrent(dummyContext.getScope()); assert createContextualInstance(Field.class).get() != null; } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/JndiManagerCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/JndiManagerCurrentActivityTest.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/JndiManagerCurrentActivityTest.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -46,7 +46,7 @@ return null; } - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dummy.class; } @@ -70,7 +70,7 @@ getCurrentManager().addContext(dummyContext); assert getBeans(Cow.class).size() == 1; WebBeansManager childActivity = getCurrentManager().createActivity(); - childActivity.setCurrent(dummyContext.getScopeType()); + childActivity.setCurrent(dummyContext.getScope()); assert createContextualInstance(Donkey.class).getManager().equals(childActivity); } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScope.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScope.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScope.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -13,11 +13,11 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.context.ScopeType; +import javax.inject.Scope; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @Documented -@ScopeType(normal=false) +@Scope @Inherited @interface NonNormalScope {} \ No newline at end of file Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScopeTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScopeTest.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScopeTest.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -39,7 +39,7 @@ return null; } - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dummy.class; } @@ -60,7 +60,7 @@ { @Override - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return NonNormalScope.class; } @@ -73,6 +73,6 @@ Context dummyContext = new NonNormalContext(); getCurrentManager().addContext(dummyContext); WebBeansManager childActivity = getCurrentManager().createActivity(); - childActivity.setCurrent(dummyContext.getScopeType()); + childActivity.setCurrent(dummyContext.getScope()); } } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Tame.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Tame.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier @interface Tame { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/AnnotatedTypeDecoratorTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/AnnotatedTypeDecoratorTest.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/AnnotatedTypeDecoratorTest.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -5,13 +5,12 @@ import static org.testng.Assert.assertTrue; import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Initializer; import javax.enterprise.inject.spi.Annotated; import javax.enterprise.inject.spi.AnnotatedField; import javax.enterprise.inject.spi.AnnotatedType; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.InjectionTarget; +import javax.inject.Inject; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.test.AbstractWebBeansTest; @@ -95,12 +94,12 @@ if (annotated instanceof MockAnnotatedCallable) { assertEquals(1, annotated.getAnnotations().size()); - assertTrue(annotated.isAnnotationPresent(Initializer.class)); + assertTrue(annotated.isAnnotationPresent(Inject.class)); } else if (annotated instanceof MockAnnotatedField<?>) { assertEquals(1, annotated.getAnnotations().size()); - assertTrue(annotated.isAnnotationPresent(Current.class)); + assertTrue(annotated.isAnnotationPresent(Inject.class)); } } } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotated.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotated.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotated.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -26,10 +26,10 @@ import java.util.Collections; import java.util.Set; -import javax.enterprise.inject.Current; import javax.enterprise.inject.spi.Annotated; +import javax.inject.Inject; -import org.jboss.webbeans.literal.CurrentLiteral; +import org.jboss.webbeans.literal.InjectLiteral; /** * @@ -38,8 +38,7 @@ */ public class MockAnnotated implements Annotated { - private final static Current CURRENT = new CurrentLiteral(); - + private final static Inject INJECT = new InjectLiteral(); private Annotated delegate; public MockAnnotated(Annotated delegate) @@ -64,20 +63,20 @@ public <T extends Annotation> T getAnnotation(Class<T> annotationType) { - if (annotationType == Current.class) + if (annotationType == Inject.class) { - return (T)CURRENT; + return (T)INJECT; } return null; } public Set<Annotation> getAnnotations() { - return Collections.singleton((Annotation)CURRENT); + return Collections.singleton((Annotation)INJECT); } public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) { - return annotationType == Current.class; + return annotationType == Inject.class; } } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedCallable.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedCallable.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedCallable.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -27,10 +27,10 @@ import java.util.List; import java.util.Set; -import javax.enterprise.inject.Initializer; import javax.enterprise.inject.spi.Annotated; import javax.enterprise.inject.spi.AnnotatedCallable; import javax.enterprise.inject.spi.AnnotatedParameter; +import javax.inject.Inject; import org.jboss.annotation.factory.AnnotationCreator; @@ -41,12 +41,12 @@ */ public abstract class MockAnnotatedCallable<X> extends MockAnnotatedMember<X> implements AnnotatedCallable<X> { - private final static Initializer INITIALIZER; + private final static Inject INITIALIZER; static { try { - INITIALIZER = (Initializer)AnnotationCreator.createAnnotation("@" + Initializer.class.getName(), Initializer.class); + INITIALIZER = (Inject)AnnotationCreator.createAnnotation("@" + Inject.class.getName(), Inject.class); } catch(Exception e) { @@ -90,7 +90,7 @@ @Override public <T extends Annotation> T getAnnotation(Class<T> annotationType) { - if (annotationType == Initializer.class) + if (annotationType == Inject.class) { return (T)INITIALIZER; } @@ -106,6 +106,6 @@ @Override public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) { - return annotationType == Initializer.class; + return annotationType == Inject.class; } } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Foo.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Foo.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Foo.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.test.unit.bootstrap; -import javax.enterprise.inject.Current; +import javax.inject.Inject; /** * @author pmuir @@ -25,7 +25,7 @@ public class Foo { - @Current + @Inject private Bar bar; public String message; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Hound.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Hound.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.enterprise.inject.Named; +import javax.inject.Named; @Stateful @Tame Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Synchronous.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Synchronous.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Synchronous.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -9,12 +9,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier @interface Synchronous { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tame.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tame.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier @interface Tame { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.enterprise.inject.Named; +import javax.inject.Named; @Stateful @Tame Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; -import javax.enterprise.inject.Named; +import javax.inject.Named; @Named class Salmon implements ScottishFish Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; -import javax.enterprise.inject.Named; +import javax.inject.Named; @Whitefish @Named("whitefish") Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -9,12 +9,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier @interface Synchronous { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier @interface Tame { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier public @interface Whitefish { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Salmon.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Salmon.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Salmon.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; -import javax.enterprise.inject.Named; +import javax.inject.Named; @Named class Salmon implements ScottishFish Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Sole.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Sole.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Sole.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; -import javax.enterprise.inject.Named; +import javax.inject.Named; @Whitefish @Named("whitefish") Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Whitefish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Whitefish.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Whitefish.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier public @interface Whitefish { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Hound.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Hound.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.enterprise.inject.Named; +import javax.inject.Named; @Stateful @Tame Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Tame.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Tame.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier @interface Tame { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tame.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tame.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier @interface Tame { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/StringHolder.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/StringHolder.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/StringHolder.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -2,13 +2,13 @@ import java.util.List; -import javax.enterprise.inject.Current; +import javax.inject.Inject; public class StringHolder { - @Current + @Inject private List<String> strings; public List<String> getStrings() Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Beer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Beer.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Beer.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.definition; -import javax.enterprise.inject.Named; +import javax.inject.Named; public @Named Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/BeerProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/BeerProducer.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/BeerProducer.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.definition; -import javax.enterprise.inject.Named; import javax.enterprise.inject.Produces; +import javax.inject.Named; public class BeerProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Hound.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Hound.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.enterprise.inject.Named; +import javax.inject.Named; @Stateful @Tame Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Salmon.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Salmon.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Salmon.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.environments.servlet; -import javax.enterprise.inject.Named; +import javax.inject.Named; @Named class Salmon implements ScottishFish Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Sole.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Sole.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Sole.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.environments.servlet; import javax.ejb.EJB; -import javax.enterprise.inject.Named; +import javax.inject.Named; @Whitefish @Named("whitefish") Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tame.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tame.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier @interface Tame { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Whitefish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Whitefish.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Whitefish.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier public @interface Whitefish { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -3,6 +3,7 @@ import java.util.Set; import javax.enterprise.inject.New; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; @@ -32,8 +33,9 @@ private EnterpriseBean<WrappedEnterpriseBeanLocal> wrappedEnterpriseBean; private NewEnterpriseBean<WrappedEnterpriseBeanLocal> newEnterpriseBean; - public void initNewBean() { - + public void initNewBean() + { + Set<Bean<?>> beans = getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class); assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).size() == 1; assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).iterator().next() instanceof EnterpriseBean; wrappedEnterpriseBean = (EnterpriseBean<WrappedEnterpriseBeanLocal>) getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).iterator().next(); Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -3,11 +3,9 @@ import javax.ejb.Remove; import javax.ejb.Stateful; import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Named; @SessionScoped @Stateful -@Named("John") class WrappedEnterpriseBean implements WrappedEnterpriseBeanLocal { @Remove Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -4,8 +4,8 @@ import java.util.Iterator; import java.util.Set; -import javax.enterprise.inject.BindingType; import javax.enterprise.inject.stereotype.Stereotype; +import javax.inject.Qualifier; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.introspector.WBClass; @@ -34,7 +34,7 @@ public void testMetaAnnotations() { WBClass<Order> annotatedElement = WBClassImpl.of(Order.class, transformer); - Set<Annotation> annotations = annotatedElement.getMetaAnnotations(BindingType.class); + Set<Annotation> annotations = annotatedElement.getMetaAnnotations(Qualifier.class); assert annotations.size() == 1; Iterator<Annotation> it = annotations.iterator(); Annotation production = it.next(); Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Random.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Random.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Random.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier public @interface Random { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -4,13 +4,13 @@ import javax.ejb.Remove; import javax.ejb.Stateful; import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Current; +import javax.inject.Inject; @Stateful @Dependent public class LandgraffenSchloss implements Schloss { - @Current + @Inject private GrossStadt biggerCity; @PreDestroy Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Mainz.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Mainz.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Mainz.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -2,13 +2,12 @@ import javax.annotation.PostConstruct; import javax.ejb.Stateless; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Initializer; +import javax.inject.Inject; @Stateless public class Mainz implements AlteStadt { - @Current + @Inject private RoemerPassage placeOfInterest; private GutenbergMuseum anotherPlaceOfInterest; @@ -27,8 +26,8 @@ name = placeOfInterest.getName(); } - @Initializer - public void initializeBean(@Current GutenbergMuseum pointOfInterest) + @Inject + public void initializeBean(GutenbergMuseum pointOfInterest) { this.anotherPlaceOfInterest = pointOfInterest; } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Marburg.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Marburg.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Marburg.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -2,12 +2,12 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.enterprise.inject.Current; +import javax.inject.Inject; @Stateful public class Marburg implements UniStadt { - @Current + @Inject private Schloss theCastle; @Remove Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -4,7 +4,7 @@ import javax.enterprise.event.Observes; import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.Any; -import javax.enterprise.inject.Current; +import javax.inject.Inject; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.BeanManagerImpl; @@ -88,16 +88,16 @@ public static class App { - @Any + @Inject @Any Event<String> event1; - @Updated + @Inject @Updated Event<String> event2; - @Any + @Inject @Any Event<String> event3; - @Current + @Inject Event<String> event4; public void fireEventByAnnotationLiteral() Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Updated.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Updated.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Updated.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,9 +10,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; -@BindingType +@Qualifier @Retention(RUNTIME) @Target( { TYPE, METHOD, FIELD, PARAMETER }) @Documented Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Large.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Large.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Large.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier @interface Large { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named/Important.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named/Important.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named/Important.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -11,7 +11,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; /** * @author Dan Allen @@ -19,7 +19,7 @@ @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier @Inherited public @interface Important { } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named/NamedBeanWithBinding.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named/NamedBeanWithBinding.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named/NamedBeanWithBinding.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.implementation.named; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Named; +import javax.inject.Named; /** * @author Dan Allen Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/WrappedSimpleBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/WrappedSimpleBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/WrappedSimpleBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -3,10 +3,8 @@ import java.io.Serializable; import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Named; @SessionScoped -@Named("Fred") class WrappedSimpleBean implements Serializable { public WrappedSimpleBean() { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/IntegerCollectionInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/IntegerCollectionInjection.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/IntegerCollectionInjection.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -2,26 +2,25 @@ import java.util.Collection; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Initializer; +import javax.inject.Inject; public class IntegerCollectionInjection { private Collection<Integer> value; - @Current + @Inject private Collection<Integer> fieldInjection; private Collection<Integer> setterInjection; - @Initializer + @Inject public void init(Collection<Integer> setterInjection) { this.setterInjection = setterInjection; } - @Initializer + @Inject public IntegerCollectionInjection(Collection<Integer> com) { this.value = com; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -4,10 +4,11 @@ import javax.enterprise.inject.Any; import javax.enterprise.inject.Instance; +import javax.inject.Inject; public class ListInstance { - @Any + @Inject @Any Instance<List> instance; public Instance<List> get() Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListStringInstance.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListStringInstance.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListStringInstance.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -4,10 +4,11 @@ import javax.enterprise.inject.Any; import javax.enterprise.inject.Instance; +import javax.inject.Inject; public class ListStringInstance { - @Any Instance<List<String>> instance; + @Inject @Any Instance<List<String>> instance; public List<String> get() { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -2,26 +2,25 @@ import java.util.Collection; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Initializer; +import javax.inject.Inject; public class ParameterizedCollectionInjection { private Collection<String> value; - @Current + @Inject private Collection<String> fieldInjection; private Collection<String> setterInjection; - @Initializer + @Inject public void init(Collection<String> setterInjection) { this.setterInjection = setterInjection; } - @Initializer + @Inject public ParameterizedCollectionInjection(Collection<String> com) { this.value = com; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedListInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedListInjection.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedListInjection.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -2,26 +2,25 @@ import java.util.List; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Initializer; +import javax.inject.Inject; public class ParameterizedListInjection { private List<String> value; - @Current + @Inject private List<String> fieldInjection; private List<String> setterInjection; - @Initializer + @Inject public void init(List<String> setterInjection) { this.setterInjection = setterInjection; } - @Initializer + @Inject public ParameterizedListInjection(List<String> com) { this.value = com; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/Target.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/Target.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/Target.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -3,16 +3,16 @@ import java.util.Collection; import java.util.List; -import javax.enterprise.inject.Current; +import javax.inject.Inject; public class Target { - @Current private Collection<String> strings; + @Inject private Collection<String> strings; - @Current private Collection<Integer> integers; + @Inject private Collection<Integer> integers; - @Current private List<String> stringList; + @Inject private List<String> stringList; public Collection<String> getStrings() { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/FooProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/FooProducer.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/FooProducer.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -16,7 +16,6 @@ */ package org.jboss.webbeans.test.unit.implementation.producer.method; -import javax.enterprise.inject.Current; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; @@ -39,7 +38,7 @@ disposed = false; } - public void disposeFoo(@Disposes @Current Foo foo) + public void disposeFoo(@Disposes Foo foo) { disposed = true; } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/Important.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/Important.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/Important.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -11,7 +11,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; /** * @author Dan Allen @@ -19,7 +19,7 @@ @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier @Inherited public @interface Important { } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,13 +1,13 @@ package org.jboss.webbeans.test.unit.implementation.producer.method; -import javax.enterprise.inject.Initializer; +import javax.inject.Inject; public class IntInjection { int value; - @Initializer public IntInjection(Integer integer) + @Inject public IntInjection(Integer integer) { this.value = integer; } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,14 +1,14 @@ package org.jboss.webbeans.test.unit.implementation.producer.method; -import javax.enterprise.inject.Current; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.InjectionPoint; +import javax.inject.Inject; class ManagerProducer { - @Current BeanManager beanManager; + @Inject BeanManager beanManager; private static boolean injectionPointInjected; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducer.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducer.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.implementation.producer.method; -import javax.enterprise.inject.Named; import javax.enterprise.inject.Produces; +import javax.inject.Named; public class NamedProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducerWithBinding.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducerWithBinding.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducerWithBinding.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -2,8 +2,8 @@ import java.util.Date; -import javax.enterprise.inject.Named; import javax.enterprise.inject.Produces; +import javax.inject.Named; /** * @author Dan Allen Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/Foo.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/Foo.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/Foo.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -3,7 +3,7 @@ import java.io.Serializable; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Named; +import javax.inject.Named; @Named @RequestScoped Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupFoo.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupFoo.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupFoo.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,13 +1,13 @@ package org.jboss.webbeans.test.unit.lookup; -import javax.enterprise.inject.Current; +import javax.inject.Inject; public class LookupFoo { - @Current Foo foo; + @Inject Foo foo; - @Special FooBase<Baz> foobaz; + @Inject @Special FooBase<Baz> foobaz; public Foo getFoo() { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -6,7 +6,7 @@ import javax.enterprise.inject.TypeLiteral; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.literal.CurrentLiteral; +import org.jboss.webbeans.literal.DefaultLiteral; import org.jboss.webbeans.test.AbstractWebBeansTest; import org.testng.annotations.Test; @@ -18,7 +18,7 @@ @Test public void testLookupInstance() throws Exception { - assert createContextualInstance(new TypeLiteral<Instance<List<?>>>(){}.getRawType(), new CurrentLiteral()) == null; + assert createContextualInstance(new TypeLiteral<Instance<List<?>>>(){}.getRawType(), new DefaultLiteral()) == null; } } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/Special.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/Special.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/Special.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -9,9 +9,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; -@BindingType +@Qualifier @Retention(RetentionPolicy.RUNTIME) @Target({FIELD, METHOD, TYPE, PARAMETER}) public @interface Special Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bar.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bar.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bar.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -2,7 +2,7 @@ import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Current; +import javax.inject.Inject; @ApplicationScoped class Bar @@ -10,7 +10,7 @@ public static boolean success; - @Current Foo foo; + @Inject Foo foo; public Bar() { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLooping.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLooping.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLooping.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier @interface DependentLooping { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Farm.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Farm.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Farm.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,11 +1,11 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.enterprise.inject.Initializer; +import javax.inject.Inject; class Farm { - @Initializer + @Inject public Farm(Farm farm) { } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Fish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Fish.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Fish.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,13 +1,13 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.enterprise.inject.Initializer; +import javax.inject.Inject; class Fish { private Water water; - @Initializer + @Inject public Fish(Water water) { this.water = water; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Foo.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Foo.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Foo.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,14 +1,14 @@ package org.jboss.webbeans.test.unit.lookup.circular; import javax.annotation.PostConstruct; -import javax.enterprise.inject.Current; +import javax.inject.Inject; class Foo { public static boolean success; - @Current Bar bar; + @Inject Bar bar; public Foo() { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLooping.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLooping.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLooping.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier @interface NormalLooping { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier @interface SelfConsumingDependent { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Water.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Water.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Water.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,10 +1,10 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.enterprise.inject.Initializer; +import javax.inject.Inject; class Water { - @Initializer + @Inject public Water(Fish fish) { } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntFactory.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntFactory.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntFactory.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -9,11 +9,11 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Retention(RetentionPolicy.RUNTIME) @Target( { TYPE, FIELD, METHOD, PARAMETER }) -@BindingType +@Qualifier public @interface IntFactory { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/SomeBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/SomeBean.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/SomeBean.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,9 +1,11 @@ package org.jboss.webbeans.test.unit.lookup.wbri279; +import javax.inject.Inject; + public class SomeBean { - @IntFactory + @Inject @IntFactory IntegerFactory integerFactory; public String getObjectAsString() Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -14,7 +14,7 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.literal.CurrentLiteral; +import org.jboss.webbeans.literal.DefaultLiteral; import org.jboss.webbeans.test.AbstractWebBeansTest; import org.testng.annotations.Test; @@ -27,7 +27,7 @@ static { - DEFAULT_BINDINGS.add(new CurrentLiteral()); + DEFAULT_BINDINGS.add(new DefaultLiteral()); } private static interface Dummy {} @@ -43,7 +43,7 @@ TYPES.add(Object.class); } - public Set<Annotation> getBindings() + public Set<Annotation> getQualifiers() { return DEFAULT_BINDINGS; } @@ -58,7 +58,7 @@ return null; } - public Class<? extends Annotation> getScopeType() + public Class<? extends Annotation> getScope() { return Dependent.class; } @@ -88,7 +88,7 @@ return Dummy.class; } - public boolean isPolicy() + public boolean isAlternative() { return false; } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/External.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/External.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/External.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -21,7 +21,7 @@ */ package org.jboss.webbeans.test.unit.noncontextual; -import javax.enterprise.inject.Current; +import javax.inject.Inject; /** * @@ -36,5 +36,5 @@ // TODO Auto-generated constructor stub } - @Current WebBean bean; + @Inject WebBean bean; } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/Random.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/Random.java 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/Random.java 2009-08-30 19:44:25 UTC (rev 3617) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier public @interface Random { Modified: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/examples/beans.xml =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/examples/beans.xml 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/examples/beans.xml 2009-08-30 19:44:25 UTC (rev 3617) @@ -1,5 +1,5 @@ <beans> - <policies> + <alternatives> <class>org.jboss.webbeans.test.examples.MockSentenceTranslator</class> - </policies> + </alternatives> </beans> Modified: ri/trunk/version-matrix/pom.xml =================================================================== --- ri/trunk/version-matrix/pom.xml 2009-08-28 14:10:27 UTC (rev 3616) +++ ri/trunk/version-matrix/pom.xml 2009-08-30 19:44:25 UTC (rev 3617) @@ -99,6 +99,12 @@ <artifactId>validation-api</artifactId> <version>1.0.CR3</version> </dependency> + + <dependency> + <groupId>javax.inject</groupId> + <artifactId>inject-api</artifactId> + <version>1.0.0-PRD</version> + </dependency> <dependency> <groupId>com.google.collections</groupId>