[weld-commits] Weld SVN: r4247 - api/trunk/cdi/src/main/java/javax/enterprise/event and 43 other directories.

Author: dallen6 Date: 2009-10-23 20:06:03 -0400 (Fri, 23 Oct 2009) New Revision: 4247 Added: api/trunk/cdi/src/main/java/javax/enterprise/event/Reception.java api/trunk/cdi/src/main/java/javax/enterprise/inject/Model.java api/trunk/cdi/src/main/java/javax/enterprise/inject/Stereotype.java Removed: api/trunk/cdi/src/main/java/javax/enterprise/event/Notify.java api/trunk/cdi/src/main/java/javax/enterprise/inject/stereotype/ Modified: api/trunk/cdi/src/main/java/javax/decorator/Decorator.java api/trunk/cdi/src/main/java/javax/enterprise/event/Observes.java api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes_Broken.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithBindingTypes_Broken.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/StereotypeWithEmptyNamed.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/FishStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/NotEnabled.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/NamedStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/AnimalStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Loggable.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/FooStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/EnabledPolicyStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/NotEnabledPolicyStereotype.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/Mock.java core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldAnnotated.java core/trunk/impl/src/main/java/org/jboss/weld/literal/StereotypeLiteral.java core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/StereotypeModel.java core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalOrderStereotype.java core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalStereotype.java core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/RequestScopedAnimalStereotype.java core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorStereotype.java Log: Updating some of the API to the final draft of JSR-299. Modified: api/trunk/cdi/src/main/java/javax/decorator/Decorator.java =================================================================== --- api/trunk/cdi/src/main/java/javax/decorator/Decorator.java 2009-10-23 21:29:18 UTC (rev 4246) +++ api/trunk/cdi/src/main/java/javax/decorator/Decorator.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -24,7 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; /** * <p>Specifies that a class is a decorator. May be applied to Deleted: api/trunk/cdi/src/main/java/javax/enterprise/event/Notify.java =================================================================== --- api/trunk/cdi/src/main/java/javax/enterprise/event/Notify.java 2009-10-23 21:29:18 UTC (rev 4246) +++ api/trunk/cdi/src/main/java/javax/enterprise/event/Notify.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -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.event; - -/** - * An enumeration that is used to declare the condition under which an observer - * method should be called. The default behavior is to create the bean and - * invoke the observer method synchronously. - * - * @author Gavin King - * @author Dan Allen - * @author David Allen - */ -public enum Notify -{ - /** - * Specifies that an observer method is only called if the current instance - * of the bean declaring the observer method already exists. - */ - IF_EXISTS, - - /** - * Specifies that an observer method always receives the event notifications. - */ - ALWAYS -} \ No newline at end of file Modified: api/trunk/cdi/src/main/java/javax/enterprise/event/Observes.java =================================================================== --- api/trunk/cdi/src/main/java/javax/enterprise/event/Observes.java 2009-10-23 21:29:18 UTC (rev 4246) +++ api/trunk/cdi/src/main/java/javax/enterprise/event/Observes.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -25,10 +25,45 @@ import java.lang.annotation.Target; /** - * Specifies that a parameter of a method of a bean - * implementation class is the event parameter - * of an observer method. + * <p> + * Specifies that a parameter of a method of a bean implementation class is the + * event parameter of an observer method. An observer method is a non-abstract + * method of a managed bean class or session bean class. An observer method may + * be either static or non-static. If the bean is a session bean, the observer + * method must be either a business method of the EJB or a static method of the + * bean class. A bean class may also have any number of observer methods + * declared. + * </p> * + * <p> + * To observe a simple Java class as the event type, the {@literal @}Observes + * annotation is used directly on the event parameter.</p> + * <pre> + * public void afterLogin(@Observes LoggedInEvent event) { ... } + * </pre> + * + * <p> + * Qualifiers may also be added to further differentiate between events of the same + * type. When multiple qualifiers are used, each of them must exist on the event + * in order for the observer method to be invoked. Also note that any of the + * qualifiers may have type members bound to specific values which also must + * match those of the event object.</p> + * <pre> + * public void afterLogin(@Observes @Admin LoggedInEvent event) { ... } + * public void afterDocumentUpdatedByAdmin(@Observes @Updated @ByAdmin Document doc) { ... } + * public void afterAdminLogin(@Observes @Role("admin") LoggedInEvent event) { ... } + * </pre> + * + * <p> + * An application may have any number of observers for the same event type. The + * order in which these observers are called is indeterminate. For this reason, + * caution must be used if any one of the observers might throw an exception + * since the remaining observers not yet notified will never see the event. + * Event processing for a single event is terminated whenever an exception is + * thrown by an observer. Therefore the code should not make any assumptions + * about the state of other similar observers. + * </p> + * * @author Gavin King * @author Pete Muir * @author David Allen @@ -45,7 +80,7 @@ * method does not already exist, one will be created to receive the * event. */ - public Notify notifyObserver() default Notify.ALWAYS; + public Reception notifyObserver() default Reception.ALWAYS; /** * Specifies whether or not the notification should occur as part of Copied: api/trunk/cdi/src/main/java/javax/enterprise/event/Reception.java (from rev 4234, api/trunk/cdi/src/main/java/javax/enterprise/event/Notify.java) =================================================================== --- api/trunk/cdi/src/main/java/javax/enterprise/event/Reception.java (rev 0) +++ api/trunk/cdi/src/main/java/javax/enterprise/event/Reception.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -0,0 +1,40 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package javax.enterprise.event; + +/** + * An enumeration that is used to declare the condition under which an observer + * method should be called. The default behavior is to create the bean and + * invoke the observer method synchronously. + * + * @author Gavin King + * @author Dan Allen + * @author David Allen + */ +public enum Reception +{ + /** + * Specifies that an observer method is only called if the current instance + * of the bean declaring the observer method already exists. + */ + IF_EXISTS, + + /** + * Specifies that an observer method always receives the event notifications. + */ + ALWAYS +} \ No newline at end of file Property changes on: api/trunk/cdi/src/main/java/javax/enterprise/event/Reception.java ___________________________________________________________________ Name: svn:eol-style + native Copied: api/trunk/cdi/src/main/java/javax/enterprise/inject/Model.java (from rev 4234, api/trunk/cdi/src/main/java/javax/enterprise/inject/stereotype/Model.java) =================================================================== --- api/trunk/cdi/src/main/java/javax/enterprise/inject/Model.java (rev 0) +++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Model.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -0,0 +1,27 @@ +package javax.enterprise.inject; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; + +/** + * A stereotype for MVC model objects + * + * @author Gavin King + */ + +@Named +@RequestScoped +@Stereotype +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +public @interface Model +{ +} \ No newline at end of file Property changes on: api/trunk/cdi/src/main/java/javax/enterprise/inject/Model.java ___________________________________________________________________ Name: svn:eol-style + native Copied: api/trunk/cdi/src/main/java/javax/enterprise/inject/Stereotype.java (from rev 4234, api/trunk/cdi/src/main/java/javax/enterprise/inject/stereotype/Stereotype.java) =================================================================== --- api/trunk/cdi/src/main/java/javax/enterprise/inject/Stereotype.java (rev 0) +++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Stereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -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.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 stereotype. + * + * @author Pete Muir + * @author Gavin King + */ + +@Retention(RUNTIME) +@Target(ANNOTATION_TYPE) +@Documented +public @interface Stereotype {} Property changes on: api/trunk/cdi/src/main/java/javax/enterprise/inject/Stereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java =================================================================== --- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java 2009-10-23 21:29:18 UTC (rev 4246) +++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -4,7 +4,7 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.enterprise.event.Notify; +import javax.enterprise.event.Reception; import javax.enterprise.event.TransactionPhase; public interface ObserverMethod<X, T> @@ -15,7 +15,7 @@ public Set<Annotation> getObservedQualifiers(); - public Notify getNotify(); + public Reception getReception(); public TransactionPhase getTransactionPhase(); Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -9,7 +9,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -7,7 +7,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; import javax.inject.Named; @Stereotype Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -7,7 +7,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; import javax.inject.Named; @Stereotype Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -9,7 +9,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -7,7 +7,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; import javax.inject.Named; @Stereotype Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -7,7 +7,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -10,7 +10,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -9,7 +9,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -7,7 +7,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @ApplicationScoped @Stereotype Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; import javax.inject.Named; @Stereotype Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -9,7 +9,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -7,7 +7,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes_Broken.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes_Broken.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes_Broken.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -8,7 +8,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithBindingTypes_Broken.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithBindingTypes_Broken.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithBindingTypes_Broken.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/StereotypeWithEmptyNamed.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/StereotypeWithEmptyNamed.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/StereotypeWithEmptyNamed.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; import javax.inject.Named; @Stereotype Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -10,7 +10,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/FishStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/FishStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/FishStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -9,7 +9,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -10,7 +10,7 @@ import java.lang.annotation.Target; import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @NamedRequestStereotype Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -10,7 +10,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @NamedStereotype Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; import javax.inject.Named; @Stereotype Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -114,7 +114,7 @@ Set<ObserverMethod<?, Egg>> observers = getCurrentManager().resolveObserverMethods(egg); assert observers.size() == 1; - // Notify the observer so we can confirm that it + // Reception the observer so we can confirm that it // is a method only on Farmer, and not LazyFarmer observers.iterator().next().notify(egg); assert egg.getClassesVisited().size() == 1; @@ -132,7 +132,7 @@ Set<ObserverMethod<?, StockPrice>> observers = getCurrentManager().resolveObserverMethods(price); assert observers.size() == 1; - // Notify the observer so we can confirm that it + // Reception the observer so we can confirm that it // is a method only on StockWatcher, and not IntermediateStockWatcher // or IndirectStockWatcher observers.iterator().next().notify(price); Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -1,11 +1,11 @@ package org.jboss.jsr299.tck.tests.event.broken.observer.dependentIsConditionalObserver; -import javax.enterprise.event.Notify; +import javax.enterprise.event.Reception; import javax.enterprise.event.Observes; class AlarmSystem { - public void onBreakInAttempt(@Observes(notifyObserver = Notify.IF_EXISTS) BreakIn breakIn) + public void onBreakInAttempt(@Observes(notifyObserver = Reception.IF_EXISTS) BreakIn breakIn) { assert false; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -9,7 +9,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype() @Target( { TYPE, METHOD, FIELD }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.event.observer; import javax.enterprise.context.RequestScoped; -import javax.enterprise.event.Notify; +import javax.enterprise.event.Reception; import javax.enterprise.event.Observes; @RequestScoped @@ -14,7 +14,7 @@ wasNotified = true; } - void conditionalObserve(@Observes(notifyObserver = Notify.IF_EXISTS) ConditionalEvent e) + void conditionalObserve(@Observes(notifyObserver = Reception.IF_EXISTS) ConditionalEvent e) { } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.enterprise.event.Notify; +import javax.enterprise.event.Reception; import javax.enterprise.inject.spi.ObserverMethod; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -85,11 +85,11 @@ { Set<ObserverMethod<?, StockPrice>> observers = getCurrentManager().resolveObserverMethods(new StockPrice()); assert observers.size() == 1; - assert observers.iterator().next().getNotify().equals(Notify.ALWAYS); + assert observers.iterator().next().getReception().equals(Reception.ALWAYS); Set<ObserverMethod<?, ConditionalEvent>> conditionalObservers = getCurrentManager().resolveObserverMethods(new ConditionalEvent()); assert !conditionalObservers.isEmpty(); - assert conditionalObservers.iterator().next().getNotify().equals(Notify.IF_EXISTS); + assert conditionalObservers.iterator().next().getReception().equals(Reception.IF_EXISTS); } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.event.Notify; +import javax.enterprise.event.Reception; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; @@ -54,9 +54,9 @@ @SpecAssertion(section = "10.4.4", id = "c") public void testNotifyEnumerationContainsNotifyValues() { - assert Notify.values().length == 2; + assert Reception.values().length == 2; List<String> notifyValueNames = new ArrayList<String>(); - for (Notify value : Notify.values()) + for (Reception value : Reception.values()) { notifyValueNames.add(value.name()); } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.event.observer.conditional; import javax.enterprise.context.RequestScoped; -import javax.enterprise.event.Notify; +import javax.enterprise.event.Reception; import javax.enterprise.event.Observes; /** @@ -15,7 +15,7 @@ private boolean instanceNotified = false; private Web web; - public void observe(@Observes(notifyObserver = Notify.IF_EXISTS) ConditionalEvent someEvent) + public void observe(@Observes(notifyObserver = Reception.IF_EXISTS) ConditionalEvent someEvent) { notified = true; instanceNotified = true; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -32,7 +32,7 @@ Set<ObserverMethod<?, Egg>> observers = getCurrentManager().resolveObserverMethods(egg); assert observers.size() == 1; - // Notify the observer so we can confirm that it + // Reception the observer so we can confirm that it // is a method only on Farmer, and not LazyFarmer observers.iterator().next().notify(egg); assert egg.getClassesVisited().size() == 1; @@ -47,7 +47,7 @@ Set<ObserverMethod<?, StockPrice>> observers = getCurrentManager().resolveObserverMethods(stockPrice); assert observers.size() == 1; - // Notify the observer so we can confirm that it + // Reception the observer so we can confirm that it // is a method only on StockWatcher, and not IndirectStockWatcher observers.iterator().next().notify(stockPrice); assert stockPrice.getClassesVisited().size() == 1; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/NotEnabled.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/NotEnabled.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/NotEnabled.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -24,7 +24,7 @@ import java.lang.annotation.Target; import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Alternative Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -9,7 +9,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype() @Target( { TYPE, METHOD, FIELD }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -8,7 +8,7 @@ import java.util.Set; import javax.enterprise.context.RequestScoped; -import javax.enterprise.event.Notify; +import javax.enterprise.event.Reception; import javax.enterprise.event.Observes; import javax.enterprise.event.TransactionPhase; import javax.enterprise.inject.AnnotationLiteral; @@ -130,9 +130,9 @@ return TransactionPhase.IN_PROGRESS; } - public Notify notifyObserver() + public Reception notifyObserver() { - return Notify.ALWAYS; + return Reception.ALWAYS; } public Class<? extends Annotation> annotationType() Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/NamedStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/NamedStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/NamedStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; import javax.inject.Named; @Target(TYPE) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/AnimalStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/AnimalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/AnimalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -10,7 +10,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -38,12 +38,12 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.InjectionException; import javax.enterprise.inject.Specializes; +import javax.enterprise.inject.Stereotype; import javax.enterprise.inject.spi.AnnotatedType; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionPoint; import javax.enterprise.inject.spi.PassivationCapable; import javax.enterprise.inject.spi.InterceptionType; -import javax.enterprise.inject.stereotype.Stereotype; import javax.inject.Qualifier; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -9,7 +9,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; import javax.inject.Named; @Stereotype Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -9,7 +9,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; import javax.inject.Named; @Stereotype Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -26,7 +26,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; import javax.inject.Named; /** Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -26,7 +26,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; import javax.inject.Named; /** Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -9,7 +9,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -7,7 +7,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; import javax.inject.Named; @Stereotype Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -10,7 +10,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; import javax.inject.Named; @Stereotype Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Loggable.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Loggable.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Loggable.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/FooStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/FooStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/FooStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -9,7 +9,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/EnabledPolicyStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/EnabledPolicyStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/EnabledPolicyStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -25,7 +25,7 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @RequestScoped @Stereotype Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/NotEnabledPolicyStereotype.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/NotEnabledPolicyStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/NotEnabledPolicyStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -25,7 +25,7 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @RequestScoped @Stereotype Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/Mock.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/Mock.java 2009-10-23 21:29:18 UTC (rev 4246) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/Mock.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -24,7 +24,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD }) Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-10-23 21:29:18 UTC (rev 4246) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -27,9 +27,9 @@ import javax.enterprise.inject.Alternative; import javax.enterprise.inject.New; import javax.enterprise.inject.Specializes; +import javax.enterprise.inject.Stereotype; import javax.enterprise.inject.Typed; import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.stereotype.Stereotype; import javax.inject.Named; import javax.inject.Qualifier; Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-10-23 21:29:18 UTC (rev 4246) +++ core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -26,9 +26,9 @@ import javax.enterprise.context.Dependent; import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.event.Notify; import javax.enterprise.event.ObserverException; import javax.enterprise.event.Observes; +import javax.enterprise.event.Reception; import javax.enterprise.event.TransactionPhase; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.New; @@ -66,7 +66,7 @@ private final Set<Annotation> bindings; private final Type eventType; protected BeanManagerImpl manager; - private final Notify notifyType; + private final Reception notifyType; protected final RIBean<X> declaringBean; protected final MethodInjectionPoint<T, X> observerMethod; protected TransactionPhase transactionPhase; @@ -115,7 +115,7 @@ { // Make sure exactly one and only one parameter is annotated with Observes List<WeldParameter<?, X>> eventObjects = this.observerMethod.getAnnotatedParameters(Observes.class); - if (this.notifyType.equals(Notify.IF_EXISTS) && declaringBean.getScope().equals(Dependent.class)) + if (this.notifyType.equals(Reception.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"); } @@ -175,7 +175,7 @@ return bindings.toArray(new Annotation[0]); } - public Notify getNotify() + public Reception getReception() { return notifyType; } @@ -229,7 +229,7 @@ try { // Get the most specialized instance of the component - if (notifyType.equals(Notify.ALWAYS)) + if (notifyType.equals(Reception.ALWAYS)) { creationalContext = manager.createCreationalContext(declaringBean); } Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldAnnotated.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldAnnotated.java 2009-10-23 21:29:18 UTC (rev 4246) +++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldAnnotated.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -24,8 +24,8 @@ import java.util.Set; import javax.enterprise.context.NormalScope; +import javax.enterprise.inject.Stereotype; import javax.enterprise.inject.spi.Annotated; -import javax.enterprise.inject.stereotype.Stereotype; import javax.inject.Qualifier; import javax.inject.Scope; import javax.interceptor.InterceptorBinding; Modified: core/trunk/impl/src/main/java/org/jboss/weld/literal/StereotypeLiteral.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/literal/StereotypeLiteral.java 2009-10-23 21:29:18 UTC (rev 4246) +++ core/trunk/impl/src/main/java/org/jboss/weld/literal/StereotypeLiteral.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -17,7 +17,7 @@ package org.jboss.weld.literal; import javax.enterprise.inject.AnnotationLiteral; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; public class StereotypeLiteral extends AnnotationLiteral<Stereotype> implements Stereotype { Modified: core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/StereotypeModel.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/StereotypeModel.java 2009-10-23 21:29:18 UTC (rev 4246) +++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/StereotypeModel.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -27,7 +27,7 @@ import javax.enterprise.context.NormalScope; import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; import javax.inject.Named; import javax.inject.Qualifier; import javax.inject.Scope; Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalOrderStereotype.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalOrderStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalOrderStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalStereotype.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -9,7 +9,7 @@ import java.lang.annotation.Target; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/RequestScopedAnimalStereotype.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/RequestScopedAnimalStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/RequestScopedAnimalStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.stereotype.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE }) Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-10-23 21:29:18 UTC (rev 4246) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -4,8 +4,8 @@ import java.util.Iterator; import java.util.Set; +import javax.enterprise.inject.Stereotype; import javax.enterprise.inject.spi.AnnotatedType; -import javax.enterprise.inject.stereotype.Stereotype; import javax.inject.Qualifier; import org.jboss.testharness.impl.packaging.Artifact; Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorStereotype.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorStereotype.java 2009-10-23 21:29:18 UTC (rev 4246) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorStereotype.java 2009-10-24 00:06:03 UTC (rev 4247) @@ -17,12 +17,14 @@ package org.jboss.weld.test.unit.interceptor.simple; -import javax.enterprise.inject.stereotype.Stereotype; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import javax.enterprise.inject.Stereotype; + /** * @author <a href="mailto:mariusb@redhat.com">Marius Bogoevici</a> */