[webbeans-commits] Webbeans SVN: r2896 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck: tests/context/application/standalone and 88 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Thu Jun 25 19:12:37 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-06-25 19:12:36 -0400 (Thu, 25 Jun 2009)
New Revision: 2896
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithBindingTypes_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/StereotypeWithEmptyNamed.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/AnotherStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/HornedMammalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/FishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/BeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/InitializerBean_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/BeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/BeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/BeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/BeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AsynchronousObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DogWhisperer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Farmer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OrangeCheekedWaxbill.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OwlFinch_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/PomeranianInterface.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Shop.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StaticObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockWatcher.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StringObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TeaCupPomeranian.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withTypeVariable/JavaSparrow_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withWildcardType/GoldbreastWaxbill_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/BlackRumpedWaxbill_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/FoxTerrier_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/AustralianTerrier_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/BorderTerrier_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/TibetanTerrier_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TeaCupPomeranian.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/CheckedExceptionWrappedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/TeaCupPomeranian.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/NonSimpleBean_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TooManyPhases_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/Terrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/tooManyObserverParameters/YorkshireTerrier_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/EnterpriseEventInheritenceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/Farmer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/FarmerLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/StockWatcher.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/StockWatcherLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/GenericBostonTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/WildBostonTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ConsumerNotifiedForEventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToRemoveObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToAddObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ObserverExceptionAbortsTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/DuplicateBindingsToRemoveObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/AuroraFinch.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/BlueFacedParrotFinch.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/FinchKeeper.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/OrangeCheekedWaxbill.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/RegisterObserversUsingImplicitEventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/StarFinch.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeFamily/AllEventTypesObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/AnotherFooObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/FooObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogTrainer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetriever.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducerNotUsed.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/Other.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java
Log:
Update API to 20090625, mark all old methods still required by TCK as @Deprecated, new methods in RI are throw new UnsupportedOperationException()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -6,7 +6,6 @@
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InjectionPoint;
public abstract class ForwardingBean<T> implements Bean<T>
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.context.application.standalone;
import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Notify;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
-import javax.event.Notify;
-import javax.event.Observes;
class TcasDisplay
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.context.application.standalone;
+import javax.enterprise.event.Notify;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
-import javax.event.Notify;
-import javax.event.Observes;
class TcasToFmsLink
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -2,9 +2,9 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.Dependent;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
-import javax.event.Observes;
@ApplicationScoped
class ApplicationHorseStable
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -2,10 +2,10 @@
import javax.annotation.PreDestroy;
import javax.enterprise.context.Dependent;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Current;
import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.spi.BeanManager;
-import javax.event.Observes;
@Dependent
class HorseStable
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.context.request.standalone;
import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Notify;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
-import javax.event.Notify;
-import javax.event.Observes;
import org.jboss.jsr299.tck.impl.OldSPIBridge;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -9,7 +9,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -8,7 +8,7 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Named;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -8,7 +8,7 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Named;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -6,7 +6,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -6,7 +6,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -6,7 +6,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -8,7 +8,7 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Named;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -6,7 +6,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -9,7 +9,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.definition.scope;
+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.ElementType.FIELD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -8,7 +8,7 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Named;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -7,7 +7,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -10,7 +10,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -8,7 +8,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -7,7 +7,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@ApplicationScoped
@Stereotype(supportedScopes=ApplicationScoped.class)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -6,7 +6,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -7,7 +7,7 @@
import java.lang.annotation.Target;
import javax.enterprise.inject.Named;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -9,7 +9,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -7,7 +7,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -6,8 +6,8 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Stereotype;
import javax.enterprise.inject.deployment.Production;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -8,7 +8,7 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithBindingTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithBindingTypes_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithBindingTypes_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -6,7 +6,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/StereotypeWithEmptyNamed.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/StereotypeWithEmptyNamed.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/StereotypeWithEmptyNamed.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -7,7 +7,7 @@
import java.lang.annotation.Target;
import javax.enterprise.inject.Named;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -10,7 +10,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/AnotherStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/AnotherStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/AnotherStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -8,7 +8,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/HornedMammalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/HornedMammalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -6,7 +6,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/AnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/AnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -9,7 +9,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/FishStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/FishStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -7,7 +7,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,9 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle;
+import javax.enterprise.context.spi.Context;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.ObserverMethod;
class InitializedBinding implements AfterBeanDiscovery
{
@@ -8,4 +11,19 @@
{
throw new RuntimeException(t);
}
+
+ public void addBean(Bean<?> bean)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void addContext(Context context)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void addObserverMethod(ObserverMethod<?, ?> observerMethod)
+ {
+ throw new UnsupportedOperationException();
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -2,11 +2,11 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
import javax.enterprise.inject.spi.BeanManager;
-import javax.event.Observes;
class ManagerObserver
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/BeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/BeanDiscoveryObserver.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/BeanDiscoveryObserver.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken1;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.event.Observes;
class BeanDiscoveryObserver
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/InitializerBean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/InitializerBean_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/InitializerBean_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken1;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Initializer;
-import javax.event.Observes;
class InitializerBean_Broken
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/BeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/BeanDiscoveryObserver.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/BeanDiscoveryObserver.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken2;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.event.Observes;
class BeanDiscoveryObserver
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken3;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.event.Observes;
class BeanDiscoveryObserver
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/BeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/BeanDiscoveryObserver.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/BeanDiscoveryObserver.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken4;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.event.Observes;
class BeanDiscoveryObserver
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/BeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/BeanDiscoveryObserver.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/BeanDiscoveryObserver.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken5;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.event.Observes;
class BeanDiscoveryObserver
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/BeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/BeanDiscoveryObserver.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/BeanDiscoveryObserver.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken6;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.event.Observes;
class BeanDiscoveryObserver
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -9,7 +9,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype()
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AsynchronousObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AsynchronousObserver.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AsynchronousObserver.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event;
-import javax.event.Notify;
-import javax.event.Observes;
+import javax.enterprise.event.Notify;
+import javax.enterprise.event.Observes;
public class AsynchronousObserver
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -2,9 +2,9 @@
import java.util.Set;
+import javax.enterprise.event.Observer;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.BeanManager;
-import javax.event.Observer;
-import javax.event.Observes;
/**
* Simple bean with observer method and another injectable parameter.
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
class BullTerrier
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
@DisabledDeploymentType
class DisabledStringObserver
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DogWhisperer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DogWhisperer.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DogWhisperer.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event;
+import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
-import javax.event.Event;
class DogWhisperer
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -5,13 +5,13 @@
import java.util.Set;
import javax.enterprise.context.Dependent;
+import javax.enterprise.event.Event;
+import javax.enterprise.event.Observer;
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.deployment.Standard;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
-import javax.event.Event;
-import javax.event.Observer;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes @AnotherDeploymentType
class FarmShop extends Shop
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Farmer.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Farmer.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
class Farmer
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OrangeCheekedWaxbill.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OrangeCheekedWaxbill.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OrangeCheekedWaxbill.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event;
-import javax.event.Event;
+import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OwlFinch_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OwlFinch_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OwlFinch_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.event;
-import javax.event.Event;
+import javax.enterprise.event.Event;
+import javax.enterprise.event.Observer;
import javax.enterprise.inject.Any;
-import javax.event.Observer;
class OwlFinch_Broken
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Named;
-import javax.event.Observes;
@Named("Teddy")
class Pomeranian
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/PomeranianInterface.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/PomeranianInterface.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/PomeranianInterface.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event;
import javax.ejb.Local;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
@Local
public interface PomeranianInterface
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.event;
import javax.enterprise.context.RequestScoped;
-import javax.event.Notify;
-import javax.event.Observes;
+import javax.enterprise.event.Notify;
+import javax.enterprise.event.Observes;
/**
* Simple web bean that conditionally listens to events.
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Shop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Shop.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Shop.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
class Shop
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.event;
import javax.ejb.Stateful;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Named;
-import javax.event.Observes;
@Stateful
@Tame
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StaticObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StaticObserver.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StaticObserver.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event;
import javax.enterprise.context.RequestScoped;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
@RequestScoped class StaticObserver
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockWatcher.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockWatcher.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockWatcher.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
class StockWatcher
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StringObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StringObserver.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StringObserver.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
class StringObserver
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.event;
+import javax.enterprise.event.Event;
+import javax.enterprise.event.Observer;
import javax.enterprise.inject.Any;
-import javax.event.Event;
-import javax.event.Observer;
class SweeWaxbill
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TeaCupPomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TeaCupPomeranian.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TeaCupPomeranian.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Named;
-import javax.event.Observes;
@Tame
@Named("Teddy")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withTypeVariable/JavaSparrow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withTypeVariable/JavaSparrow_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withTypeVariable/JavaSparrow_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.broken.inject.withTypeVariable;
+import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
-import javax.event.Event;
class JavaSparrow_Broken
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withWildcardType/GoldbreastWaxbill_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withWildcardType/GoldbreastWaxbill_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withWildcardType/GoldbreastWaxbill_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.broken.inject.withWildcardType;
+import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
-import javax.event.Event;
class GoldbreastWaxbill_Broken
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/BlackRumpedWaxbill_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/BlackRumpedWaxbill_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/BlackRumpedWaxbill_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.broken.inject.withoutType;
+import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
-import javax.event.Event;
class BlackRumpedWaxbill_Broken
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -19,9 +19,9 @@
import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.jboss.jsr299.tck.DefinitionError;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/FoxTerrier_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/FoxTerrier_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/FoxTerrier_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.isDisposer;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.event.Observes;
class FoxTerrier_Broken
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/AustralianTerrier_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/AustralianTerrier_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/AustralianTerrier_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.isInitializer;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.event.Observes;
class AustralianTerrier_Broken
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/BorderTerrier_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/BorderTerrier_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/BorderTerrier_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.isProducer;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.event.Observes;
class BorderTerrier_Broken
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/TibetanTerrier_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/TibetanTerrier_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/TibetanTerrier_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.notBusinessMethod;
import javax.ejb.Stateless;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
@Stateless
class TibetanTerrier_Broken implements Terrier
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TeaCupPomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TeaCupPomeranian.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TeaCupPomeranian.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.broken.observer10;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Named;
-import javax.event.Observes;
@Tame
@Named("Teddy")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/CheckedExceptionWrappedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/CheckedExceptionWrappedTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/CheckedExceptionWrappedTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.event.broken.observer11;
-import javax.event.ObserverException;
+import javax.enterprise.event.ObserverException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/TeaCupPomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/TeaCupPomeranian.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/TeaCupPomeranian.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.broken.observer11;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Named;
-import javax.event.Observes;
@Tame
@Named("Teddy")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/NonSimpleBean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/NonSimpleBean_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/NonSimpleBean_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.event.broken.observer12;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
/**
* This bean is neither simple nor session. As such, an observer method is not
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TooManyPhases_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TooManyPhases_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TooManyPhases_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -16,9 +16,9 @@
*/
package org.jboss.jsr299.tck.tests.event.broken.observer7;
-import javax.event.AfterTransactionFailure;
-import javax.event.AfterTransactionSuccess;
-import javax.event.Observes;
+import javax.enterprise.event.AfterTransactionFailure;
+import javax.enterprise.event.AfterTransactionSuccess;
+import javax.enterprise.event.Observes;
/**
* The observer method defined here has too many transactional phases
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/Terrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/Terrier.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/Terrier.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.event.broken.observer8;
-import javax.event.BeforeTransactionCompletion;
-import javax.event.Notify;
-import javax.event.Observes;
+import javax.enterprise.event.BeforeTransactionCompletion;
+import javax.enterprise.event.Notify;
+import javax.enterprise.event.Observes;
class Terrier
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/tooManyObserverParameters/YorkshireTerrier_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/tooManyObserverParameters/YorkshireTerrier_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/tooManyObserverParameters/YorkshireTerrier_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.broken.tooManyObserverParameters;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.event.Observes;
class YorkshireTerrier_Broken
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/EnterpriseEventInheritenceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/EnterpriseEventInheritenceTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/EnterpriseEventInheritenceTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -2,7 +2,7 @@
import java.util.Set;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/Farmer.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/Farmer.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.enterprise;
import javax.ejb.Stateful;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
@Stateful
public class Farmer implements FarmerLocal
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/FarmerLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/FarmerLocal.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/FarmerLocal.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.enterprise;
import javax.ejb.Local;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
@Local
public interface FarmerLocal
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/StockWatcher.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/StockWatcher.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/StockWatcher.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.enterprise;
import javax.ejb.Stateful;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
@Stateful
public class StockWatcher implements StockWatcherLocal
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/StockWatcherLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/StockWatcherLocal.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/StockWatcherLocal.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.enterprise;
import javax.ejb.Local;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
@Local
public interface StockWatcherLocal
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/GenericBostonTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/GenericBostonTerrier.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/GenericBostonTerrier.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -2,7 +2,7 @@
import java.util.List;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
class GenericBostonTerrier
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/WildBostonTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/WildBostonTerrier.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/WildBostonTerrier.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -2,7 +2,7 @@
import java.util.List;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
class WildBostonTerrier
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -9,7 +9,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype()
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ConsumerNotifiedForEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ConsumerNotifiedForEventTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ConsumerNotifiedForEventTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -2,7 +2,7 @@
import java.lang.annotation.Annotation;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.register.observer1;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToRemoveObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToRemoveObserverTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToRemoveObserverTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.register.observer1;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -20,7 +20,7 @@
import java.lang.annotation.Annotation;
import java.util.Set;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToAddObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToAddObserverTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToAddObserverTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.register.observer1;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ObserverExceptionAbortsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ObserverExceptionAbortsTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ObserverExceptionAbortsTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.register.observer1;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -9,7 +9,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype()
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/DuplicateBindingsToRemoveObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/DuplicateBindingsToRemoveObserverTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/DuplicateBindingsToRemoveObserverTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.register.observer2;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -20,7 +20,7 @@
import java.lang.annotation.Annotation;
import java.util.Set;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/AuroraFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/AuroraFinch.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/AuroraFinch.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.event.registerUsingEvent;
+import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Initializer;
-import javax.event.Event;
import org.jboss.jsr299.tck.tests.event.registerUsingEvent.StarFinch.Mess;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/BlueFacedParrotFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/BlueFacedParrotFinch.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/BlueFacedParrotFinch.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.event.registerUsingEvent;
+import javax.enterprise.event.Event;
+import javax.enterprise.event.Observer;
import javax.enterprise.inject.Any;
-import javax.event.Event;
-import javax.event.Observer;
class BlueFacedParrotFinch
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/FinchKeeper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/FinchKeeper.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/FinchKeeper.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.registerUsingEvent;
import javax.enterprise.context.RequestScoped;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
import org.jboss.jsr299.tck.tests.event.registerUsingEvent.StarFinch.Mess;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/OrangeCheekedWaxbill.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/OrangeCheekedWaxbill.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/OrangeCheekedWaxbill.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.event.registerUsingEvent;
+import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Initializer;
-import javax.event.Event;
import org.jboss.jsr299.tck.tests.event.registerUsingEvent.StarFinch.Mess;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/RegisterObserversUsingImplicitEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/RegisterObserversUsingImplicitEventTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/RegisterObserversUsingImplicitEventTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -18,7 +18,7 @@
import java.util.Set;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/StarFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/StarFinch.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/registerUsingEvent/StarFinch.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.event.registerUsingEvent;
+import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Produces;
-import javax.event.Event;
public class StarFinch
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.resolve.binding;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -2,7 +2,7 @@
import java.util.Set;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -2,7 +2,7 @@
import java.util.Set;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -9,7 +9,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype()
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -2,7 +2,7 @@
import java.util.Set;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeFamily/AllEventTypesObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeFamily/AllEventTypesObserver.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeFamily/AllEventTypesObserver.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.event.resolve.typeFamily;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
/**
* This class declares observer methods for every superclass and interface
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/AnotherFooObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/AnotherFooObserver.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/AnotherFooObserver.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.resolve.typeWithParameters;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
public class AnotherFooObserver
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -2,7 +2,7 @@
import java.util.ArrayList;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -2,7 +2,7 @@
import java.util.Set;
-import javax.event.Observer;
+import javax.enterprise.event.Observer;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/FooObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/FooObserver.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/FooObserver.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.resolve.typeWithParameters;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
public class FooObserver
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogTrainer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogTrainer.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogTrainer.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -6,8 +6,8 @@
import javax.ejb.EJBException;
import javax.ejb.Stateless;
import javax.ejb.TransactionManagement;
-import javax.event.BeforeTransactionCompletion;
-import javax.event.Observes;
+import javax.enterprise.event.BeforeTransactionCompletion;
+import javax.enterprise.event.Observes;
import javax.transaction.UserTransaction;
@Stateless
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -13,12 +13,12 @@
import javax.ejb.Stateful;
import javax.ejb.TransactionManagement;
import javax.enterprise.context.SessionScoped;
+import javax.enterprise.event.AfterTransactionCompletion;
+import javax.enterprise.event.AfterTransactionFailure;
+import javax.enterprise.event.AfterTransactionSuccess;
+import javax.enterprise.event.BeforeTransactionCompletion;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Named;
-import javax.event.AfterTransactionCompletion;
-import javax.event.AfterTransactionFailure;
-import javax.event.AfterTransactionSuccess;
-import javax.event.BeforeTransactionCompletion;
-import javax.event.Observes;
import javax.transaction.SystemException;
import javax.transaction.UserTransaction;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken4;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
-import javax.event.Observes;
@AnotherDeploymentType
class SpiderProducer_Broken
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -10,7 +10,7 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Named;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -10,7 +10,7 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Named;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetriever.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetriever.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetriever.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -3,7 +3,7 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.enterprise.context.RequestScoped;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
@Stateful
@RequestScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -6,7 +6,6 @@
import javax.enterprise.context.Dependent;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.Current;
import javax.enterprise.inject.New;
import javax.enterprise.inject.deployment.Standard;
import javax.enterprise.inject.spi.Bean;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedObserves;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Initializer;
-import javax.event.Observes;
class Grouse_Broken
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -7,7 +7,6 @@
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.deployment.Production;
import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Bean;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -27,8 +27,8 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Named;
-import javax.enterprise.inject.Stereotype;
import javax.enterprise.inject.deployment.Production;
+import javax.enterprise.inject.stereotype.Stereotype;
/**
* Test stereotype used to change the scope type and deployment type
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -18,7 +18,7 @@
package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle;
import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
/**
* This bean contains a producer field and specializes another bean
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -27,8 +27,8 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Named;
-import javax.enterprise.inject.Stereotype;
import javax.enterprise.inject.deployment.Production;
+import javax.enterprise.inject.stereotype.Stereotype;
/**
* Test stereotype used to change the scope type and deployment type
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@AnotherDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -9,7 +9,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise;
import javax.ejb.Stateful;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@AnotherDeploymentType
@Stateful
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@AnotherDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducerNotUsed.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducerNotUsed.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducerNotUsed.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle;
-import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
public class SpiderProducerNotUsed
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.parameterAnnotatedObserves;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.deployment.Production;
-import javax.event.Observes;
@Production
class SpiderProducer_Broken
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -9,7 +9,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasObservesParameter;
-import javax.event.Observes;
+import javax.enterprise.event.Observes;
class ObservingConstructor_Broken
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -8,7 +8,7 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Named;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@AnotherDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -7,7 +7,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class)
@Target( { TYPE })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -11,7 +11,7 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Named;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean;
+import javax.enterprise.event.Observes;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
-import javax.event.Observes;
@AnimalStereotype
class Fox
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise;
import javax.ejb.Stateful;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes @Lazy
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise;
import javax.ejb.Stateful;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsNothing;
import javax.ejb.Stateful;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@Stateful
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean;
import javax.ejb.Stateful;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@AnotherDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing;
import javax.ejb.Stateful;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@AnotherDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -2,7 +2,7 @@
import javax.ejb.Stateful;
import javax.enterprise.inject.Named;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@AnotherDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence;
import javax.ejb.Stateful;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@Stateful
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean;
import javax.ejb.Stateful;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@AnotherDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean;
import javax.ejb.Stateful;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@AnotherDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method;
import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
class JewelryShop extends Shop
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride;
import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
class ShoeShop_Broken extends MallShop
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence;
import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
class ClothesShop_Broken extends Shop
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod;
import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
class FurnitureShop_Broken extends Shop
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -2,7 +2,7 @@
import javax.enterprise.inject.Named;
import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
class HighSchool_Broken extends School
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean;
import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
class Bookshop_Broken extends Shop
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean;
import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
class PictureShop_Broken extends Shop
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes @Lazy
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@AnotherDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names;
import javax.enterprise.inject.Named;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@AnotherDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@AnotherDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@AnotherDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@AnotherDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.precedence;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
class OrganicFarmer_Broken extends Farmer
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes
@AnotherDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two;
-import javax.enterprise.inject.deployment.Specializes;
+import javax.enterprise.inject.Specializes;
@Specializes @AnotherDeploymentType
class SheepFarmer_Broken extends Farmer
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -17,8 +17,6 @@
package org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution;
-import javax.enterprise.inject.AmbiguousResolutionException;
-
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/Other.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/Other.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/Other.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -7,7 +7,6 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -1,7 +1,5 @@
package org.jboss.jsr299.tck.tests.lookup.injection;
-import javax.enterprise.context.ContextNotActiveException;
-
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java 2009-06-25 23:09:58 UTC (rev 2895)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java 2009-06-25 23:12:36 UTC (rev 2896)
@@ -9,7 +9,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE, METHOD, FIELD })
More information about the weld-commits
mailing list