[webbeans-commits] Webbeans SVN: r1738 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/integration and 261 other directories.

Author: pete.muir(a)jboss.org Date: 2009-02-27 11:54:09 -0500 (Fri, 27 Feb 2009) New Revision: 1738 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextIntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DummyContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DummyScoped.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyApplicationBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyContextual.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MySessionBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Big.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/City.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/FooConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Helsinki.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/HelsinkiLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Hyvinkaa.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jamsa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Joensuu.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jyvaskyla.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kajaani.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kuopio_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/London_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Loviisa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/MaarianHaminaLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Maarianhamina_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Mikkeli_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Nokia_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/NumberConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextIntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Salo_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/SerializableFoo.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Turku.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/TurkuLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Uusikaupunki_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Vaasa.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation2.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/BorderCollie.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DisabledDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Dog.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/GoldenLabrador.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/GoldenRetriever.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedAnimalDeploymentType.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/Horse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/InheritedDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Labrador.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/NotInheritedDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Reindeer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Retriever.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Rhinoceros.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/ShetlandPony.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/BrokenDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Animal.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/AnotherScope.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/BorderCollie.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Dog.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/GoldenLabrador.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/GoldenRetriever.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Grayling.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Horse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Labrador.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Minnow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Mullet.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/NotInheritedScope.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Pollock.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Retriever.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/scope/ScopeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ShetlandPony.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Animal.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/AnotherDeploymentType.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/BorderCollie.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.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/Horse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/LongHairedDog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Moose.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Reindeer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShetlandPony.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/ 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/AnimalStereotypeAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.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/ConditionalEvent.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Delivery.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EJBEvent.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Egg.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/FiresBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/LazyFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/MultiBindingType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/ObservedType1.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/ObservedType2.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/Role.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.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/SimpleEventType.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/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/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.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/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/commonAnnotations/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/decorator/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Giraffe.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/GiraffeLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/PitbullLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessDecorator/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessInterceptor/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/AndalusianChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenHutch.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Fox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/LocalChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/interceptor/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/jms/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AsAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/InfertileChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.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/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.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/definition/Static.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/WolfSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/disposal/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/disposal/definition/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/notBusinessMethod/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ClovenHoved.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Cow_NotBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Donkey.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockFilter.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockHttpSessionListener.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockServlet.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockServletContextListener.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockServletRequestListener.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockUIComponent.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/OuterClass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ParameterizedClass_NotBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Sheep.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Tiger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Turkey.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Lion.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/WrappedSimpleBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Building.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/BuildingLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmerLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Lazy.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/LazyFarmerLocal.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/OfficeLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/TractorLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Waste.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Yard.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/YardInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Expensive.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/Necklace.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Product.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Sparkly.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Building.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Lazy.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/SimpleBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Waste.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Chunky.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Cod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Haddock.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Salmon.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ScottishFish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Sole.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Whitefish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Fox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/TunedTuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unknown/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/BeanWithFinalBoundField_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/BeanWithStaticBoundField_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/DeluxeHenHouse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Fox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/FoxRun.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/HenHouse.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/injection/SpiderNest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/TunaFarm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/FishFarmOffice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/dependent/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/broken/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/custom/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/defintion/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/register/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/register/fires1/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/realization/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendSimpleBean/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/byname/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/non/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextIntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DestroyedInstanceReturnedByGetTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DummyContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DummyScoped.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetOnInactiveContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetWithNoCreationalContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MyApplicationBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MyContextual.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MyCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MySessionBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/application/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/conversation/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Big.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/City.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer2.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/FooConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Generator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Helsinki.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/HelsinkiLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Hyvinkaa.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Jamsa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Joensuu.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Jyvaskyla.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kajaani.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kuopio_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/London_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/MaarianHaminaLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Maarianhamina_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Mikkeli_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Nokia_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/NumberConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextIntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Salo_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/SerializableFoo.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Turku.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/TurkuLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Uusikaupunki_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Vaasa.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation2.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/request/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/session/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/BorderCollie.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DisabledDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Dog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/GoldenLabrador.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/GoldenRetriever.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/HornedAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Horse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/InheritedDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Labrador.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/MammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/NotInheritedDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Reindeer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Retriever.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Rhinoceros.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/ShetlandPony.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/tooMany/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/defaultDeploymentType/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/nonBuiltInUsesStandard/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnotherScope.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnotherScopeType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/BorderCollie.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Dog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/GoldenLabrador.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/GoldenRetriever.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Grayling.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Horse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Labrador.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Minnow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Mullet.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/NotInheritedScope.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Pollock.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Retriever.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/RiverFishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ShetlandPony.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/tooMany/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/AnotherStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/BorderCollie.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Goldfish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/HighlandCow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/HornedAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Horse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/LongHairedDog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Moose.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Reindeer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/RequestScopedAnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/ShetlandPony.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Springbok.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnimalStereotypeAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BananaSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BullTerrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ConditionalEvent.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Delivery.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EJBEvent.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FarmShop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FiresBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/LazyFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/MultiBindingType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType1.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType2.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OwlFinch_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Pomeranian.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/PomeranianInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/RecluseSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Role.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/RoleBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SimpleEventType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Spitz.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StaticObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StringObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SweeWaxbill.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TameAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TeaCupPomeranian.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer12/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/firesall/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/binding/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/nonbinding/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/type/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/transactionalObservers/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/commonAnnotations/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/decorator/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Giraffe.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/GiraffeLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Labrador.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Laika.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Pitbull.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/PitbullLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessDecorator/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessInterceptor/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/lifecycle/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/remove/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithConversationScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithApplicationScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithConversationScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithRequestScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithSessionScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/ChickenHutch.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/EjbInitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Fox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/methodAnnotatedProduces/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/interceptor/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/jms/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AsAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidowProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Foo.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/InfertileChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/OtherSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderAsAnimalProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Static.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/StaticTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/WolfSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/disposal/definition/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedDisposes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedObserves/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ClovenHoved.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Cow_NotBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Donkey.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockEnterpriseBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockFilter.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockHttpSessionListener.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServlet.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletContextListener.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletRequestListener.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockUIComponent.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/OuterClass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ParameterizedClass_NotBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Sheep.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/SimpleBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Tiger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Turkey.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/dependentWithPublicField/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Lion.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/WrappedSimpleBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Building.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Lazy.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmerLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Office.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OfficeLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/TractorLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Waste.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Yard.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/YardInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/JewelryShop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Necklace.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Product.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Sparkly.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Building.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Lazy.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/LazyFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Office.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Waste.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Chunky.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Cod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Haddock.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Plaice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Salmon.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ScottishFish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Sole.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Whitefish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Fox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/TunedTuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/el/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/DeluxeHenHouse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/Fox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FoxRun.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/HenHouse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/SpiderNest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/TunaFarm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/FishFarmOffice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/ManagerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/jndi/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/nonContextual/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/dependent/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/passivating/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/broken/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/custom/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/register/fires1/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/realization/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendSimpleBean/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/byname/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/injection/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.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/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextIntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Farm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Fox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxRun.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Horse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseInStableEvent.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/dependent/MyCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Stable.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/CityBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/DependentInterceptorSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/Kaarina_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/Hamina_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/CityInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/DependentDecoratorSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/Porvoo_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/CityBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/DependentInterceptorSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/Kotka_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/CityInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/DependentDecoratorSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/Raisio_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Vantaa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/City.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Loviisa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Forssa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/City.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Peraseinajoki.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation2.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/EspooLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Animal.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/BeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/DependentFinalTuna.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/bean/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/WolfSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Barn.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BorderCollie.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cat.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Chunky.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ChunkyBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ClippedBorderCollie.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Hairy.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/HairyBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Horse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/LongHairedDog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MockCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Produced.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ScottishFish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ShetlandPony.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Species.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Synchronous.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SynchronousBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/TameBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Whitefish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/WhitefishBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/HornedAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/Gazelle_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Animal.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/Haddock.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Minnow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Moose.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RedSnapper.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/name/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/Scallop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/TooManyScopesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/Deer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/FallowDeer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/Chair_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/RequiredTypeNotImplementedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Antelope_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Bovine.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Mammal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/RequiredTypesMergedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/Carp_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/ScopeNotSupportedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/Gazelle_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/Elk_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/RoeDeer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/CommonWaxbill_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/BlackRumpedWaxbill_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/GoldbreastWaxbill_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/JavaSparrow_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/Terrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/TibetanTerrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrown.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TameAnnotationLiteral.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/Tame.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/observer12/ObserverMethodOnIncorrectBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/Boxer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/YorkshireTerrier_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/BostonTerrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/BorderTerrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/AustralianTerrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/FoxTerrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.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/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.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/observer9/AsynchronousConditionalObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/Terrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/AbstractEvent.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/AllEventTypesObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/AllEventTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/ComplexEvent.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/GeneralEvent.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AuroraFinch.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BirdCage.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BlueFacedParrotFinch.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/FinchKeeper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/ImplicitEventBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OrangeCheekedWaxbill.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/StarFinch.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/Tame.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/AnimalStereotypeAnnotationLiteral.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/NonBindingTypesToRemoveObserverTest.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/observer1/Role.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/RoleBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/TameAnnotationLiteral.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/AnimalStereotypeAnnotationLiteral.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/register/observer2/NonBindingTypesToRemoveObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Role.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/RoleBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/TameAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeA.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeB.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeC.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.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/AnimalStereotypeAnnotationLiteral.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/type/ChecksEventTypeWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/UnusedEventType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Agent.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogAgent.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.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/event/transactionalObservers/PomeranianInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/commonAnnotations/ResourceInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/decorator/DecoratorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessDecorator/PekingeseLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessDecorator/Pekingese_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessDecorator/StatelessDecoratorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessInterceptor/PugLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessInterceptor/Pug_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessInterceptor/StatelessInterceptorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.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/GoldenRetrieverLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Lion.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/LionLocal.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/enterprise/newBean/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/OrderLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBeanLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/DachshundLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/BoxerLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/BeagleLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/BullmastiffLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ChickenHutch.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/DangerCall.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/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/Dottrel_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/interceptor/InterceptorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/jms/JmsDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Null.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.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/Spider.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/field/lifecycle/StaticTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Working.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/Animal.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/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/BeanWithStaticProducerMethod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Bite.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/WolfSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Yummy.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/disposal/definition/DisposalMethodDefinitionTest.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/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/FooException.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/InfertileChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lorry.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Null.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Request.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Ship.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/notBusinessMethod/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/notBusinessMethod/NotABusinessMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/notBusinessMethod/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.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/parametermizedTypeWithTypeParameter/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/Animal.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/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/Duck.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.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/definition/dependentWithPublicField/DependentWithPublicFieldTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/BookOrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/CdOrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Duck.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Farm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FarmOffice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishPond.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/FooException.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Goldfish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Lion.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Lorry_Broken.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/NovelOrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/OrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RedSnapper.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/lifecycle/SimpleBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Synchronous.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Van_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractCow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractFarmHouse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractHorse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractKennel.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractStable.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Cow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/CowDung.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Cuddly.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Dog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Donkey.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Dung.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/FarmAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/FarmHouse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Horse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/HorseDung.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/LabradorKennel.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/RealizationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Smelly.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Stable.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/TameCow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/TameHorse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/CowLocal_Broken.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/directlyExtendsNothing/DirectlyExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/TractorLocal.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/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.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/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.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/sameName/SameNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/Yard.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/YardInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/FarmerLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Landowner.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/samePrecedence/SamePrecedenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FarmerInterface.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/Landowner.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/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/MallShop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Product.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/indirectOverride/Shop.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/lowerprecedence/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Product.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.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/specializesStaticMethod/Product.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.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/specializingAndSpecializedBeanHaveName/Pupil.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.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/Expensive.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/producer/method/twoBeansSpecializeTheSameBean/Product.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipmentLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.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/AnotherDeploymentType.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/names/SpecializingAndSpecializedBeanHasNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/Yard.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.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/noextend1/SpecializingBeanImplementsInterfaceOnly.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.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/noextend2/SpecializingBeanExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Landowner.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/precedence/SpecializingBeanWithLowerPrecedenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Farmer.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/Landowner.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/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Cod.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/byname/duplicateNameResolution/Sole.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unknown/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unknown/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unknown/UnknownBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FinalTuna_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouseProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouse_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Animal.java 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/AnimalStereotypeAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Chunky.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Cod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/FakeFish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/InstantiationByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/ParameterizedBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Salmon.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/ScottishFish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Sole.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Whitefish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Chunky.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FakeFish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FishILike.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Haddock.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Halibut.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ParameterizedBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/RoundWhitefish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Salmon.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Sole.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Whitefish.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/dependent/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/broken/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/custom/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/register/fires1/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/realization/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/byname/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/beans.xml tck/trunk/impl/src/main/resources/tck-tests.xml Log: repackage tests Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextIntegrationTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextIntegrationTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextIntegrationTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextIntegrationTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.jsr299.tck.tests.context; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + */ +@Artifact +@IntegrationTest +public class ContextIntegrationTest +{ + @Test(groups = { "stub", "contexts", "integration" }) + @SpecAssertion(section = "8.5", id = "c") + public void testBuiltInNormalScopedContextsDoNotPropagateAcrossRemoteMethodInvocations() + { + assert false; + } + + @Test(groups = { "stub", "contexts", "integration" }) + @SpecAssertion(section = "8.5", id = "c") + public void testBuiltInNormalScopedContextsDoNotPropagateAcrossAsynchronousMethodInvocations() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextIntegrationTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,106 @@ +package org.jboss.jsr299.tck.tests.context; + +import java.lang.annotation.Annotation; + +import javax.context.Context; +import javax.context.ContextNotActiveException; +import javax.context.Contextual; +import javax.context.CreationalContext; +import javax.context.RequestScoped; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + */ +@Artifact +public class ContextTest extends AbstractDeclarativeTest +{ + + private @interface Dummy + { + + } + + private @interface Unregistered + { + + } + + private static class DummyContext implements Context + { + + public <T> T get(Contextual<T> bean, CreationalContext<T> creationalContext) + { + throw new UnsupportedOperationException(); + } + + public <T> T get(Contextual<T> contextual) + { + return get(contextual, null); + } + + public Class<? extends Annotation> getScopeType() + { + return Dummy.class; + } + + public boolean isActive() + { + return true; + } + } + + @Test(expectedExceptions = { ContextNotActiveException.class }, groups = { "manager" }) + @SpecAssertion(section = "8.6", id = "c") + public void testGetContextWithNoActiveContextsFails() + { + getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getRequestContext()); + getCurrentManager().getContext(RequestScoped.class); + } + + @Test(expectedExceptions = { IllegalStateException.class }, groups = { "manager" }) + @SpecAssertion(section = "8.6", id = "d") + public void testGetContextWithTooManyActiveContextsFails() + { + Context firstContext = new DummyContext() + { + }; + Context secondContext = new DummyContext() + { + }; + getCurrentManager().addContext(firstContext); + getCurrentManager().addContext(secondContext); + getCurrentManager().getContext(Dummy.class); + } + + @Test(expectedExceptions = { ContextNotActiveException.class }, groups = { "manager" }) + @SpecAssertion(section = "8.6", id = "c") + public void testGetContextWithNoRegisteredContextsFails() + { + getCurrentManager().getContext(Unregistered.class); + } + + @Test(groups = { "manager" }) + @SpecAssertion(section = "8.6", id = "b") + public void testGetContextReturnsActiveContext() + { + getCurrentManager().getContext(RequestScoped.class); + } + + /** + * For each of the built-in normal scopes, contexts propagate across any Java + * method call, including invocation of EJB local business methods. + */ + @Test(groups = { "stub", "contexts", "underInvestigation" }) + @SpecAssertion(section = "8.5", id = "b") + public void testBuiltInNormalScopedContextsPropagateAcrossAnyJavaMethodCall() + { + assert false; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DestroyedInstanceReturnedByGetTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,54 @@ +package org.jboss.jsr299.tck.tests.context; + +import javax.context.ApplicationScoped; +import javax.context.Context; +import javax.context.SessionScoped; +import javax.inject.manager.Bean; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +@Artifact +public class DestroyedInstanceReturnedByGetTest extends AbstractDeclarativeTest +{ + + + Context context; + + @BeforeMethod(dependsOnMethods = "beforeMethod") + public void initContext() + { + if (context == null) + { + context = new DummyContext(); + getCurrentManager().addContext(context); + } + } + + @Test(groups = { "contexts", "ri-broken" }) + @SpecAssertion(section = "8.1", id = "g") + public void testDestroyedInstanceMustNotBeReturnedByGet() + { + Bean<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); + MyCreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); + MySessionBean beanInstance = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext); + assert beanInstance != null; + mySessionBean.destroy(beanInstance); + MySessionBean beanInstanceFromGet = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean); + assert beanInstanceFromGet != beanInstance; + + Bean<MyApplicationBean> myApplicationBean = getCurrentManager().resolveByType(MyApplicationBean.class).iterator().next(); + MyCreationalContext<MyApplicationBean> myCreationalContextForApplication = new MyCreationalContext<MyApplicationBean>(); + MyApplicationBean myApplicationBeanInstance = getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean, myCreationalContextForApplication); + assert myApplicationBeanInstance != null; + myApplicationBean.destroy(myApplicationBeanInstance); + + MyApplicationBean mySecondApplicationBeanInstance = getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean); + assert mySecondApplicationBeanInstance != null; + assert myApplicationBeanInstance != mySecondApplicationBeanInstance; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DummyContext.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DummyContext.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DummyContext.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DummyContext.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,30 @@ +package org.jboss.jsr299.tck.tests.context; + +import java.lang.annotation.Annotation; + +import javax.context.Context; +import javax.context.Contextual; +import javax.context.CreationalContext; + +class DummyContext implements Context +{ + public <T> T get(Contextual<T> bean, CreationalContext<T> creationalContext) + { + throw new UnsupportedOperationException(); + } + + public <T> T get(Contextual<T> contextual) + { + return get(contextual, null); + } + + public Class<? extends Annotation> getScopeType() + { + return DummyScoped.class; + } + + public boolean isActive() + { + return true; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DummyContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DummyScoped.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DummyScoped.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DummyScoped.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DummyScoped.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.tests.context; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +import javax.context.ScopeType; + +@ScopeType +(a)Retention(RetentionPolicy.RUNTIME) +@interface DummyScoped +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DummyScoped.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetOnInactiveContextTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,43 @@ +package org.jboss.jsr299.tck.tests.context; + +import javax.context.Context; +import javax.context.ContextNotActiveException; +import javax.context.Contextual; +import javax.context.SessionScoped; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.testng.annotations.Test; + +@Artifact +public class GetOnInactiveContextTest extends AbstractDeclarativeTest +{ + + + Context context; + + public void initContext() + { + initContext(); + if (context == null) + { + context = new DummyContext(); + getCurrentManager().addContext(context); + } + } + + + @Test(groups = { "contexts" }, expectedExceptions = { ContextNotActiveException.class }) + @SpecAssertion(section = "8.1", id = "h") + public void testInvokingGetOnInactiveContextFails() + { + Context sessionContext = getCurrentManager().getContext(SessionScoped.class); + assert sessionContext.isActive(); + setContextInactive(sessionContext); + + Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); + sessionContext.get(mySessionBean); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,49 @@ +package org.jboss.jsr299.tck.tests.context; + +import javax.context.ApplicationScoped; +import javax.context.Context; +import javax.context.Contextual; +import javax.context.CreationalContext; +import javax.context.SessionScoped; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.testng.annotations.Test; + +@Artifact +public class GetTest extends AbstractDeclarativeTest +{ + + Context context; + + public void initContext() + { + if (context == null) + { + context = new DummyContext(); + getCurrentManager().addContext(context); + } + } + + + @Test(groups = { "contexts" }) + @SpecAssertion(section = "8.1", id = "e") + public void testGetMayNotCreateNewInstanceUnlessCreationalContextGiven() + { + initContext(); + Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); + assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean) == null; + + Contextual<MyApplicationBean> myApplicationBean = getCurrentManager().resolveByType(MyApplicationBean.class).iterator().next(); + assert getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean) == null; + + // Now try same operation with a CreationalContext + CreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); + assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext) != null; + + CreationalContext<MyApplicationBean> myOtherCreationalContext = new MyCreationalContext<MyApplicationBean>(); + assert getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean, myOtherCreationalContext) != null; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetWithNoCreationalContextTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,37 @@ +package org.jboss.jsr299.tck.tests.context; + +import javax.context.Context; +import javax.context.Contextual; +import javax.context.SessionScoped; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.testng.annotations.Test; + +@Artifact +public class GetWithNoCreationalContextTest extends AbstractDeclarativeTest +{ + + Context context; + + public void initContext() + { + if (context == null) + { + context = new DummyContext(); + getCurrentManager().addContext(context); + } + } + + + @Test(groups = { "contexts" }) + @SpecAssertion(section = "8.1", id = "b") + public void testGetWithoutCreationalContextReturnsNull() + { + initContext(); + Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); + assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean) == null; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyApplicationBean.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MyApplicationBean.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyApplicationBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyApplicationBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.tests.context; + +import java.io.Serializable; + +import javax.context.ApplicationScoped; + +@ApplicationScoped +class MyApplicationBean implements Serializable +{ + + /** + * + */ + private static final long serialVersionUID = 1L; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyApplicationBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyContextual.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MyContextual.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyContextual.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyContextual.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,107 @@ +package org.jboss.jsr299.tck.tests.context; + +import java.io.Serializable; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import javax.context.CreationalContext; +import javax.context.SessionScoped; +import javax.inject.Standard; +import javax.inject.manager.Bean; +import javax.inject.manager.InjectionPoint; +import javax.inject.manager.Manager; + +class MyContextual extends Bean<MySessionBean> +{ + private boolean createCalled = false; + private boolean destroyCalled = false; + private boolean shouldReturnNullInstances = false; + + protected MyContextual(Manager manager) + { + super(manager); + } + + @Override + public Set<Annotation> getBindings() + { + return Collections.emptySet(); + } + + @Override + public Class<? extends Annotation> getDeploymentType() + { + return Standard.class; + } + + @Override + public Set<? extends InjectionPoint> getInjectionPoints() + { + return Collections.emptySet(); + } + + @Override + public String getName() + { + return "my-session-bean"; + } + + @Override + public Class<? extends Annotation> getScopeType() + { + return SessionScoped.class; + } + + @SuppressWarnings("unchecked") + @Override + public Set<Type> getTypes() + { + return new HashSet<Type>(Arrays.asList(Object.class, MySessionBean.class, Serializable.class)); + } + + @Override + public boolean isNullable() + { + return false; + } + + @Override + public boolean isSerializable() + { + return true; + } + + public MySessionBean create(CreationalContext<MySessionBean> creationalContext) + { + createCalled = true; + if (shouldReturnNullInstances) + return null; + else + return new MySessionBean(); + } + + public void destroy(MySessionBean instance) + { + destroyCalled = true; + } + + public boolean isCreateCalled() + { + return createCalled; + } + + public boolean isDestroyCalled() + { + return destroyCalled; + } + + public void setShouldReturnNullInstances(boolean shouldReturnNullInstances) + { + this.shouldReturnNullInstances = shouldReturnNullInstances; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyContextual.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MyCreationalContext.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.context; + +import javax.context.CreationalContext; + +class MyCreationalContext<T> implements CreationalContext<T> +{ + + public void push(T incompleteInstance) + { + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MySessionBean.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MySessionBean.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MySessionBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MySessionBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.context; + +import java.io.Serializable; + +@DummyScoped +class MySessionBean implements Serializable +{ + + /** + * + */ + private static final long serialVersionUID = 1L; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MySessionBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,114 @@ +package org.jboss.jsr299.tck.tests.context; + +import javax.context.Context; +import javax.context.Contextual; +import javax.context.CreationalContext; +import javax.context.SessionScoped; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.testng.annotations.Test; + +/** + * + * @author Nicklas Karlsson + * @author Pete Muir + * @author David Allen + * + * This class tests a basic context against section 8 of the + * specification + * + * Spec version: PRD2 + */ +@Artifact +public class NormalContextTest extends AbstractDeclarativeTest +{ + + Context context; + + public void initContext() + { + if (context == null) + { + context = new DummyContext(); + getCurrentManager().addContext(context); + } + } + + @Test(groups = { "contexts" }) + @SpecAssertion(section = "8.1", id = "a") + public void testGetReturnsExistingInstance() + { + initContext(); + Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); + MyCreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); + MySessionBean beanInstance = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext); + assert beanInstance != null; + MySessionBean beanInstanceFromGet = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean); + assert beanInstanceFromGet == beanInstance; + } + + @Test(groups = { "contexts" }) + @SpecAssertion(section = "8.1", id = "c") + public void testGetWithCreationalContextReturnsNewInstance() + { + initContext(); + MyContextual bean = new MyContextual(getCurrentManager()); + bean.setShouldReturnNullInstances(false); + getCurrentManager().addBean(bean); + + CreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); + assert getCurrentManager().getContext(SessionScoped.class).get(bean, myCreationalContext) != null; + assert bean.isCreateCalled(); + } + + @Test(groups = { "contexts" }) + @SpecAssertion(section = "8.1", id = "d") + public void testGetMayNotReturnNullUnlessNoCreationalContextOrContextualCreateReturnsNull() + { + initContext(); + // The case of no creational context is already tested where a null is + // returned. Here we just test that the contextual create can return null. + MyContextual bean = new MyContextual(getCurrentManager()); + bean.setShouldReturnNullInstances(true); + getCurrentManager().addBean(bean); + + CreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); + assert getCurrentManager().getContext(SessionScoped.class).get(bean, myCreationalContext) == null; + assert bean.isCreateCalled(); + } + + @Test(groups = { "contexts" }) + @SpecAssertion(section = "8.1", id = "f") + public void testContextDestroysBeansWhenDestroyed() + { + initContext(); + MyContextual bean = new MyContextual(getCurrentManager()); + bean.setShouldReturnNullInstances(false); + getCurrentManager().addBean(bean); + + CreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); + Context sessionContext = getCurrentManager().getContext(SessionScoped.class); + assert sessionContext.get(bean, myCreationalContext) != null; + assert bean.isCreateCalled(); + + destroyContext(sessionContext); + assert bean.isDestroyCalled(); + } + + + + + /** + * There may be no more than one mapped instance per contextual type per + * thread + */ + @Test(groups = { "contexts", "stub", "underInvestigation" }) + @SpecAssertion(section = "8.2", id = "a") + public void testOnlyOneMappedInstancePerContextualTypePerThread() + { + assert false; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/application) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/application/ApplicationContextTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.application; +package org.jboss.jsr299.tck.tests.context.application; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/conversation) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/conversation/ConversationContextTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.conversation; +package org.jboss.jsr299.tck.tests.context.conversation; import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; interface Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; 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/unit/context/dependent/ApplicationHorseStable.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; import javax.context.ApplicationScoped; import javax.context.Dependent; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DeadlyAnimal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DeadlyAnimal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; interface DeadlyAnimal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DeadlySpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DeadlySpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; interface DeadlySpider extends DeadlyAnimal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextIntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextIntegrationTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextIntegrationTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; import org.hibernate.tck.annotations.SpecAssertion; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; import java.lang.annotation.Annotation; import java.util.Set; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Farm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/Farm.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Farm.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; import javax.context.RequestScoped; import javax.inject.Current; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/Fox.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Fox.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; import javax.annotation.Named; import javax.context.Dependent; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxRun.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/FoxRun.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxRun.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; import javax.inject.Current; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Horse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/Horse.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Horse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; import javax.annotation.PreDestroy; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseInStableEvent.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/HorseInStableEvent.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseInStableEvent.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; class HorseInStableEvent { 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/unit/context/dependent/HorseStable.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; import javax.context.Dependent; import javax.event.Observes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MyCreationalContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/MyCreationalContext.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MyCreationalContext.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; import javax.context.CreationalContext; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/OtherSpiderProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/SensitiveFox.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; import javax.annotation.Named; import javax.context.Dependent; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/Spider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Spider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; class Spider implements Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/SpiderProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; import javax.context.Dependent; import javax.inject.Current; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Stable.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/Stable.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Stable.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; import javax.annotation.PreDestroy; import javax.inject.Current; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/Tarantula.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.dependent; +package org.jboss.jsr299.tck.tests.context.dependent; class Tarantula extends Spider implements DeadlySpider { Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Big.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Big.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Big.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Big.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Big +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Big.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/City.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/City.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/City.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/City.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +class City +{ + public void ping() { + + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityBinding.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityBinding.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityBinding.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.context.Dependent; +import javax.interceptor.InterceptorBindingType; + +@InterceptorBindingType +@Dependent +@Target({TYPE, METHOD}) +@Retention(RUNTIME) +@interface CityBinding +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityInterface.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityInterface.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityInterface.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityInterface.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +interface CityInterface +{ + public void foo(); +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import javax.context.Dependent; +import javax.inject.Produces; + +@AnotherDeploymentType +class CityProducer +{ + @Produces @Dependent public Violation reference = new Violation(); +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer2.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import javax.context.Dependent; +import javax.inject.Produces; + +@AnotherDeploymentType +class CityProducer2 +{ + @Produces @Dependent @Big + public Violation create() + { + return new Violation(); + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/FooConsumer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/FooConsumer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/FooConsumer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/FooConsumer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import javax.context.RequestScoped; +import javax.inject.Current; + +@RequestScoped +class FooConsumer +{ + + @Current SerializableFoo foo; + + public void ping(){}; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/FooConsumer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Generator.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,28 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + + +import java.io.Serializable; + +import javax.context.ApplicationScoped; +import javax.inject.Produces; + +@ApplicationScoped +@AnotherDeploymentType +class Generator implements Serializable +{ + + private static final long serialVersionUID = -7213673465118041882L; + + private int number = 100; + + @Produces int getNumber() + { + return number; + } + + @Produces SerializableFoo getFoo() + { + return new SerializableFoo(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Helsinki.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Helsinki.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Helsinki.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Helsinki.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import javax.context.Dependent; +import javax.ejb.Stateful; + +@Dependent +@Stateful +class Helsinki implements HelsinkiLocal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/HelsinkiLocal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/HelsinkiLocal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/HelsinkiLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/HelsinkiLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import javax.ejb.Local; + +@Local +public interface HelsinkiLocal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/HelsinkiLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Hyvinkaa.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Hyvinkaa.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Hyvinkaa.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Hyvinkaa.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.Serializable; + +import javax.context.SessionScoped; +import javax.inject.Current; + +@SuppressWarnings("serial") +@SessionScoped +class Hyvinkaa implements Serializable +{ + @SuppressWarnings("unused") + @Current + private transient Violation reference; +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jamsa_Broken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Jamsa_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jamsa_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jamsa_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,25 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.Serializable; + +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Produces; + +@SessionScoped +@AnotherDeploymentType +class Jamsa_Broken extends City implements Serializable +{ + private static final long serialVersionUID = 8228981889946806181L; + + public Jamsa_Broken() + { + } + + @Produces + @SessionScoped + public Violation2 create(@Current Violation violation) + { + return new Violation2(); + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Joensuu.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Joensuu.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Joensuu.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Joensuu.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.Serializable; + +import javax.context.SessionScoped; +import javax.inject.Current; + +@SuppressWarnings("serial") +@SessionScoped +class Joensuu implements Serializable +{ + @SuppressWarnings("unused") + @Current + private transient Violation reference; + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jyvaskyla.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Jyvaskyla.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jyvaskyla.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jyvaskyla.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.Serializable; + +import javax.context.SessionScoped; + +@SuppressWarnings("serial") +@SessionScoped +class Jyvaskyla implements Serializable +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kajaani.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kajaani.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kajaani.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kajaani.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.Serializable; + +import javax.context.SessionScoped; + +@SessionScoped +public class Kajaani implements Serializable +{ + private static final long serialVersionUID = 1L; + private Integer theNumber = 0; + + public int getTheNumber() + { + return theNumber; + } + + public void setTheNumber(int theNumber) + { + this.theNumber = theNumber; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kajaani.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kuopio_Broken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kuopio_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kuopio_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kuopio_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.Serializable; + +import javax.context.SessionScoped; +import javax.inject.Initializer; + +@SessionScoped +class Kuopio_Broken extends City implements Serializable +{ + private static final long serialVersionUID = 2446135216757213774L; + + public Kuopio_Broken() { + + } + + @Initializer + public void init(@Big Violation reference) { + + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/London_Broken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/London_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/London_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/London_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,25 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.Serializable; + +import javax.context.SessionScoped; +import javax.inject.Produces; + +@SessionScoped +@AnotherDeploymentType +class London_Broken extends City implements Serializable +{ + private static final long serialVersionUID = 8228981889946806181L; + + public London_Broken() + { + } + + @Produces + @SessionScoped + @Big + public Violation2 create(@Big Violation violation) + { + return new Violation2(); + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/London_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Loviisa_Broken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Loviisa_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Loviisa_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.Serializable; + +import javax.context.SessionScoped; +import javax.inject.Initializer; + +@SessionScoped +class Loviisa_Broken extends City implements Serializable +{ + private static final long serialVersionUID = -2866858442948392508L; + + public Loviisa_Broken() { + } + + @Initializer + public Loviisa_Broken(@Big Violation reference) { + + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Loviisa_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/MaarianHaminaLocal_Broken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/MaarianHaminaLocal_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/MaarianHaminaLocal_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/MaarianHaminaLocal_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import javax.ejb.Local; + +@Local +public interface MaarianHaminaLocal_Broken +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/MaarianHaminaLocal_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Maarianhamina_Broken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Maarianhamina_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Maarianhamina_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Maarianhamina_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import javax.context.SessionScoped; +import javax.ejb.Remove; +import javax.ejb.Stateful; +import javax.inject.Current; + +@Stateful +@SessionScoped +class Maarianhamina_Broken implements MaarianHaminaLocal_Broken +{ + @SuppressWarnings("unused") + @Current + private Violation reference; + + @Remove + public void bye() { + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Mikkeli_Broken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Mikkeli_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Mikkeli_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Mikkeli_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.Serializable; + +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Initializer; + +@SessionScoped +class Mikkeli_Broken extends City implements Serializable +{ + private static final long serialVersionUID = -3853118456066667893L; + + public Mikkeli_Broken() + { + } + + @Initializer + public Mikkeli_Broken(@Current Violation reference) + { + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Nokia_Broken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Nokia_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Nokia_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Nokia_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.Serializable; + +import javax.context.SessionScoped; +import javax.inject.Current; + +@SessionScoped +class Nokia_Broken extends City implements Serializable +{ + private static final long serialVersionUID = -9104722758108835718L; + + @SuppressWarnings("unused") + @Current + private Violation reference; +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/NumberConsumer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/NumberConsumer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/NumberConsumer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/NumberConsumer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import javax.context.RequestScoped; +import javax.inject.Current; + +@RequestScoped +class NumberConsumer +{ + + @Current int number; + + public void ping(){}; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/NumberConsumer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextIntegrationTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextIntegrationTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextIntegrationTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextIntegrationTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,54 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.IOException; + +import javax.inject.IllegalProductException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +@IntegrationTest +(a)Packaging(PackagingType.EAR) +public class PassivatingContextIntegrationTest extends AbstractDeclarativeTest +{ + + @Test(groups = { "stub", "contexts", "passivation", "jms" }) + @SpecAssertion(section = "8.4", id = "u") + public void testJMSEndpointProxyIsSerializable() + { + assert false; + } + + @Test(groups = { "contexts", "passivation", "integration", "broken" }, expectedExceptions = IllegalProductException.class) + @SpecAssertion(section = "8.4", id = "p") + public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails() throws SecurityException, NoSuchMethodException + { + getCurrentManager().getInstanceByType(MaarianHaminaLocal_Broken.class); + } + + /** + * the Web Bean is an EJB stateful session bean, and it is passivated by the + * EJB container. + */ + // TODO requires an EJB instance + @Test(groups = { "contexts", "passivation", "stub", "integration" }) + @SpecAssertion(section = "8.4", id = "g") + public void testStatefulEJBIsSerializedWhenPassivatedByEJBContainer() throws IOException, ClassNotFoundException + { + assert false; + } + + @Test(groups = { "contexts", "passivation", "stub", "integration" }, expectedExceptions = IllegalProductException.class) + @SpecAssertion(section = "8.4", id = "p") + public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails() throws Exception + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextIntegrationTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,182 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.util.Set; + +import javax.context.Context; +import javax.context.SessionScoped; +import javax.inject.AnnotationLiteral; +import javax.inject.IllegalProductException; +import javax.inject.manager.Bean; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +/** + * + * @author Nicklas Karlsson + * @author David Allen + * + * Spec version: PRD2 + */ +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +(a)Packaging(PackagingType.EAR) +public class PassivatingContextTest extends AbstractDeclarativeTest +{ + + private static final Annotation BIG_LITERAL = new AnnotationLiteral<Big>() {}; + + @Test(groups = { "contexts", "passivation" }) + @SpecAssertion(section = "8.4", id = "b") + public void testSimpleWebBeanWithSerializableImplementationClassOK() + { + Set<Bean<Jyvaskyla>> beans = getCurrentManager().resolveByType(Jyvaskyla.class); + assert !beans.isEmpty(); + } + + @Test @SpecAssertion(section="8.4", id = "ca") + public void testInjectionOfDependentSerializableProductIntoNormalBean() + { + getCurrentManager().getInstanceByType(NumberConsumer.class).ping(); + } + + @Test @SpecAssertion(section="8.4", id = "cb") + public void testInjectionOfDependentPrimitiveProductIntoNormalBean() + { + getCurrentManager().getInstanceByType(FooConsumer.class).ping(); + } + + @Test(groups = { "contexts", "passivation" }) + @SpecAssertions({ + @SpecAssertion(section = "8.4", id = "f"), + @SpecAssertion(section = "8.4", id = "i") + }) + public void testSimpleWebBeanDeclaringPassivatingScopeIsSerializedWhenContextIsPassivated() throws IOException, ClassNotFoundException + { + Kajaani instance = getCurrentManager().getInstanceByType(Kajaani.class); + instance.setTheNumber(100); + Context sessionContext = getCurrentManager().getContext(SessionScoped.class); + setContextInactive(sessionContext); + setContextActive(sessionContext); + instance = getCurrentManager().getInstanceByType(Kajaani.class); + assert instance.getTheNumber() == 100; + } + + @SuppressWarnings("unchecked") + private <T> boolean testSerialize(Bean<T> bean) throws IOException, ClassNotFoundException + { + getCurrentManager().addBean(bean); + T instance = getCurrentManager().getInstance(bean); + byte[] data = serialize(instance); + T resurrected = (T) deserialize(data); + return resurrected.toString().equals(instance.toString()); + } + + /** + * @throws ClassNotFoundException + * @throws IOException + */ + @Test(groups = { "contexts", "passivation", "incontainer-ri-broken" }) + @SpecAssertion(section = "8.4", id = "j") + public void testDependentEJBsAreSerializable() throws IOException, ClassNotFoundException + { + Set<Bean<Vaasa>> vaasaBeans = getCurrentManager().resolveByType(Vaasa.class); + assert vaasaBeans.size() == 1; + assert testSerialize(vaasaBeans.iterator().next()); + } + + @Test(groups = { "contexts", "passivation" }) + @SpecAssertion(section = "8.4", id = "l") + public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoTransientFieldOK() + { + Set<Bean<Joensuu>> beans = getCurrentManager().resolveByType(Joensuu.class); + assert !beans.isEmpty(); + } + + @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) + @SpecAssertion(section = "8.4", id = "q") + public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoNonTransientFieldOfWebBeanWithPassivatingScopeFails() + { + getCurrentManager().getInstanceByType(Nokia_Broken.class).ping(); + } + + @Test(groups = { "contexts", "passivation" }) + @SpecAssertion(section = "8.4", id = "q") + public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoTransientFieldOfWebBeanWithPassivatingScopeOK() + { + Set<Bean<Hyvinkaa>> beans = getCurrentManager().resolveByType(Hyvinkaa.class); + assert !beans.isEmpty(); + } + + @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) + @SpecAssertion(section = "8.4", id = "r") + public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoConstructorParameterOfWebBeanWithPassivatingScopeFails() + { + getCurrentManager().getInstanceByType(Loviisa_Broken.class).ping(); + } + + @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) + @SpecAssertion(section = "8.4", id = "s") + public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoInitializerParameterOfWebBeanWithPassivatingScopeFails() + { + getCurrentManager().getInstanceByType(Kuopio_Broken.class).ping(); + } + + @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) + @SpecAssertion(section = "8.4", id = "t") + public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoProducerMethodParameterWithPassivatingScopeFails() + { + getCurrentManager().getInstanceByType(Violation2.class).ping(); + } + + @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) + @SpecAssertion(section = "8.4", id = "q") + public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoNonTransientFieldOfWebBeanWithPassivatingScopeFails() + { + getCurrentManager().getInstanceByType(Uusikaupunki_Broken.class).ping(); + } + + @Test(groups = { "contexts", "passivation" }) + @SpecAssertion(section = "8.4", id = "q") + public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoTransientFieldOfWebBeanWithPassivatingScopeOK() + { + getCurrentManager().getInstanceByType(Salo_Broken.class).ping(); + } + + @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) + @SpecAssertion(section = "8.4", id = "r") + public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoConstructorParameterOfWebBeanWithPassivatingScopeFails() + { + getCurrentManager().getInstanceByType(Loviisa_Broken.class).ping(); + } + + @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) + @SpecAssertion(section = "8.4", id = "s") + public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoInitializerParameterOfWebBeanWithPassivatingScopeFails() + { + getCurrentManager().getInstanceByType(Mikkeli_Broken.class).ping(); + } + + @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) + @SpecAssertion(section = "8.4", id = "t") + public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoProducerMethodParameterWithPassivatingScopeFails() + { + getCurrentManager().getInstanceByType(Violation2.class, BIG_LITERAL).ping(); + } + + @Test(groups = { "contexts", "passivation", "enterpriseBean", "integration" }) + @SpecAssertion(section = "8.4", id = "a") + public void testEJBWebBeanCanDeclarePassivatingScope() + { + assert getCurrentManager().resolveByType(TurkuLocal.class).size() == 1; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Salo_Broken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Salo_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Salo_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Salo_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.Serializable; + +import javax.context.SessionScoped; +import javax.inject.Current; + +@SessionScoped +class Salo_Broken extends City implements Serializable +{ + private static final long serialVersionUID = 5500591077418621816L; + + @SuppressWarnings("unused") + @Current + private transient Violation reference; + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/SerializableFoo.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/SerializableFoo.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/SerializableFoo.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/SerializableFoo.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.Serializable; + +public class SerializableFoo implements Serializable +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/SerializableFoo.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Turku.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Turku.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Turku.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Turku.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import javax.context.SessionScoped; +import javax.ejb.Remove; +import javax.ejb.Stateful; + +@Stateful +@SessionScoped +class Turku implements TurkuLocal +{ + @Remove + public void bye() { + + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Turku.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/TurkuLocal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/TurkuLocal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/TurkuLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/TurkuLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import javax.ejb.Local; + +@Local +public interface TurkuLocal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/TurkuLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Uusikaupunki_Broken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Uusikaupunki_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Uusikaupunki_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Uusikaupunki_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.Serializable; + +import javax.context.SessionScoped; +import javax.inject.Current; + +@SessionScoped +class Uusikaupunki_Broken extends City implements Serializable +{ + private static final long serialVersionUID = 5097928748462594346L; + + @SuppressWarnings("unused") + @Current + private Violation reference; + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Vaasa.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Vaasa.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Vaasa.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Vaasa.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import java.io.Serializable; + +import javax.context.SessionScoped; +import javax.inject.Current; + +@SuppressWarnings("serial") +@SessionScoped +class Vaasa implements Serializable +{ + @SuppressWarnings("unused") + @Current private HelsinkiLocal ejb; +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import javax.context.Dependent; + +@Dependent +class Violation +{ + + public void ping() + { + + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation2.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation2.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation2.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation2.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.context.passivating; + +import javax.context.Dependent; + +@Dependent +class Violation2 +{ + + public void ping() + { + + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/CityBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/CityBinding.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/CityBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken1; +package org.jboss.jsr299.tck.tests.context.passivating.broken1; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/DependentInterceptorSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/DependentInterceptorSerializableTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/DependentInterceptorSerializableTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken1; +package org.jboss.jsr299.tck.tests.context.passivating.broken1; import javax.inject.UnserializableDependencyException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/Kaarina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/Kaarina_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/Kaarina_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken1; +package org.jboss.jsr299.tck.tests.context.passivating.broken1; import javax.context.SessionScoped; import javax.ejb.Remove; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken2) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/Hamina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken2/Hamina_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/Hamina_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken2; +package org.jboss.jsr299.tck.tests.context.passivating.broken2; import javax.context.SessionScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken2/NonSerializableTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken2; +package org.jboss.jsr299.tck.tests.context.passivating.broken2; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/CityInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/CityInterface.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/CityInterface.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken3; +package org.jboss.jsr299.tck.tests.context.passivating.broken3; interface CityInterface { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/DependentDecoratorSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/DependentDecoratorSerializableTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/DependentDecoratorSerializableTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken3; +package org.jboss.jsr299.tck.tests.context.passivating.broken3; import javax.inject.UnserializableDependencyException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/Porvoo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/Porvoo_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/Porvoo_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken3; +package org.jboss.jsr299.tck.tests.context.passivating.broken3; import javax.context.SessionScoped; import javax.ejb.Remove; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/CityBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/CityBinding.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/CityBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken4; +package org.jboss.jsr299.tck.tests.context.passivating.broken4; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/DependentInterceptorSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/DependentInterceptorSerializableTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/DependentInterceptorSerializableTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken4; +package org.jboss.jsr299.tck.tests.context.passivating.broken4; import javax.inject.UnserializableDependencyException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/Kotka_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/Kotka_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/Kotka_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken4; +package org.jboss.jsr299.tck.tests.context.passivating.broken4; import java.io.Serializable; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/CityInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/CityInterface.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/CityInterface.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken5; +package org.jboss.jsr299.tck.tests.context.passivating.broken5; interface CityInterface { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/DependentDecoratorSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/DependentDecoratorSerializableTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/DependentDecoratorSerializableTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken5; +package org.jboss.jsr299.tck.tests.context.passivating.broken5; import javax.inject.UnserializableDependencyException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/Raisio_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/Raisio_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/Raisio_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken5; +package org.jboss.jsr299.tck.tests.context.passivating.broken5; import java.io.Serializable; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/NonSerializableTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken6; +package org.jboss.jsr299.tck.tests.context.passivating.broken6; import javax.inject.UnserializableDependencyException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Vantaa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/Vantaa_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Vantaa_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken6; +package org.jboss.jsr299.tck.tests.context.passivating.broken6; import java.io.Serializable; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/Violation.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Violation.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken6; +package org.jboss.jsr299.tck.tests.context.passivating.broken6; import javax.context.Dependent; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/City.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/City.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/City.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken7; +package org.jboss.jsr299.tck.tests.context.passivating.broken7; class City { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Loviisa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/Loviisa_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Loviisa_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken7; +package org.jboss.jsr299.tck.tests.context.passivating.broken7; import java.io.Serializable; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/NonSerializableTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken7; +package org.jboss.jsr299.tck.tests.context.passivating.broken7; import javax.inject.UnserializableDependencyException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/Violation.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Violation.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken7; +package org.jboss.jsr299.tck.tests.context.passivating.broken7; import javax.context.Dependent; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Forssa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/Forssa_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Forssa_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken8; +package org.jboss.jsr299.tck.tests.context.passivating.broken8; import java.io.Serializable; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/NonSerializableTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken8; +package org.jboss.jsr299.tck.tests.context.passivating.broken8; import javax.inject.UnserializableDependencyException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/Violation.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Violation.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken8; +package org.jboss.jsr299.tck.tests.context.passivating.broken8; import javax.context.Dependent; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/City.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/City.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/City.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken9; +package org.jboss.jsr299.tck.tests.context.passivating.broken9; class City { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/NonSerializableTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/NonSerializableTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken9; +package org.jboss.jsr299.tck.tests.context.passivating.broken9; import javax.inject.UnserializableDependencyException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Peraseinajoki.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/Peraseinajoki.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Peraseinajoki.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken9; +package org.jboss.jsr299.tck.tests.context.passivating.broken9; import javax.context.SessionScoped; import javax.inject.Current; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/Violation.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken9; +package org.jboss.jsr299.tck.tests.context.passivating.broken9; import javax.context.Dependent; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation2.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/Violation2.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation2.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.broken9; +package org.jboss.jsr299.tck.tests.context.passivating.broken9; import javax.context.Dependent; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; +package org.jboss.jsr299.tck.tests.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; import javax.context.Dependent; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/EspooLocal_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/EspooLocal_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/EspooLocal_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; +package org.jboss.jsr299.tck.tests.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; +package org.jboss.jsr299.tck.tests.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; import javax.context.SessionScoped; import javax.ejb.Remove; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; +package org.jboss.jsr299.tck.tests.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; import javax.inject.UnserializableDependencyException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/request) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/request/RequestContextTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.request; +package org.jboss.jsr299.tck.tests.context.request; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/session) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/session/SessionContextTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.context.session; +package org.jboss.jsr299.tck.tests.context.session; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.bean; +package org.jboss.jsr299.tck.tests.definition.bean; interface Animal { 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/unit/definition/bean/AnimalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.bean; +package org.jboss.jsr299.tck.tests.definition.bean; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.bean; +package org.jboss.jsr299.tck.tests.definition.bean; import java.lang.annotation.Annotation; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/DeadlyAnimal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/DeadlyAnimal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.bean; +package org.jboss.jsr299.tck.tests.definition.bean; interface DeadlyAnimal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/DeadlySpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/DeadlySpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.bean; +package org.jboss.jsr299.tck.tests.definition.bean; interface DeadlySpider extends DeadlyAnimal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/DependentFinalTuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/DependentFinalTuna.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/DependentFinalTuna.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.bean; +package org.jboss.jsr299.tck.tests.definition.bean; final class DependentFinalTuna { 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/unit/definition/bean/FishStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.bean; +package org.jboss.jsr299.tck.tests.definition.bean; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/RedSnapper.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.bean; +package org.jboss.jsr299.tck.tests.definition.bean; import javax.context.RequestScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/Spider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Spider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.bean; +package org.jboss.jsr299.tck.tests.definition.bean; class Spider implements Animal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/SpiderProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/SpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.bean; +package org.jboss.jsr299.tck.tests.definition.bean; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.bean; +package org.jboss.jsr299.tck.tests.definition.bean; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/Tarantula.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Tarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.bean; +package org.jboss.jsr299.tck.tests.definition.bean; class Tarantula extends Spider implements DeadlySpider { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/WolfSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/WolfSpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/WolfSpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.bean; +package org.jboss.jsr299.tck.tests.definition.bean; class WolfSpider implements Animal { Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; interface Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Barn.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Barn.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Barn.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; class Barn Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import java.lang.annotation.Annotation; import java.util.Set; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BorderCollie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BorderCollie.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BorderCollie.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; class BorderCollie extends LongHairedDog { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cat.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Cat.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cat.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Chunky.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Chunky.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ChunkyBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/ChunkyBinding.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ChunkyBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ClippedBorderCollie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/ClippedBorderCollie.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ClippedBorderCollie.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; @Hairy(clipped=true) class ClippedBorderCollie extends BorderCollie Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Cod.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cod.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import javax.annotation.Named; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/DeadlyAnimal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/DeadlyAnimal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; interface DeadlyAnimal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/DeadlySpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/DeadlySpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; interface DeadlySpider extends DeadlyAnimal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/DefangedTarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/DefangedTarantula.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/DefangedTarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; class DefangedTarantula extends Tarantula { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Hairy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Hairy.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Hairy.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/HairyBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/HairyBinding.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/HairyBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Horse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Horse.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Horse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; @Species class Horse Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/LongHairedDog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/LongHairedDog.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/LongHairedDog.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; @Hairy(clipped=false) class LongHairedDog Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MockCreationalContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/MockCreationalContext.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MockCreationalContext.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import javax.context.CreationalContext; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Order.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Order.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Produced.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Produced.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Produced.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ScottishFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/ScottishFish.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ScottishFish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; interface ScottishFish extends Animal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ShetlandPony.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/ShetlandPony.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ShetlandPony.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; class ShetlandPony extends Horse { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Species.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Species.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Species.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Spider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Spider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; class Spider implements Animal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/SpiderProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Synchronous.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Synchronous.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Synchronous.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SynchronousBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/SynchronousBinding.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SynchronousBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/TameBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/TameBinding.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/TameBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Tarantula.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import java.io.Serializable; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Tuna.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import javax.context.RequestScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Whitefish.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Whitefish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/WhitefishBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/WhitefishBinding.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/WhitefishBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.binding; +package org.jboss.jsr299.tck.tests.definition.binding; import javax.inject.AnnotationLiteral; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Animal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Animal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +interface Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/AnotherDeploymentType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@Inherited +@interface AnotherDeploymentType +{ + +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/BlackWidow.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/BlackWidow.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/BlackWidow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/BlackWidow.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +class BlackWidow extends Spider implements DeadlySpider +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/BorderCollie.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/BorderCollie.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/BorderCollie.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/BorderCollie.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +class BorderCollie extends Dog +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeadlyAnimal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeadlyAnimal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeadlyAnimal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeadlyAnimal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +interface DeadlyAnimal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeadlySpider.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeadlySpider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeadlySpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeadlySpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +interface DeadlySpider extends DeadlyAnimal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,143 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +import javax.inject.DeploymentException; +import javax.inject.Production; +import javax.inject.UnsatisfiedDependencyException; +import javax.inject.manager.Bean; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +/** + * + * Spec version: Public Release Draft 2 + * + */ +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +public class DeploymentTypeDefinitionTest extends AbstractDeclarativeTest +{ + + /** + * + * TODO This text is not really a testable assertion + */ + @Test(groups = { "stub", "annotationDefinition", "deploymentType" }) + @SpecAssertion(section = "2.5.2", id = "a") + public void testDeploymentTypeHasCorrectTarget() + { + assert false; + } + + /** + * + * TODO This text is not really a testable assertion + */ + @Test(groups = { "stub", "annotationDefinition", "deploymentType" }) + @SpecAssertion(section = "2.5.2", id = "c") + public void testDeploymentTypeDeclaresDeploymentTypeAnnotation() + { + assert false; + } + + @Test(groups = { "deploymentType" }) + @SpecAssertion(section = "2.5.3", id = "c") + public void testDeploymentTypeInhertitedFromDeclaringBean() throws Exception + { + assert getCurrentManager().resolveByType(BlackWidow.class).size() == 1; + Bean<BlackWidow> blackWidowSpiderModel = getCurrentManager().resolveByType(BlackWidow.class).iterator().next(); + assert blackWidowSpiderModel.getDeploymentType().equals(AnotherDeploymentType.class); + } + + /** + * + * TODO Section 2.5.4 does not claim that XML overrides Java for deployment + * types + */ + @Test(groups = { "stub", "webbeansxml", "deploymentType" }) + @SpecAssertion(section = "2.5.4", id = "a") + public void testXmlDeploymentTypeElement() + { + assert false; + } + + @Test(groups = { "webbeansxml", "deploymentType" }) + @SpecAssertion(section = "2.5.5", id = "a") + public void testDefaultDeploymentType() + { + assert getCurrentManager().resolveByType(Tarantula.class).size() == 1; + Bean<Tarantula> bean = getCurrentManager().resolveByType(Tarantula.class).iterator().next(); + assert bean.getDeploymentType().equals(Production.class); + } + + @Test(groups = { "deploymentType" }) + @SpecAssertion(section = "2.5.5", id = "b") + public void testHighestPrecedenceDeploymentTypeFromStereotype() + { + assert getCurrentManager().resolveByType(Rhinoceros.class).size() == 1; + Bean<?> bean = getCurrentManager().resolveByType(Rhinoceros.class).iterator().next(); + assert bean.getDeploymentType().equals(HornedAnimalDeploymentType.class); + } + + @Test(groups = { "beanLifecycle", "deploymentType" }, expectedExceptions = UnsatisfiedDependencyException.class) + @SpecAssertion(section = "2.5.6", id = "a") + public void testBeanWithDisabledDeploymentTypeNotInstantiated() + { + getCurrentManager().getInstanceByType(RedSnapper.class); + } + + @Test(groups = { "stub", "webbeansxml", "deploymentType" }, expectedExceptions = DeploymentException.class) + @SpecAssertion(section = "2.5.4", id = "b") + public void testMultipleDeployElementsCannotBeDefined() + { + assert false; + } + + @Test(groups = { "deploymentType" }) + @SpecAssertions( { @SpecAssertion(section = "2.5.5", id = "c"), + @SpecAssertion(section = "2.7.2", id = "da"), + @SpecAssertion(section = "4.1", id = "d") }) + public void testWebBeanDeploymentTypeOverridesStereotype() + { + assert getCurrentManager().resolveByType(Reindeer.class).size() == 1; + Bean<Reindeer> bean = getCurrentManager().resolveByType(Reindeer.class).iterator().next(); + assert bean.getDeploymentType().equals(Production.class); + } + + @Test(groups = { "deploymentType" }) + @SpecAssertion(section = "4.1", id = "c") + public void testDeploymentTypeDeclaredInheritedIsInherited() throws Exception + { + assert getCurrentManager().resolveByType(BorderCollie.class).size() == 1; + assert getCurrentManager().resolveByType(BorderCollie.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + } + + @Test(groups = { "deploymentType" }) + @SpecAssertion(section = "4.1", id = "c") + public void testDeploymentTypeNotDeclaredInheritedIsNotInherited() + { + assert getCurrentManager().resolveByType(ShetlandPony.class).size() == 1; + assert getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class); + } + + @Test(groups = { "deploymentType" }) + @SpecAssertion(section = "4.1", id = "c") + public void testDeploymentTypeDeclaredInheritedIsBlockedByIntermediateDeploymentTypeNotMarkedInherited() + { + assert getCurrentManager().resolveByType(GoldenRetriever.class).size() == 1; + assert getCurrentManager().resolveByType(GoldenRetriever.class).iterator().next().getDeploymentType().equals(Production.class); + } + + @Test(groups = { "deploymentType" }) + @SpecAssertion(section = "4.1", id = "c") + public void testDeploymentTypeDeclaredInheritedIsBlockedByIntermediateDeploymentTypeMarkedInherited() + { + assert getCurrentManager().resolveByType(GoldenLabrador.class).size() == 1; + assert getCurrentManager().resolveByType(GoldenLabrador.class).iterator().next().getDeploymentType().equals(InheritedDeploymentType.class); + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DisabledDeploymentType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DisabledDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DisabledDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DisabledDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface DisabledDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DisabledDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Dog.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Dog.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Dog.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Dog.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + + +@AnotherDeploymentType +class Dog +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/FishStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Named; +import javax.annotation.Stereotype; +import javax.context.ApplicationScoped; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@Named +@interface FishStereotype +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/GoldenLabrador.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/GoldenLabrador.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/GoldenLabrador.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/GoldenLabrador.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +class GoldenLabrador extends Labrador +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/GoldenRetriever.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/GoldenRetriever.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/GoldenRetriever.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/GoldenRetriever.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +class GoldenRetriever extends Retriever +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedAnimalDeploymentType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/HornedAnimalDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedAnimalDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedAnimalDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface HornedAnimalDeploymentType +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/HornedMammalStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@HornedAnimalDeploymentType +@interface HornedMammalStereotype +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Horse.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Horse.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Horse.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Horse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + + +@NotInheritedDeploymentType +class Horse +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/InheritedDeploymentType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/InheritedDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/InheritedDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/InheritedDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@Inherited +@interface InheritedDeploymentType +{ + +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Labrador.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Labrador.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Labrador.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Labrador.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + + +@InheritedDeploymentType +class Labrador extends Dog +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/MammalStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@AnotherDeploymentType +@interface MammalStereotype +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/NotInheritedDeploymentType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/NotInheritedDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/NotInheritedDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/NotInheritedDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface NotInheritedDeploymentType +{ + +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/RedSnapper.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/RedSnapper.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/RedSnapper.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/RedSnapper.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +import javax.context.RequestScoped; + +@FishStereotype +@RequestScoped +@DisabledDeploymentType +class RedSnapper implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Reindeer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Reindeer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Reindeer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Reindeer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +import javax.inject.Production; + +@HornedMammalStereotype +@Production +class Reindeer implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Retriever.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Retriever.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Retriever.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Retriever.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +@NotInheritedDeploymentType +class Retriever extends Dog +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Rhinoceros.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Rhinoceros.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Rhinoceros.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Rhinoceros.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +@HornedMammalStereotype +@MammalStereotype +class Rhinoceros implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/ShetlandPony.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/ShetlandPony.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/ShetlandPony.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/ShetlandPony.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +class ShetlandPony extends Horse +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Spider.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Spider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Spider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Spider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + + +class Spider implements Animal +{ + + public final void layEggs() + { + + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/SpiderProducer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/SpiderProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/SpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +import javax.annotation.Named; +import javax.inject.Produces; + +@AnotherDeploymentType +class SpiderProducer +{ + + @Produces @Named("blackWidow") public BlackWidow produceBlackWidow() + { + return new BlackWidow(); + } + + + +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Tarantula.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Tarantula.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Tarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Tarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +class Tarantula +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Tarantula.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/BrokenDeploymentTypeTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/BrokenDeploymentTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,31 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.broken; + +import javax.inject.DeploymentException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + */ +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +(a)ExpectedDeploymentException(DeploymentException.class) +public class BrokenDeploymentTypeTest extends AbstractDeclarativeTest +{ + + @SuppressWarnings("unchecked") + @Test + @SpecAssertion(section="2.5.6", id = "c") + public void testStandardMustBeDeclared() + { + assert false; + } + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/BrokenDeploymentTypeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/tooMany) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/tooMany/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.deployment.broken.tooMany; +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.deployment.broken.tooMany; +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.definition.deployment.broken.tooMany; +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.deployment.custom; +package org.jboss.jsr299.tck.tests.definition.deployment.custom; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.deployment.custom; +package org.jboss.jsr299.tck.tests.definition.deployment.custom; import javax.inject.Standard; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/HornedAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/HornedAnimalDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/HornedAnimalDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.deployment.custom; +package org.jboss.jsr299.tck.tests.definition.deployment.custom; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/defaultDeploymentType) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.deployment.defaultDeploymentType; +package org.jboss.jsr299.tck.tests.definition.deployment.defaultDeploymentType; import javax.inject.Production; import javax.inject.Standard; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/nonBuiltInUsesStandard) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/Gazelle_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/nonBuiltInUsesStandard/Gazelle_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/Gazelle_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.deployment.nonBuiltInUsesStandard; +package org.jboss.jsr299.tck.tests.definition.deployment.nonBuiltInUsesStandard; import javax.inject.Standard; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.deployment.nonBuiltInUsesStandard; +package org.jboss.jsr299.tck.tests.definition.deployment.nonBuiltInUsesStandard; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.name; +package org.jboss.jsr299.tck.tests.definition.name; interface Animal { 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/unit/definition/name/FishStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.name; +package org.jboss.jsr299.tck.tests.definition.name; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/Haddock.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Haddock.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.name; +package org.jboss.jsr299.tck.tests.definition.name; import javax.annotation.Named; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Minnow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/Minnow.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Minnow.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.name; +package org.jboss.jsr299.tck.tests.definition.name; @RiverFishStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Moose.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/Moose.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Moose.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.name; +package org.jboss.jsr299.tck.tests.definition.name; import javax.annotation.Named; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.name; +package org.jboss.jsr299.tck.tests.definition.name; import javax.inject.DefinitionException; import javax.inject.manager.Bean; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/RedSnapper.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RedSnapper.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.name; +package org.jboss.jsr299.tck.tests.definition.name; import javax.context.RequestScoped; 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/unit/definition/name/RiverFishStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.name; +package org.jboss.jsr299.tck.tests.definition.name; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/SeaBass.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/SeaBass.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.name; +package org.jboss.jsr299.tck.tests.definition.name; import javax.context.RequestScoped; import javax.inject.Production; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Animal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Animal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +interface Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnimalStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,23 @@ +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.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Stereotype; +import javax.context.RequestScoped; + +import org.jboss.jsr299.tck.tests.definition.scope.Animal; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +@interface AnimalStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScope.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnotherScope.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScope.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScope.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,21 @@ +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.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.context.ScopeType; + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@ScopeType +@interface AnotherScope +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnotherScopeType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.context.ScopeType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@ScopeType +@interface AnotherScopeType +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/BorderCollie.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/BorderCollie.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/BorderCollie.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/BorderCollie.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +class BorderCollie extends Dog +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Dog.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Dog.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Dog.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Dog.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +import javax.context.RequestScoped; + +@RequestScoped +class Dog +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/FishStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Named; +import javax.annotation.Stereotype; +import javax.context.ApplicationScoped; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@Named +@interface FishStereotype +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/GoldenLabrador.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/GoldenLabrador.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/GoldenLabrador.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/GoldenLabrador.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +class GoldenLabrador extends Labrador +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/GoldenRetriever.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/GoldenRetriever.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/GoldenRetriever.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/GoldenRetriever.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +class GoldenRetriever extends Retriever +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Grayling.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Grayling.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Grayling.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Grayling.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +@RiverFishStereotype +@FishStereotype +class Grayling implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Horse.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Horse.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Horse.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Horse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + + +@AnotherScope +class Horse +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Labrador.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Labrador.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Labrador.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Labrador.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + + +@NotInheritedScope +class Labrador extends Dog +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Minnow.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Minnow.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Minnow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Minnow.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +import javax.context.RequestScoped; + +@RiverFishStereotype +@RequestScoped +class Minnow implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Mullet.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Mullet.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Mullet.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Mullet.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +@AnotherScopeType +class Mullet +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/NotInheritedScope.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/NotInheritedScope.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/NotInheritedScope.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/NotInheritedScope.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,21 @@ +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.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.context.ScopeType; + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@ScopeType +@interface NotInheritedScope +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Order.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Order.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Order.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Order.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +import javax.inject.Production; + +@Production +class Order +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Pollock.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Pollock.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Pollock.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Pollock.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +import javax.context.Dependent; + +@AnimalStereotype +@FishStereotype +@Dependent +class Pollock implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RedSnapper.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/RedSnapper.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RedSnapper.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RedSnapper.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +import javax.context.RequestScoped; + +@FishStereotype +@RequestScoped +class RedSnapper implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Retriever.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Retriever.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Retriever.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Retriever.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +import javax.context.ApplicationScoped; + +@ApplicationScoped +class Retriever extends Dog +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/RiverFishStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Stereotype; +import javax.context.ApplicationScoped; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@interface RiverFishStereotype +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,135 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +import javax.context.ApplicationScoped; +import javax.context.Dependent; +import javax.context.RequestScoped; +import javax.inject.manager.Bean; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +public class ScopeDefinitionTest extends AbstractDeclarativeTest +{ + + @Test @SpecAssertion(section="2.4", id = "c") + public void testScopeTypesAreExtensible() + { + assert getCurrentManager().resolveByType(Mullet.class).size() == 1; + Bean<Mullet> bean = getCurrentManager().resolveByType(Mullet.class).iterator().next(); + assert bean.getScopeType().equals(AnotherScopeType.class); + } + + @Test(groups={"stub", "annotationDefinition"}) + @SpecAssertion(section="2.4.2", id = "aa") + public void testScopeTypeHasCorrectTarget() + { + assert false; + } + + @Test(groups={"stub", "annotationDefinition"}) + @SpecAssertion(section="2.4.2", id = "b") + public void testScopeTypeDeclaresScopeTypeAnnotation() + { + assert false; + } + + @Test @SpecAssertion(section="2.4.3", id = "a") + public void testScopeDeclaredInJava() + { + assert getCurrentManager().resolveByType(SeaBass.class).size() == 1; + Bean<SeaBass> bean = getCurrentManager().resolveByType(SeaBass.class).iterator().next(); + assert bean.getScopeType().equals(RequestScoped.class); + } + + @Test(groups={"stub", "webbeansxml"}) + @SpecAssertion(section="2.4.4", id = "a") + public void testScopeDeclaredInXml() + { + assert false; + } + + @Test @SpecAssertion(section="2.4.5", id = "a") + public void testDefaultScope() + { + assert getCurrentManager().resolveByType(Order.class).size() == 1; + Bean<Order> bean = getCurrentManager().resolveByType(Order.class).iterator().next(); + assert bean.getScopeType().equals(Dependent.class); + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "2.4.5", id = "e"), + @SpecAssertion(section = "2.7.2", id = "a") + }) + public void testScopeSpecifiedAndStereotyped() + { + assert getCurrentManager().resolveByType(Minnow.class).size() == 1; + Bean<Minnow> bean = getCurrentManager().resolveByType(Minnow.class).iterator().next(); + assert bean.getScopeType().equals(RequestScoped.class); + } + + @Test @SpecAssertion(section="2.4.5", id = "d") + public void testMutipleIncompatibleScopeStereotypesWithScopeSpecified() + { + assert getCurrentManager().resolveByType(Pollock.class).size() == 1; + Bean<Pollock> bean = getCurrentManager().resolveByType(Pollock.class).iterator().next(); + assert bean.getScopeType().equals(Dependent.class); + } + + @Test @SpecAssertion(section="2.4.5", id = "c") + public void testMutipleCompatibleScopeStereotypes() + { + assert getCurrentManager().resolveByType(Grayling.class).size() == 1; + Bean<Grayling> bean = getCurrentManager().resolveByType(Grayling.class).iterator().next(); + assert bean.getScopeType().equals(ApplicationScoped.class); + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "2.7.2", id = "db"), + @SpecAssertion(section = "4.1", id = "h") + }) + public void testWebBeanScopeTypeOverridesStereotype() + { + assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1; + Bean<RedSnapper> bean = getCurrentManager().resolveByType(RedSnapper.class).iterator().next(); + assert bean.getScopeType().equals(RequestScoped.class); + } + + @Test @SpecAssertion(section="4.1", id = "b") + public void testScopeTypeDeclaredInheritedIsInherited() throws Exception + { + assert getCurrentManager().resolveByType(BorderCollie.class).size() == 1; + assert getCurrentManager().resolveByType(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class); + } + + @Test @SpecAssertion(section="4.1", id = "b") + public void testScopeTypeNotDeclaredInheritedIsNotInherited() + { + assert getCurrentManager().resolveByType(ShetlandPony.class).size() == 1; + assert getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getScopeType().equals(Dependent.class); + } + + @Test @SpecAssertion(section="4.1", id = "b") + public void testScopeTypeDeclaredInheritedIsBlockedByIntermediateScopeTypeMarkedInherited() + { + assert getCurrentManager().resolveByType(GoldenRetriever.class).size() == 1; + } + + @Test @SpecAssertion(section="4.1", id = "b") + public void testScopeTypeDeclaredInheritedIsBlockedByIntermediateScopeTypeNotMarkedInherited() + { + assert getCurrentManager().resolveByType(GoldenLabrador.class).size() == 1; + assert getCurrentManager().resolveByType(GoldenLabrador.class).iterator().next().getScopeType().equals(Dependent.class); + } + +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/SeaBass.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/SeaBass.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/SeaBass.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/SeaBass.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +import javax.context.RequestScoped; +import javax.inject.Production; + +@Production +@RequestScoped +class SeaBass implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ShetlandPony.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ShetlandPony.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ShetlandPony.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ShetlandPony.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.scope; + +class ShetlandPony extends Horse +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/AnimalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/AnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.scope.incompatibleStereotypes; +package org.jboss.jsr299.tck.tests.definition.scope.incompatibleStereotypes; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/FishStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/FishStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.scope.incompatibleStereotypes; +package org.jboss.jsr299.tck.tests.definition.scope.incompatibleStereotypes; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.scope.incompatibleStereotypes; +package org.jboss.jsr299.tck.tests.definition.scope.incompatibleStereotypes; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/Scallop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/Scallop_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/Scallop_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.scope.incompatibleStereotypes; +package org.jboss.jsr299.tck.tests.definition.scope.incompatibleStereotypes; @AnimalStereotype Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/tooMany) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.scope.tooMany; +package org.jboss.jsr299.tck.tests.definition.scope.tooMany; import javax.context.ConversationScoped; import javax.context.RequestScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/TooManyScopesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/tooMany/TooManyScopesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/TooManyScopesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.scope.tooMany; +package org.jboss.jsr299.tck.tests.definition.scope.tooMany; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Animal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Animal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +interface Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/AnimalStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Stereotype; +import javax.context.RequestScoped; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +@Inherited +@interface AnimalStereotype +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/AnotherStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Stereotype; + +@Stereotype +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@AnotherDeploymentType +@interface AnotherStereotype +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Stereotype; +import javax.context.ApplicationScoped; + +@ApplicationScoped +(a)Stereotype(supportedScopes=ApplicationScoped.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@HornedAnimalDeploymentType +@interface ApplicationScopedHornedMammalStereotype +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/BorderCollie.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/BorderCollie.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/BorderCollie.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/BorderCollie.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +class BorderCollie extends LongHairedDog +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Goldfish.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +import javax.context.RequestScoped; + +@RequestScopedAnimalStereotype +@RequestScoped +class Goldfish implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/HighlandCow.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +import javax.context.RequestScoped; + +@HornedMammalStereotype +@RequestScopedAnimalStereotype +@RequestScoped +@Tame +class HighlandCow implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/HornedAnimalDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface HornedAnimalDeploymentType +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/HornedMammalStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@HornedAnimalDeploymentType +@interface HornedMammalStereotype +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Horse.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Horse.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Horse.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Horse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +@AnotherStereotype +class Horse +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/LongHairedDog.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/LongHairedDog.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/LongHairedDog.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/LongHairedDog.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +@AnimalStereotype +class LongHairedDog implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Moose.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Moose.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Moose.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Moose.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +@AnimalStereotype +class Moose implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Reindeer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Reindeer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Reindeer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Reindeer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +@HornedMammalStereotype +class Reindeer implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/RequestScopedAnimalStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Stereotype; +import javax.context.RequestScoped; + +(a)Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@interface RequestScopedAnimalStereotype +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShetlandPony.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/ShetlandPony.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShetlandPony.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShetlandPony.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +class ShetlandPony extends Horse +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Springbok.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +import javax.context.ApplicationScoped; + +@ApplicationScopedHornedMammalStereotype +@RequestScopedAnimalStereotype +@ApplicationScoped +class Springbok implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,167 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +import java.lang.annotation.Annotation; + +import javax.context.ApplicationScoped; +import javax.context.Dependent; +import javax.context.RequestScoped; +import javax.inject.AnnotationLiteral; +import javax.inject.Production; +import javax.inject.manager.Bean; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +public class StereotypeDefinitionTest extends AbstractDeclarativeTest +{ + + private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; + + /** + * TODO Difficult to test since all user defined stereotypes are not known + * here + * + * PLM - agreed, as the spec doesn't say what exception to throw. Probably this won't be tested + */ + @Test(groups = { "stub", "annotationDefinition" }) + @SpecAssertion(section = "2.7.1", id = "aa") + public void testHasCorrectTarget() + { + assert false; + } + + /** + * TODO If the stereotype does not have a stereotype annotation, then it + * isn't one and is difficult to test + * + * PLM - just test that a stereotype which doesn't have the annotation isn't used as such + */ + @Test(groups = { "stub", "annotationDefinition" }) + @SpecAssertion(section = "2.7.1", id = "b") + public void testHasStereotypeAnnotation() + { + assert false; + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "2.7.1.1", id = "a"), + @SpecAssertion(section = "2.4.3", id = "c") + }) + public void testStereotypeWithScopeType() + { + assert getCurrentManager().resolveByType(Moose.class).size() == 1; + assert getCurrentManager().resolveByType(Moose.class).iterator().next().getScopeType().equals(RequestScoped.class); + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "2.7.1.1", id = "a"), + @SpecAssertion(section="2.4.5", id = "b") + }) + public void testStereotypeWithoutScopeType() + { + assert getCurrentManager().resolveByType(Reindeer.class).size() == 1; + assert getCurrentManager().resolveByType(Reindeer.class).iterator().next().getScopeType().equals(Dependent.class); + } + + @Test( groups = "stub" ) + @SpecAssertion(section = "2.7.1.2", id = "a") + public void testStereotypeWithoutInterceptors() + { + assert false; + } + + @Test(groups = { "stub", "interceptors" }) + @SpecAssertion(section = "2.7.1.2", id = "b") + public void testStereotypeWithInterceptors() + { + assert false; + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "2.7.2", id = "e"), + @SpecAssertion(section = "2.7.4", id = "c"), + @SpecAssertion(section = "2.7", id = "d") + }) + public void testMultipleStereotypes() + { + assert getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).size() == 1; + Bean<HighlandCow> highlandCow = getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).iterator().next(); + assert highlandCow.getName() == null; + assert highlandCow.getBindings().iterator().next().annotationType().equals(Tame.class); + assert highlandCow.getScopeType().equals(RequestScoped.class); + assert highlandCow.getDeploymentType().equals(HornedAnimalDeploymentType.class); + } + + @Test + @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), + @SpecAssertion(section = "2.7.4", id = "c") }) + public void testMultipleStereotypesMergesScopes() + { + assert getCurrentManager().resolveByType(Springbok.class).size() == 1; + assert getCurrentManager().resolveByType(Springbok.class).iterator().next().getScopeType().equals(ApplicationScoped.class); + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "2.7.3", id = "a") + public void testStereotypeDeclaredInXmlIgnoresJavaStereotypes() + { + assert false; + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "2.7.3", id = "a") + public void testStereotypeDeclaredInXmlIgnoresJavaBindingTypes() + { + assert false; + + } + + @Test + @SpecAssertions( { @SpecAssertion(section = "2.7.1.4", id = "b"), + @SpecAssertion(section = "2.7.4", id = "a") }) + public void testRequiredTypeIsImplemented() + { + assert getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).size() == 1; + assert getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).iterator().next().getTypes().contains(Animal.class); + } + + @Test + @SpecAssertions( { @SpecAssertion(section = "2.7.1.4", id = "a"), + @SpecAssertion(section = "2.7.4", id = "b") }) + public void testScopeIsSupported() + { + assert getCurrentManager().resolveByType(Goldfish.class).size() == 1; + assert getCurrentManager().resolveByType(Goldfish.class).iterator().next().getScopeType().equals(RequestScoped.class); + } + + @Test + @SpecAssertion(section = "4.1", id = "a") + public void testStereotypeDeclaredInheritedIsInherited() throws Exception + { + assert getCurrentManager().resolveByType(BorderCollie.class).size() == 1; + assert getCurrentManager().resolveByType(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class); + } + + @Test + @SpecAssertion(section = "4.1", id = "a") + public void testStereotypeNotDeclaredInheritedIsNotInherited() + { + assert getCurrentManager().resolveByType(ShetlandPony.class).size() == 1; + assert getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class); + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Tame.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Tame.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Tame +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; @HornedMammalStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleScopeTypes; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/Deer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/Deer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/Deer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleScopeTypes; @ApplicationScopedHornedMammalStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleScopeTypes; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.multipleStereotypesWithMultipleScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleScopeTypes; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/FallowDeer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/FallowDeer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/FallowDeer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.nonEmptyNamed; +package org.jboss.jsr299.tck.tests.definition.stereotype.nonEmptyNamed; @StereotypeWithNonEmptyNamed_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.nonEmptyNamed; +package org.jboss.jsr299.tck.tests.definition.stereotype.nonEmptyNamed; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.nonEmptyNamed; +package org.jboss.jsr299.tck.tests.definition.stereotype.nonEmptyNamed; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypeNotImplemented; +package org.jboss.jsr299.tck.tests.definition.stereotype.requiredTypeNotImplemented; interface Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypeNotImplemented; +package org.jboss.jsr299.tck.tests.definition.stereotype.requiredTypeNotImplemented; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/Chair_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/Chair_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/Chair_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypeNotImplemented; +package org.jboss.jsr299.tck.tests.definition.stereotype.requiredTypeNotImplemented; @AnimalStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/RequiredTypeNotImplementedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypeNotImplemented/RequiredTypeNotImplementedTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/RequiredTypeNotImplementedTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypeNotImplemented; +package org.jboss.jsr299.tck.tests.definition.stereotype.requiredTypeNotImplemented; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypesMerged; +package org.jboss.jsr299.tck.tests.definition.stereotype.requiredTypesMerged; interface Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Antelope_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Antelope_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Antelope_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypesMerged; +package org.jboss.jsr299.tck.tests.definition.stereotype.requiredTypesMerged; @HornedMammalStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Bovine.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Bovine.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Bovine.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypesMerged; +package org.jboss.jsr299.tck.tests.definition.stereotype.requiredTypesMerged; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypesMerged; +package org.jboss.jsr299.tck.tests.definition.stereotype.requiredTypesMerged; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Mammal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/Mammal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Mammal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypesMerged; +package org.jboss.jsr299.tck.tests.definition.stereotype.requiredTypesMerged; interface Mammal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/RequiredTypesMergedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/requiredTypesMerged/RequiredTypesMergedTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/RequiredTypesMergedTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.requiredTypesMerged; +package org.jboss.jsr299.tck.tests.definition.stereotype.requiredTypesMerged; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/Carp_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/Carp_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/Carp_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.scopeNotSupported; +package org.jboss.jsr299.tck.tests.definition.stereotype.scopeNotSupported; @RequestScopedStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.scopeNotSupported; +package org.jboss.jsr299.tck.tests.definition.stereotype.scopeNotSupported; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/ScopeNotSupportedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/scopeNotSupported/ScopeNotSupportedTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/ScopeNotSupportedTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.scopeNotSupported; +package org.jboss.jsr299.tck.tests.definition.stereotype.scopeNotSupported; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyDeployElements; +package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyDeployElements; import javax.inject.DeploymentException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyDeploymentTypes; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/Gazelle_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/Gazelle_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/Gazelle_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyDeploymentTypes; @StereotypeWithTooManyDeploymentTypes_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyDeploymentTypes; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyDeploymentTypes; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/Elk_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/Elk_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/Elk_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyScopeTypes; @StereotypeWithTooManyScopeTypes_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyScopeTypes; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyScopeTypes; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/Asynchronous.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.withBindingTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.withBindingTypes; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/RoeDeer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/RoeDeer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/RoeDeer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.withBindingTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.withBindingTypes; @StereotypeWithBindingTypes_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.withBindingTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.withBindingTypes; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype.withBindingTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.withBindingTypes; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotype.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnimalStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.event; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Stereotype; +import javax.context.RequestScoped; + +@Stereotype() +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +@interface AnimalStereotype +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotypeAnnotationLiteral.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnimalStereotypeAnnotationLiteral.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotypeAnnotationLiteral.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotypeAnnotationLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.inject.AnnotationLiteral; + +class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.event; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BananaSpider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.tests.event; + +import java.util.Set; + +import javax.event.Observer; +import javax.event.Observes; +import javax.inject.Current; +import javax.inject.manager.Manager; + +/** + * Simple bean with observer method and another injectable parameter. + * + */ +class BananaSpider +{ + public void observeStringEvent(@Observes String someEvent, @Current Manager manager) + { + assert someEvent != null; + assert manager != null; + Set<Observer<String>> allStringObservers = manager.resolveObservers(someEvent); + assert allStringObservers != null; + assert allStringObservers.size() > 0; + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BullTerrier.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.event.Observes; + +class BullTerrier +{ + public void observesBadEvent(@Observes @Role("Admin") @Tame MultiBindingType someEvent) + { + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/ConditionalEvent.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ConditionalEvent.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/ConditionalEvent.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/ConditionalEvent.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.event; + +class ConditionalEvent +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/ConditionalEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Delivery.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Delivery.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Delivery.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Delivery.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.event; + +class Delivery +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Delivery.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EJBEvent.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EJBEvent.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EJBEvent.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EJBEvent.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.event; + +class EJBEvent +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EJBEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Egg.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Egg.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Egg.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Egg.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.event; + +class Egg +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Egg.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,768 @@ +package org.jboss.jsr299.tck.tests.event; + +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.Set; + +import javax.context.Dependent; +import javax.event.Event; +import javax.event.Observer; +import javax.inject.DuplicateBindingTypeException; +import javax.inject.Standard; +import javax.inject.manager.Bean; +import javax.inject.manager.Manager; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +/** + * Event bus tests + * + * @author Nicklas Karlsson + * @author David Allen + * + * Spec version: Public Release Draft 2 + */ +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +public class EventTest extends AbstractDeclarativeTest +{ + + public static class AnEventType + { + } + + public static class ATemplatedEventType<T> + { + } + + public static class AnObserver implements Observer<AnEventType> + { + public boolean wasNotified = false; + + public void notify(AnEventType event) + { + wasNotified = true; + } + } + + public static class AListObserver implements Observer<ArrayList<String>> + { + public boolean wasNotified = false; + + public void notify(ArrayList<String> event) + { + wasNotified = true; + } + } + + public static class AnotherListObserver implements Observer<ArrayList<Integer>> + { + public boolean wasNotified = false; + + public void notify(ArrayList<Integer> event) + { + wasNotified = true; + } + } + + public static class AnObserverWithException implements Observer<AnEventType> + { + public boolean wasNotified = false; + public RuntimeException theException = new RuntimeException("RE1"); + + public void notify(AnEventType event) + { + wasNotified = true; + throw theException; + } + } + + /** + * An event binding type is a Java annotation defined as @Target({FIELD, + * PARAMETER}) ~or @Target({METHOD, FIELD, PARAMETER, TYPE}) and + * + * @Retention(RUNTIME)~ + */ + @Test(groups = { "events", "stub" }) + @SpecAssertions( { @SpecAssertion(section = "7.1", id = "d") }) + public void testEventBindingTypeTargetMostAndRuntime() + { + + } + + /** + * An event binding type is a Java annotation defined as ~@Target({FIELD, + * PARAMETER}) or~ @Target({METHOD, FIELD, PARAMETER, TYPE}) ~and + * + * @Retention(RUNTIME)~ + */ + @Test(groups = { "events", "stub" }) + @SpecAssertions( { @SpecAssertion(section = "7.1", id = "e") }) + public void testEventBindingTypeTargetsFieldParameterAndRuntime() + { + + } + + /** + * An event binding type is a Java annotation defined as ~@Target({FIELD, + * PARAMETER}) or @Target({METHOD, FIELD, PARAMETER, TYPE}) and + * ~@Retention(RUNTIME) TODO If the binding does not have RUNTIME retention, + * it cannot be tested + */ + @Test(groups = { "events", "broken" }) + @SpecAssertions( { @SpecAssertion(section = "7.1", id = "f") }) + public void testEventBindingTypeNotRuntime() + { + + } + + // TODO How to test all annotations w/o BindingType are not event bindings + @Test(groups = { "events", "broken" }) + @SpecAssertions( { @SpecAssertion(section = "7.1", id = "g") }) + public void testEventBindingTypesSpecifyBinding() + { + + } + + @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) + @SpecAssertions( { @SpecAssertion(section = "7.1", id = "a"), @SpecAssertion(section = "7.2", id = "b") }) + public void testManagerFireEventWithEventTypeParametersFails() + { + ATemplatedEventType<String> anEvent = new ATemplatedEventType<String>(); + getCurrentManager().fireEvent(anEvent); + } + + @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) + @SpecAssertions( { @SpecAssertion(section = "7.1", id = "b"), @SpecAssertion(section = "7.2", id = "c") }) + public void testManagerFireEventWithEventTypeWildcardsFails() + { + // Although the above test is really the same as with a wildcard, + // we will test it anyhow since the specification calls it out separately. + ATemplatedEventType<?> anEventOnAnyType = new ATemplatedEventType<String>(); + getCurrentManager().fireEvent(anEventOnAnyType); + } + + @Test(groups = { "events" }) + @SpecAssertions( { @SpecAssertion(section = "7.2", id = "a") }) + public void testManagerInterfaceForFireEventMethod() throws Exception + { + assert Manager.class.getDeclaredMethod("fireEvent", Object.class, Annotation[].class) != null; + } + + @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) + @SpecAssertions( { @SpecAssertion(section = "7.2", id = "d") }) + public void testManagerFireEventWithNonBindingAnnotationsFails() + { + // The specs are not exactly clear on what is supposed to happen here, + // but borrowing from Section 8.3, we'll expect the same behavior here + // for a consistent API. + // TODO Verify that fireEvent should fail on non-binding annotations + AnEventType anEvent = new AnEventType(); + getCurrentManager().fireEvent(anEvent, new AnimalStereotypeAnnotationLiteral()); + } + + /** + * The Manager interface provides a method for firing events: + */ + @Test(groups = { "events" }) + @SpecAssertion(section = "7.2", id = "a") + public void testManagerFireEvent() + { + // First a simple event with no bindings is fired + AnEventType anEvent = new AnEventType(); + getCurrentManager().fireEvent(anEvent); + + // Next an event with some event bindings is fired + getCurrentManager().fireEvent(anEvent, new RoleBinding("Admin")); + } + + // TODO This is not an assertion but a definition which is circular + @Test(groups = { "events" }) + @SpecAssertion(section = "7.3", id = "a") + public void testObserversImplementObserverInterface() + { + Observer<String> observer = new Observer<String>() + { + public void notify(String event) + { + } + }; + assert observer != null; + } + + @Test(groups = { "events", "broken" }, expectedExceptions = { IllegalArgumentException.class }) + @SpecAssertions( { @SpecAssertion(section = "7.3", id = "f") }) + public void testManagerAddObserverWithEventTypeParametersFails() + { + assert false; + // ATemplatedEventType<String> anEvent = new + // ATemplatedEventType<String>(); + // Observer<AnEventType> observer = new AnObserver(); + // getCurrentManager().addObserver(observer, anEvent.getClass()); + } + + @Test(groups = { "events", "broken" }, expectedExceptions = { IllegalArgumentException.class }) + @SpecAssertions( { @SpecAssertion(section = "7.3", id = "g") }) + public void testManagerAddObserverWithEventTypeWildcardsFails() + { + // Although the above test is really the same as with a wildcard, + // we will test it anyhow since the specification calls it out separately. + ATemplatedEventType<?> anEventOnAnyType = new ATemplatedEventType<String>(); + assert false; + } + + @Test(groups = { "events", "broken" }, expectedExceptions = { IllegalArgumentException.class }) + @SpecAssertions( { @SpecAssertion(section = "7.3", id = "h") }) + public void testManagerRemoveObserverWithEventTypeParametersFails() + { + assert false; + // ATemplatedEventType<String> anEvent = new + // ATemplatedEventType<String>(); + // Observer<AnEventType> observer = new AnObserver(); + // getCurrentManager().addObserver(observer, anEvent.getClass()); + } + + @Test(groups = { "events", "stub" }, expectedExceptions = { IllegalArgumentException.class }) + @SpecAssertions( { @SpecAssertion(section = "7.3", id = "i") }) + public void testManagerRemoveObserverWithEventTypeWildcardsFails() + { + // Although the above test is really the same as with a wildcard, + // we will test it anyhow since the specification calls it out separately. + ATemplatedEventType<?> anEventOnAnyType = new ATemplatedEventType<String>(); + assert false; + } + + @Test(groups = { "events", "stub" }) + @SpecAssertions( { @SpecAssertion(section = "7.4", id = "a") }) + public void testObserverNotificationCallsResolveObservers() + { + assert false; + } + + @Test(groups = { "events" }) + @SpecAssertions( { @SpecAssertion(section = "7.5", id = "a"), @SpecAssertion(section = "7.5.2", id = "a")} ) + public void testObserverMethodAutomaticallyRegistered() + { + assert !getCurrentManager().resolveObservers("event").isEmpty(); + } + + @Test(groups = { "events" }) + @SpecAssertion(section = "7.5", id = "e") + public void testMultipleObserverMethodsForSameEventOK() + { + assert getCurrentManager().resolveObservers("event").size() > 1; + } + + @Test(groups = { "events" }) + @SpecAssertion(section = "7.5", id = "f") + public void testMultipleObserverMethodsOnBeanOK() + { + // Resolve the observers for types 1 and 2 + Set<Observer<ObservedType1>> resolvedStringObservers = getCurrentManager().resolveObservers(new ObservedType1()); + assert resolvedStringObservers.size() == 1; + + Set<Observer<ObservedType2>> resolvedIntegerObservers = getCurrentManager().resolveObservers(new ObservedType2()); + assert resolvedIntegerObservers.size() == 1; + } + + @Test(groups = { "events", "ejb" }) + @SpecAssertion(section = "7.5", id = "d") + public void testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic() + { + Set<Observer<EJBEvent>> observers = getCurrentManager().resolveObservers(new EJBEvent()); + assert observers.size() == 2; + } + + @Test(groups = { "events" }) + @SpecAssertion(section = "7.5.1", id = "b") + public void testObserverMethodWithoutBindingTypesObservesEventsWithoutBindingTypes() + { + // Resolve registered observers with an event containing no binding types + Set<Observer<SimpleEventType>> resolvedObservers = getCurrentManager().resolveObservers(new SimpleEventType()); + assert resolvedObservers.size() == 2; + } + + @Test(groups = { "events" }) + @SpecAssertion(section = "7.5.2", id = "g") + public void testObserverMethodMayHaveMultipleBindingTypes() + { + Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class); + assert beans != null; + // If we can resolve the observer with the two binding types, + // then it worked + Set<Observer<MultiBindingType>> resolvedObservers = getCurrentManager().resolveObservers(new MultiBindingType(), new RoleBinding("Admin"), new TameAnnotationLiteral()); + assert resolvedObservers.size() == 1; + + } + + @Test(groups = { "stub", "events", "webbeansxml" }) + @SpecAssertions( { @SpecAssertion(section = "7.5.3", id = "a"), @SpecAssertion(section = "7.5.3", id = "b") } ) + public void testXMLDefinedObserverMethodIgnoresBindingAnnotations() + { + assert false; + } + + @Test(groups = { "stub", "events", "webbeansxml" }) + @SpecAssertion(section = "7.5.3", id = "c") + public void testXMLDefinedObserverNotFindingImplementationMethodFails() + { + assert false; + } + + /** + * In addition to the event parameter, observer methods may declare + * additional parameters, which may declare bindings. The container calls the + * method Manager.getInstanceToInject() defined in Section 5.7.1, "Resolving + * dependencies" to determine a value for each parameter of an observer + * method and calls the observer method with those parameter values. + * + * To invoke an observer method, the container must pass the event object to + * the event parameter and the object returned by + * Manager.getInstanceToInject() to each of the other parameters. + */ + @Test(groups = { "events" }) + @SpecAssertions( { @SpecAssertion(section = "7.5.4", id = "a"), @SpecAssertion(section = "7.5.8", id = "j") }) + public void testObserverMethodReceivesInjectionsOnNonObservesParameters() + { + Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class); + assert beans != null; + } + + // TODO This test was working well in January 2009 but no longer creates the + // observer + @Test(groups = { "events", "broken" }) + @SpecAssertions( { @SpecAssertion(section = "7.5.5", id = "a"), @SpecAssertion(section = "7.5.5", id = "b")} ) + public void testConditionalObserver() throws Exception + { + RecluseSpider.notified = false; + getCurrentManager().fireEvent(new ConditionalEvent()); + // Should not be notified since bean is not instantiated yet + assert !RecluseSpider.notified; + + // Now instantiate the bean and fire another event + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + RecluseSpider bean = getCurrentManager().getInstanceByType(RecluseSpider.class); + assert bean != null; + + getCurrentManager().fireEvent(new ConditionalEvent()); + assert RecluseSpider.notified; + } + + }.run(); + } + + @Test(groups = { "events", "stub" }) + @SpecAssertions( { @SpecAssertion(section = "7.5.5", id = "c") } ) + public void testConditionalObserverDefinedByXML() + { + assert false; + } + + @Test(groups = { "stub", "events" }) + @SpecAssertion(section = "7.5.7", id = "a") + public void testAsynchronousObserverIsAsynchronous() + { + assert false; + } + + @Test(groups = { "stub", "events", "webbeansxml" }) + @SpecAssertion(section = "7.5.7", id = "b") + public void testAsynchronousObserverDeclaredByXML() + { + assert false; + } + + @Test(groups = { "stub", "events" }) + @SpecAssertion(section = "7.5.7", id = "c") + public void testAsynchronousObserverAlsoTransactional() + { + assert false; + } + + @Test(groups = { "events" }) + @SpecAssertion(section = "7.5.8", id = "a") + public void testObserverMethodRegistration() + { + // Resolve registered observers with an event containing no binding types + Set<Observer<SimpleEventType>> resolvedObservers = getCurrentManager().resolveObservers(new SimpleEventType()); + assert resolvedObservers.size() == 2; + } + + @Test(groups = { "stub", "events" }) + @SpecAssertions( { @SpecAssertion(section = "7.5.8", id = "c"), @SpecAssertion(section = "7.5.8", id = "g")} ) + public void testAsynchronousObserverMethodCalledAsynchronously() + { + assert false; + } + + @Test(groups = { "stub", "events" }) + @SpecAssertions( { @SpecAssertion(section = "7.5.8", id = "b"), @SpecAssertion(section = "7.5.8", id = "h")} ) + public void testObserverMethodCalledImmediately() + { + + assert false; + } + + @Test(groups = { "events" }) + @SpecAssertions( { @SpecAssertion(section = "7.5", id = "c"), @SpecAssertion(section = "7.5.8", id = "k")} ) + public void testStaticObserverMethodInvoked() + { + getCurrentManager().fireEvent(new Delivery()); + assert StaticObserver.isDeliveryReceived(); + } + + /** + * Otherwise, if the observer method is non-static, the container must: + * + * • obtain the Bean object for the most specialized bean that specializes + * the bean which declares the observer method, and then + * + */ + @Test(groups = { "events" }) + @SpecAssertion(section = "7.5.8", id = "l") + public void testObserverCalledOnMostSpecializedInstance() + { + Shop.deliveryObservedBy = null; + getCurrentManager().fireEvent(new Delivery()); + assert Shop.deliveryObservedBy.equals(FarmShop.class.getName()); + } + + /** + * obtain the context object by calling Manager.getContext(), passing the + * bean scope, then + */ + @Test(groups = { "stub", "events" }) + @SpecAssertion(section = "7.5.8", id = "m") + public void testObserverContextRetrieved() + { + assert false; + } + + /** + * obtain an instance of the bean by calling Context.get(), passing the Bean + * instance representing the bean, together with a CreationalContext unless + * this observer method is a conditional observer method, and then + */ + @Test(groups = { "stub", "events" }) + @SpecAssertion(section = "7.5.8", id = "n") + public void testObserverInstanceRetrievedFromContext() + { + assert false; + } + + /** + * if the get() method returned a non-null value, invoke the observer method + * on the returned instance + */ + @Test(groups = { "stub", "events" }) + @SpecAssertion(section = "7.5.8", id = "o") + public void testObserverMethodInvokedOnReturnedInstanceFromContext() + { + assert false; + } + + @Test(groups = { "stub", "events" }) + @SpecAssertion(section = "7.5.8", id = "p") + public void testAsynchronousObserverThrowsExceptionIsLogged() + { + assert false; + } + + @Test(groups = { "stub", "events" }) + @SpecAssertion(section = "7.5.9", id = "a") + public void testAsynchronousObserverMethodContexts() + { + assert false; + } + + @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class }) + @SpecAssertion(section = "7.6", id = "g") + public void testDuplicateBindingsToFireFails() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + SweeWaxbill bean = getCurrentManager().getInstanceByType(SweeWaxbill.class); + bean.methodThatFiresEvent(); + } + + }.run(); + } + + @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class }) + @SpecAssertion(section = "7.6", id = "g") + public void testDuplicateBindingsToObservesFails() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + SweeWaxbill bean = getCurrentManager().getInstanceByType(SweeWaxbill.class); + bean.methodThatRegistersObserver(); + } + + }.run(); + } + + @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) + @SpecAssertion(section = "7.6", id = "h") + public void testNonBindingTypePassedToFireFails() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + OwlFinch_Broken bean = getCurrentManager().getInstanceByType(OwlFinch_Broken.class); + bean.methodThatFiresEvent(); + } + + }.run(); + } + + @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) + @SpecAssertion(section = "7.6", id = "h") + public void testNonBindingTypePassedToObservesFails() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + OwlFinch_Broken bean = getCurrentManager().getInstanceByType(OwlFinch_Broken.class); + bean.methodThatRegistersObserver(); + } + + }.run(); + } + + @Test(groups = { "events" }) + @SpecAssertion(section = "7.6", id = "n") + public void testImplicitEventBeanMatchesAPITypeOfInectionPoint() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + // Retrieve the implicit event bean from the manager only by + // its API type + Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding()); + assert !eventBeans.isEmpty(); + } + + }.run(); + } + + @Test(groups = { "events" }) + @SpecAssertion(section = "7.6", id = "n") + public void testImplicitEventBeanMatchesBindingAnnotationsOfInjectionPoint() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + // Retrieve the implicit event bean from the manager + // by its binding types (uses OrangeCheekedWaxbill) + Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding(), new TameAnnotationLiteral(), new RoleBinding("Admin")); + assert !eventBeans.isEmpty(); + } + + }.run(); + } + + @Test(groups = { "events" }) + @SpecAssertion(section = "7.6", id = "o") + public void testImplicitEventBeanHasStandardDeploymentType() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + // Retrieve the implicit event bean from the manager + // only by its API type (uses BlueFacedParrotFinch) + Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding()); + assert eventBeans.size() == 1; + Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); + assert eventBean.getDeploymentType().equals(Standard.class); + } + + }.run(); + } + + @Test(groups = { "events" }) + @SpecAssertion(section = "7.6", id = "p") + public void testImplicitEventBeanHasDependentScope() throws Exception + { + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + // Retrieve the implicit event bean from the manager only + // by its API type (uses BlueFacedParrotFinch) + Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding()); + assert eventBeans.size() == 1; + Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); + assert eventBean.getScopeType().equals(Dependent.class); + } + }.run(); + } + + @Test(groups = { "events" }) + @SpecAssertion(section = "7.6", id = "q") + public void testImplicitEventBeanHasNoName() throws Exception + { + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + // Retrieve the implicit event bean from the manager only + // by its API type (uses BlueFacedParrotFinch) + Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding()); + assert eventBeans.size() == 1; + Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); + assert eventBean.getName() == null; + } + }.run(); + } + + @Test(groups = { "events" }) + @SpecAssertion(section = "7.6", id = "r") + public void testImplicitEventBeanProvidedByContainer() throws Exception + { + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + // Retrieve the implicit event bean from the manager only + // by its API type (uses BlueFacedParrotFinch) + Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding()); + assert eventBeans.size() == 1; + } + }.run(); + } + + // TODO The manager related tests require intercepting all calls + // to it to verify that the correct calls are made. + @Test(groups = { "events", "underInvestigation" }) + @SpecAssertion(section = "7.6", id = "s") + public void testFireMethodCallsManagerFireWithEventObject() + { + assert false; + } + + @Test(groups = { "events", "underInvestigation" }) + @SpecAssertion(section = "7.6", id = "s") + public void testFireMethodCallsManagerFireWithBindingAnnotationsExceptFires() + { + assert false; + } + + @Test(groups = { "events", "underInvestigation" }) + @SpecAssertion(section = "7.6", id = "s") + public void testFireMethodCallsManagerFireWithAllBindingAnnotationInstances() + { + assert false; + } + + @Test(groups = { "events", "underInvestigation" }) + @SpecAssertions( { @SpecAssertion(section = "7.5.8", id = "s"), @SpecAssertion(section = "7.6", id = "u")} ) + public void testObserverMethodCallsManagerAddObserverWithObserverObject() + { + assert false; + } + + @Test(groups = { "events", "underInvestigation" }) + @SpecAssertion(section = "7.6", id = "u") + public void testObserverMethodCallsManagerAddObserverWithAllBindingAnnotationsExceptFires() + { + assert false; + } + + @Test(groups = { "events", "underInvestigation" }) + @SpecAssertion(section = "7.6", id = "u") + public void testObserverMethodCallsManagerAddObserverWithAllBindingAnnotationInstance() + { + assert false; + } + + @Test(groups = { "events" }) + @SpecAssertion(section = "7.7", id = "b") + public void testEventObjectContainsTypeVariablesWhenResolvingFails() + { + eventObjectContainsTypeVariables(new ArrayList<String>()); + } + + private <E> void eventObjectContainsTypeVariables(ArrayList<E> eventToFire) + { + getCurrentManager().resolveObservers(eventToFire); + } + + @Test(groups = { "broken", "events" }, expectedExceptions = { IllegalArgumentException.class }) + @SpecAssertion(section = "7.7", id = "c") + public void testEventObjectContainsWildcardsWhenResolvingFails() + { + eventObjectContainsWildcards(new ArrayList<String>()); + } + + private void eventObjectContainsWildcards(ArrayList<?> eventToFire) + { + // TODO There does not seem to be a way to get wildcarded types passed + getCurrentManager().resolveObservers(eventToFire); + } + + /** + * By default, Java implementation reuse is assumed. In this case, the + * producer, disposal and observer methods of the first bean are not + * inherited by the second bean. + * + * @throws Exception + */ + @Test(groups = { "events", "inheritance" }) + @SpecAssertion(section = "4", id = "a") + public void testNonStaticObserverMethodNotInherited() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + Set<Observer<Egg>> observers = getCurrentManager().resolveObservers(new Egg()); + assert observers.size() == 1; + + // Notify the observer so we can confirm that it + // is a method only on Farmer, and not LazyFarmer + observers.iterator().next().notify(new Egg()); + assert Farmer.getObserverClazz().equals(Farmer.class); + } + + }.run(); + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FarmShop.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.inject.Specializes; + +@Specializes @AnotherDeploymentType +class FarmShop extends Shop +{ + + @Override + public String getClassName() + { + return FarmShop.class.getName(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Farmer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Farmer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Farmer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Farmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.event.Observes; + +class Farmer +{ + private static Class<?> observerClazz; + + public void observeEggLaying(@Observes Egg egg) + { + observerClazz = this.getClass(); + } + + public static Class<?> getObserverClazz() + { + return observerClazz; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Farmer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FiresBinding.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FiresBinding.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FiresBinding.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FiresBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.event.Fires; +import javax.inject.AnnotationLiteral; + +public class FiresBinding extends AnnotationLiteral<Fires> implements Fires +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/LazyFarmer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/LazyFarmer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/LazyFarmer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/LazyFarmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.tests.event; + + +class LazyFarmer extends Farmer +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/LazyFarmer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/MultiBindingType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/MultiBindingType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/MultiBindingType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/MultiBindingType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.event; + +class MultiBindingType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/MultiBindingType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/ObservedType1.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType1.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/ObservedType1.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/ObservedType1.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.event; + +class ObservedType1 +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/ObservedType1.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/ObservedType2.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType2.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/ObservedType2.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/ObservedType2.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.event; + +class ObservedType2 +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/ObservedType2.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OrangeCheekedWaxbill.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OrangeCheekedWaxbill.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OrangeCheekedWaxbill.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.event.Event; +import javax.event.Fires; + + +class OrangeCheekedWaxbill +{ + @Fires @Role("Admin") @Tame + protected Event<String> simpleEvent; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OrangeCheekedWaxbill.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OwlFinch_Broken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OwlFinch_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OwlFinch_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OwlFinch_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,27 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.event.Event; +import javax.event.Fires; +import javax.event.Observer; + + +class OwlFinch_Broken +{ + @Fires + private Event<String> simpleEvent; + + public void methodThatFiresEvent() + { + simpleEvent.fire("An event", new AnimalStereotypeAnnotationLiteral()); + } + + public void methodThatRegistersObserver() + { + simpleEvent.observe(new Observer<String>() + { + public void notify(String event) + { + } + }, new AnimalStereotypeAnnotationLiteral()); + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Pomeranian.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.annotation.Named; +import javax.event.Observes; + +@Named("Teddy") +class Pomeranian +{ + public static Thread notificationThread; + + public void observeSimpleEvent(@Observes SimpleEventType someEvent) + { + notificationThread = Thread.currentThread(); + } + + public static void staticallyObserveEvent(@Observes SimpleEventType someEvent) + { + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/PomeranianInterface.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/PomeranianInterface.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/PomeranianInterface.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/PomeranianInterface.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.ejb.Local; +import javax.event.Observes; + +@Local +public interface PomeranianInterface +{ + public void observeSimpleEvent(@Observes EJBEvent someEvent); +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/RecluseSpider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.event.IfExists; +import javax.event.Observes; + +/** + * Simple web bean that conditionally listens to events. + * + */ +class RecluseSpider +{ + public static boolean notified = false; + + public void observe(@Observes @IfExists ConditionalEvent someEvent) + { + notified = true; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Role.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Role.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Role.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Role.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.event; + +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { FIELD, PARAMETER }) +@Retention(RUNTIME) +@BindingType +@interface Role +{ + String value(); +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/RoleBinding.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.inject.AnnotationLiteral; + + +class RoleBinding extends AnnotationLiteral<Role> implements Role +{ + private String value = null; + + public RoleBinding(String value) + { + this.value = value; + } + + public String value() + { + return value; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Shop.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Shop.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Shop.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Shop.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.event.Observes; + +class Shop +{ + + public static String deliveryObservedBy = null; + + public String getClassName() + { + return Shop.class.getName(); + } + + public void observeDelivery(@Observes Delivery delivery) + { + deliveryObservedBy = getClassName(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Shop.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SimpleEventType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SimpleEventType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SimpleEventType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SimpleEventType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.event; + +class SimpleEventType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SimpleEventType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Spitz.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.annotation.Named; +import javax.ejb.Stateful; +import javax.event.Observes; + +@Stateful +@Tame +@Named("Teddy") +public class Spitz implements PomeranianInterface +{ + public void observeSimpleEvent(@Observes EJBEvent someEvent) + { + } + + public static void staticallyObserveEvent(@Observes EJBEvent someEvent) + { + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StaticObserver.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StaticObserver.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StaticObserver.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StaticObserver.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.event.Observes; + +class StaticObserver +{ + private static boolean deliveryReceived = false; + + public static void accept(@Observes Delivery delivery) + { + setDeliveryReceived(true); + } + + public static boolean isDeliveryReceived() + { + return deliveryReceived; + } + + public static void setDeliveryReceived(boolean deliveryReceived) + { + StaticObserver.deliveryReceived = deliveryReceived; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StaticObserver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StringObserver.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StringObserver.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StringObserver.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StringObserver.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.event.Observes; + +class StringObserver +{ + public void anotherObserver(@Observes String event) + { + + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StringObserver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SweeWaxbill.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,28 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.event.Event; +import javax.event.Fires; +import javax.event.Observer; + + +class SweeWaxbill +{ + @Fires @Role("Admin") + private Event<String> simpleEvent; + + public void methodThatFiresEvent() + { + simpleEvent.fire("An event", new RoleBinding("Admin")); + } + + public void methodThatRegistersObserver() + { + simpleEvent.observe(new Observer<String>() + { + + public void notify(String event) + { + } + }, new RoleBinding("Admin")); + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Tame.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Tame.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.event; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Tame +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TameAnnotationLiteral.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.inject.AnnotationLiteral; + +class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TeaCupPomeranian.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TeaCupPomeranian.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TeaCupPomeranian.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TeaCupPomeranian.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,30 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.annotation.Named; +import javax.event.Observes; + +@Tame +@Named("Teddy") +class TeaCupPomeranian +{ + public static class OversizedException extends RuntimeException + { + private static final long serialVersionUID = 1L; + + } + + public static class TooSmallException extends Exception + { + private static final long serialVersionUID = 1L; + } + + public void observeSimpleEvent(@Observes ObservedType1 someEvent) + { + throw new OversizedException(); + } + + public void observeAnotherSimpleEvent(@Observes ObservedType2 someEvent) throws TooSmallException + { + throw new TooSmallException(); + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/CommonWaxbill_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/CommonWaxbill_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/CommonWaxbill_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.event1; +package org.jboss.jsr299.tck.tests.event.broken.event1; import java.util.ArrayList; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/FiresOnNonEventTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.event1; +package org.jboss.jsr299.tck.tests.event.broken.event1; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/BlackRumpedWaxbill_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/BlackRumpedWaxbill_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/BlackRumpedWaxbill_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.event2; +package org.jboss.jsr299.tck.tests.event.broken.event2; import javax.event.Event; import javax.event.Fires; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/FiresOnEventWithoutTypeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.event2; +package org.jboss.jsr299.tck.tests.event.broken.event2; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/FiresOnEventWithWildcardTypeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.event3; +package org.jboss.jsr299.tck.tests.event.broken.event3; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/GoldbreastWaxbill_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/GoldbreastWaxbill_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/GoldbreastWaxbill_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.event3; +package org.jboss.jsr299.tck.tests.event.broken.event3; import javax.event.Event; import javax.event.Fires; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/FiresOnEventWithTypeVariableTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.event4; +package org.jboss.jsr299.tck.tests.event.broken.event4; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/JavaSparrow_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/JavaSparrow_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/JavaSparrow_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.event4; +package org.jboss.jsr299.tck.tests.event.broken.event4; import java.util.ArrayList; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.observer1; +package org.jboss.jsr299.tck.tests.event.broken.observer1; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/Terrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/Terrier.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/Terrier.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer1; +package org.jboss.jsr299.tck.tests.event.broken.observer1; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/TibetanTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/TibetanTerrier.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/TibetanTerrier.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer1; +package org.jboss.jsr299.tck.tests.event.broken.observer1; import javax.ejb.Stateless; import javax.event.Observes; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrown.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/ObserverExceptionRethrown.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrown.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.observer10; +package org.jboss.jsr299.tck.tests.event.broken.observer10; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer10; +package org.jboss.jsr299.tck.tests.event.broken.observer10; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TameAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/TameAnnotationLiteral.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TameAnnotationLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer10; +package org.jboss.jsr299.tck.tests.event.broken.observer10; import javax.inject.AnnotationLiteral; 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/unit/event/broken/observer10/TeaCupPomeranian.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TeaCupPomeranian.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer10; +package org.jboss.jsr299.tck.tests.event.broken.observer10; import javax.annotation.Named; import javax.event.Observes; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11) 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/unit/event/broken/observer11/CheckedExceptionWrappedTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/CheckedExceptionWrappedTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.observer11; +package org.jboss.jsr299.tck.tests.event.broken.observer11; import javax.event.ObserverException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer11; +package org.jboss.jsr299.tck.tests.event.broken.observer11; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; 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/unit/event/broken/observer11/TeaCupPomeranian.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/TeaCupPomeranian.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer11; +package org.jboss.jsr299.tck.tests.event.broken.observer11; import javax.annotation.Named; import javax.event.Observes; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer12) 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/unit/event/broken/observer12/NonSimpleBean_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/NonSimpleBean_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.observer12; +package org.jboss.jsr299.tck.tests.event.broken.observer12; import javax.event.Observes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/ObserverMethodOnIncorrectBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer12/ObserverMethodOnIncorrectBeanTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/ObserverMethodOnIncorrectBeanTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.observer12; +package org.jboss.jsr299.tck.tests.event.broken.observer12; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/Boxer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/Boxer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/Boxer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer2; +package org.jboss.jsr299.tck.tests.event.broken.observer2; import javax.context.ConversationScoped; import javax.ejb.Stateless; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer2; +package org.jboss.jsr299.tck.tests.event.broken.observer2; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/YorkshireTerrier_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/YorkshireTerrier_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/YorkshireTerrier_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer2; +package org.jboss.jsr299.tck.tests.event.broken.observer2; import javax.event.Observes; import javax.inject.manager.Initialized; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/BostonTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/BostonTerrier.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/BostonTerrier.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer3; +package org.jboss.jsr299.tck.tests.event.broken.observer3; import java.util.List; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.observer3; +package org.jboss.jsr299.tck.tests.event.broken.observer3; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/BorderTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/BorderTerrier.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/BorderTerrier.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer4; +package org.jboss.jsr299.tck.tests.event.broken.observer4; import javax.event.Observes; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.observer4; +package org.jboss.jsr299.tck.tests.event.broken.observer4; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/AustralianTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/AustralianTerrier.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/AustralianTerrier.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer5; +package org.jboss.jsr299.tck.tests.event.broken.observer5; import javax.event.Observes; import javax.inject.Initializer; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.observer5; +package org.jboss.jsr299.tck.tests.event.broken.observer5; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/FoxTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/FoxTerrier.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/FoxTerrier.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer6; +package org.jboss.jsr299.tck.tests.event.broken.observer6; import javax.event.Observes; import javax.inject.Disposes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.observer6; +package org.jboss.jsr299.tck.tests.event.broken.observer6; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7) 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/unit/event/broken/observer7/TooManyPhases_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TooManyPhases_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.observer7; +package org.jboss.jsr299.tck.tests.event.broken.observer7; import javax.event.AfterTransactionFailure; import javax.event.AfterTransactionSuccess; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.observer7; +package org.jboss.jsr299.tck.tests.event.broken.observer7; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.observer8; +package org.jboss.jsr299.tck.tests.event.broken.observer8; import javax.inject.DefinitionException; 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/unit/event/broken/observer8/Terrier.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/Terrier.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer8; +package org.jboss.jsr299.tck.tests.event.broken.observer8; import javax.event.Asynchronously; import javax.event.BeforeTransactionCompletion; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/AsynchronousConditionalObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/AsynchronousConditionalObserverTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/AsynchronousConditionalObserverTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.broken.observer9; +package org.jboss.jsr299.tck.tests.event.broken.observer9; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/Terrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/Terrier.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/Terrier.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.broken.observer9; +package org.jboss.jsr299.tck.tests.event.broken.observer9; import javax.event.Asynchronously; import javax.event.IfExists; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/firesall) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/AbstractEvent.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/firesall/AbstractEvent.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/AbstractEvent.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.firesall; +package org.jboss.jsr299.tck.tests.event.firesall; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/AllEventTypesObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/firesall/AllEventTypesObserver.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/AllEventTypesObserver.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.firesall; +package org.jboss.jsr299.tck.tests.event.firesall; import javax.event.Observes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/AllEventTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/firesall/AllEventTypesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/AllEventTypesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.firesall; +package org.jboss.jsr299.tck.tests.event.firesall; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/ComplexEvent.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/firesall/ComplexEvent.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/ComplexEvent.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.firesall; +package org.jboss.jsr299.tck.tests.event.firesall; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/GeneralEvent.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/firesall/GeneralEvent.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/GeneralEvent.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.firesall; +package org.jboss.jsr299.tck.tests.event.firesall; /** * Arbitrary interface to test firing events and observing all Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.fires1; +package org.jboss.jsr299.tck.tests.event.register.fires1; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AuroraFinch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/AuroraFinch.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AuroraFinch.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,10 +1,10 @@ -package org.jboss.jsr299.tck.unit.event.register.fires1; +package org.jboss.jsr299.tck.tests.event.register.fires1; import javax.event.Event; import javax.event.Fires; import javax.inject.Initializer; -import org.jboss.jsr299.tck.unit.event.register.fires1.StarFinch.Mess; +import org.jboss.jsr299.tck.tests.event.register.fires1.StarFinch.Mess; class AuroraFinch Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BirdCage.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/BirdCage.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BirdCage.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,10 +1,10 @@ -package org.jboss.jsr299.tck.unit.event.register.fires1; +package org.jboss.jsr299.tck.tests.event.register.fires1; import javax.annotation.Named; import javax.context.RequestScoped; import javax.inject.Current; -import org.jboss.jsr299.tck.unit.event.register.fires1.StarFinch.Mess; +import org.jboss.jsr299.tck.tests.event.register.fires1.StarFinch.Mess; @RequestScoped @Named("BirdCage") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BlueFacedParrotFinch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/BlueFacedParrotFinch.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BlueFacedParrotFinch.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.fires1; +package org.jboss.jsr299.tck.tests.event.register.fires1; import javax.event.Event; import javax.event.Fires; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/FinchKeeper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/FinchKeeper.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/FinchKeeper.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,10 +1,10 @@ -package org.jboss.jsr299.tck.unit.event.register.fires1; +package org.jboss.jsr299.tck.tests.event.register.fires1; import javax.annotation.Named; import javax.context.RequestScoped; import javax.event.Observes; -import org.jboss.jsr299.tck.unit.event.register.fires1.StarFinch.Mess; +import org.jboss.jsr299.tck.tests.event.register.fires1.StarFinch.Mess; @RequestScoped @Named("FinchKeeper") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/ImplicitEventBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/ImplicitEventBeanTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/ImplicitEventBeanTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.register.fires1; +package org.jboss.jsr299.tck.tests.event.register.fires1; import java.util.Set; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OrangeCheekedWaxbill.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/OrangeCheekedWaxbill.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OrangeCheekedWaxbill.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,10 +1,10 @@ -package org.jboss.jsr299.tck.unit.event.register.fires1; +package org.jboss.jsr299.tck.tests.event.register.fires1; import javax.event.Event; import javax.event.Fires; import javax.inject.Initializer; -import org.jboss.jsr299.tck.unit.event.register.fires1.StarFinch.Mess; +import org.jboss.jsr299.tck.tests.event.register.fires1.StarFinch.Mess; class OrangeCheekedWaxbill { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/StarFinch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/StarFinch.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/StarFinch.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.fires1; +package org.jboss.jsr299.tck.tests.event.register.fires1; import javax.annotation.Named; import javax.context.RequestScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.fires1; +package org.jboss.jsr299.tck.tests.event.register.fires1; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1) 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/unit/event/register/observer1/AnimalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer1; +package org.jboss.jsr299.tck.tests.event.register.observer1; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotypeAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1/AnimalStereotypeAnnotationLiteral.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotypeAnnotationLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer1; +package org.jboss.jsr299.tck.tests.event.register.observer1; import javax.inject.AnnotationLiteral; 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/unit/event/register/observer1/ConsumerNotifiedForEventTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ConsumerNotifiedForEventTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer1; +package org.jboss.jsr299.tck.tests.event.register.observer1; import javax.event.Observer; 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/unit/event/register/observer1/DuplicateBindingsToAddObserverTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer1; +package org.jboss.jsr299.tck.tests.event.register.observer1; import javax.event.Observer; import javax.inject.DuplicateBindingTypeException; 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/unit/event/register/observer1/DuplicateBindingsToRemoveObserverTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToRemoveObserverTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer1; +package org.jboss.jsr299.tck.tests.event.register.observer1; import javax.event.Observer; import javax.inject.DuplicateBindingTypeException; 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/unit/event/register/observer1/ManagerAddObserverTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.register.observer1; +package org.jboss.jsr299.tck.tests.event.register.observer1; import java.lang.annotation.Annotation; import java.util.Set; 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/unit/event/register/observer1/NonBindingTypesToAddObserverTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToAddObserverTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer1; +package org.jboss.jsr299.tck.tests.event.register.observer1; import javax.event.Observer; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToRemoveObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1/NonBindingTypesToRemoveObserverTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToRemoveObserverTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer1; +package org.jboss.jsr299.tck.tests.event.register.observer1; import javax.event.Observer; 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/unit/event/register/observer1/ObserverExceptionAbortsTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ObserverExceptionAbortsTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer1; +package org.jboss.jsr299.tck.tests.event.register.observer1; import javax.event.Observer; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Role.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1/Role.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Role.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer1; +package org.jboss.jsr299.tck.tests.event.register.observer1; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/RoleBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1/RoleBinding.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/RoleBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer1; +package org.jboss.jsr299.tck.tests.event.register.observer1; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer1; +package org.jboss.jsr299.tck.tests.event.register.observer1; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/TameAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1/TameAnnotationLiteral.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/TameAnnotationLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer1; +package org.jboss.jsr299.tck.tests.event.register.observer1; import javax.inject.AnnotationLiteral; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer2) 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/unit/event/register/observer2/AnimalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer2; +package org.jboss.jsr299.tck.tests.event.register.observer2; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotypeAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer2/AnimalStereotypeAnnotationLiteral.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotypeAnnotationLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer2; +package org.jboss.jsr299.tck.tests.event.register.observer2; import javax.inject.AnnotationLiteral; 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/unit/event/register/observer2/DuplicateBindingsToRemoveObserverTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/DuplicateBindingsToRemoveObserverTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer2; +package org.jboss.jsr299.tck.tests.event.register.observer2; import javax.event.Observer; import javax.inject.DuplicateBindingTypeException; 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/unit/event/register/observer2/ManagerRemoveObserverTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.register.observer2; +package org.jboss.jsr299.tck.tests.event.register.observer2; import java.lang.annotation.Annotation; import java.util.Set; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/NonBindingTypesToRemoveObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer2/NonBindingTypesToRemoveObserverTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/NonBindingTypesToRemoveObserverTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer2; +package org.jboss.jsr299.tck.tests.event.register.observer2; import javax.event.Observer; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Role.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer2/Role.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Role.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer2; +package org.jboss.jsr299.tck.tests.event.register.observer2; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/RoleBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer2/RoleBinding.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/RoleBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer2; +package org.jboss.jsr299.tck.tests.event.register.observer2; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer2/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer2; +package org.jboss.jsr299.tck.tests.event.register.observer2; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/TameAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer2/TameAnnotationLiteral.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/TameAnnotationLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.register.observer2; +package org.jboss.jsr299.tck.tests.event.register.observer2; import javax.inject.AnnotationLiteral; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/binding) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeA.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/binding/BindingTypeA.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeA.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.resolve.binding; +package org.jboss.jsr299.tck.tests.event.resolve.binding; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/binding/BindingTypeABinding.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.resolve.binding; +package org.jboss.jsr299.tck.tests.event.resolve.binding; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeB.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/binding/BindingTypeB.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeB.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.resolve.binding; +package org.jboss.jsr299.tck.tests.event.resolve.binding; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/binding/BindingTypeBBinding.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.resolve.binding; +package org.jboss.jsr299.tck.tests.event.resolve.binding; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeC.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/binding/BindingTypeC.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeC.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.resolve.binding; +package org.jboss.jsr299.tck.tests.event.resolve.binding; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/binding/BindingTypeCBinding.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.resolve.binding; +package org.jboss.jsr299.tck.tests.event.resolve.binding; import javax.inject.AnnotationLiteral; 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/unit/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.resolve.binding; +package org.jboss.jsr299.tck.tests.event.resolve.binding; import javax.event.Observer; import javax.inject.DuplicateBindingTypeException; 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/unit/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.resolve.binding; +package org.jboss.jsr299.tck.tests.event.resolve.binding; import java.util.Set; 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/unit/event/resolve/binding/ResolvingChecksBindingTypeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.resolve.binding; +package org.jboss.jsr299.tck.tests.event.resolve.binding; import java.util.Set; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/nonbinding) 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/unit/event/resolve/nonbinding/AnimalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.resolve.nonbinding; +package org.jboss.jsr299.tck.tests.event.resolve.nonbinding; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.resolve.nonbinding; +package org.jboss.jsr299.tck.tests.event.resolve.nonbinding; import javax.inject.AnnotationLiteral; 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/unit/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.resolve.nonbinding; +package org.jboss.jsr299.tck.tests.event.resolve.nonbinding; import java.util.Set; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/type) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksEventTypeWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/type/ChecksEventTypeWhenResolvingTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksEventTypeWhenResolvingTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.resolve.type; +package org.jboss.jsr299.tck.tests.event.resolve.type; import java.util.Set; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.resolve.type; +package org.jboss.jsr299.tck.tests.event.resolve.type; import java.util.ArrayList; import java.util.Set; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/UnusedEventType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/resolve/type/UnusedEventType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/UnusedEventType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.resolve.type; +package org.jboss.jsr299.tck.tests.event.resolve.type; class UnusedEventType { Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/transactionalObservers) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Agent.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/transactionalObservers/Agent.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Agent.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.transactionalObservers; +package org.jboss.jsr299.tck.tests.event.transactionalObservers; public interface Agent { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogAgent.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/transactionalObservers/DogAgent.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogAgent.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.transactionalObservers; +package org.jboss.jsr299.tck.tests.event.transactionalObservers; import javax.annotation.Named; import javax.annotation.Resource; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/transactionalObservers/EventTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.event.transactionalObservers; +package org.jboss.jsr299.tck.tests.event.transactionalObservers; import static org.jboss.jsr299.tck.impl.packaging.PackagingType.EAR; 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/unit/event/transactionalObservers/Pomeranian.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.transactionalObservers; +package org.jboss.jsr299.tck.tests.event.transactionalObservers; import static javax.ejb.TransactionManagementType.BEAN; import static javax.transaction.Status.STATUS_COMMITTED; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/PomeranianInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/transactionalObservers/PomeranianInterface.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/PomeranianInterface.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.transactionalObservers; +package org.jboss.jsr299.tck.tests.event.transactionalObservers; import java.math.BigInteger; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/transactionalObservers/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.event.transactionalObservers; +package org.jboss.jsr299.tck.tests.event.transactionalObservers; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/commonAnnotations (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/commonAnnotations) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/commonAnnotations/ResourceInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/commonAnnotations/ResourceInjectionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/commonAnnotations/ResourceInjectionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.commonAnnotations; +package org.jboss.jsr299.tck.tests.implementation.commonAnnotations; import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/decorator (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/decorator) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/decorator/DecoratorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/decorator/DecoratorDefinitionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/decorator/DecoratorDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.decorator; +package org.jboss.jsr299.tck.tests.implementation.decorator; import org.hibernate.tck.annotations.SpecAssertion; import org.testng.annotations.Test; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,120 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +/** + * @author Nicklas Karlsson + * + * Spec version: PRD2 + */ +@Artifact +(a)Packaging(PackagingType.EAR) +public class EnterpriseBeanDefinitionTest extends AbstractDeclarativeTest +{ + @Test(groups = { "enterpriseBeans" }) + @SpecAssertion(section = "3.3", id = "b") + public void testStatelessWithDependentScopeOK() + { + assert getCurrentManager().resolveByType(GiraffeLocal.class).size() == 1; + } + + @Test(groups = { "enterpriseBeans" }) + @SpecAssertion(section = "3.3", id = "c") + public void testSingletonWithDependentScopeOK() + { + assert getCurrentManager().resolveByType(Labrador.class).size() == 1; + } + + @Test(groups = { "enterpriseBeans" }) + @SpecAssertion(section = "3.3", id = "c") + public void testSingletonWithApplicationScopeOK() + { + assert getCurrentManager().resolveByType(Laika.class).size() == 1; + } + + @Test(groups = { "webbeansxml", "enterpriseBeans", "stub" }) + @SpecAssertion(section = "3.3", id = "e") + public void testMultipleXMLDefinedEnterpriseBeansWithSameImplementationClassNotOK() + { + assert false; + } + + @Test(groups = { "enterpriseBeans", "stub" }) + @SpecAssertion(section = "3.3.2", id = "a") + public void testAnnotatedEnterpriseBean() + { + // TODO: dupe? + assert false; + } + + @Test(groups = { "enterpriseBeans", "webbeansxml", "stub" }) + @SpecAssertion(section = "3.3.2", id = "a") + public void testAnnotatedEnterpriseBeanComplementedWithXML() + { + // TODO dupe? + assert false; + } + + @Test(groups = { "enterpriseBeans", "ejbjarxml", "stub" }) + @SpecAssertion(section = "3.3.2", id = "b") + public void testEJBJARDefinedEnterpriseBean() + { + // TODO dupe? + assert false; + } + + @Test(groups = { "enterpriseBeans", "ejbjarxml", "webbeansxml", "stub" }) + @SpecAssertion(section = "3.3.2", id = "b") + public void testEJBJARDefinedEnterpriseBeanComplementedWithXML() + { + // TODO dupe? + assert false; + } + + @Test(groups = { "enterpriseBeans", "stub" }) + @SpecAssertion(section = "3.3.3", id = "a") + public void testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces() + { + assert false; + } + + @Test(groups = { "enterpriseBeans", "stub" }) + @SpecAssertion(section = "3.3.3", id = "b") + public void testEnterpriseBeanWithLocalViewAndParameterizedTypeIncludesBeanClassAndSuperclassesInBeanTypes() + { + assert false; + } + + @Test(groups = "enterpriseBeans") + @SpecAssertions({ + @SpecAssertion(section = "3.3.3", id = "c"), + @SpecAssertion(section = "2.2", id = "l") + }) + public void testObjectIsInAPITypes() + { + assert getCurrentManager().resolveByType(GiraffeLocal.class).size() == 1; + assert getCurrentManager().resolveByType(GiraffeLocal.class).iterator().next().getTypes().contains(Object.class); + } + + @Test(groups = { "enterpriseBeans", "stub" }) + @SpecAssertion(section = "3.3.3", id = "d") + public void testRemoteInterfacesAreNotInAPITypes() + { + assert false; + } + + @Test(groups = "enterpriseBeans") + @SpecAssertion(section = "3.3.8", id = "a") + public void testDefaultName() + { + assert getCurrentManager().resolveByType(PitbullLocal.class).size() == 1; + assert getCurrentManager().resolveByType(PitbullLocal.class).iterator().next().getName().equals("pitbull"); + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Giraffe.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Giraffe.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Giraffe.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Giraffe.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; + +import javax.ejb.Stateless; + +@Stateless +class Giraffe implements GiraffeLocal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Giraffe.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/GiraffeLocal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/GiraffeLocal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/GiraffeLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/GiraffeLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; + +public interface GiraffeLocal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/GiraffeLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Labrador.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; + +import javax.context.Dependent; +import javax.ejb.Singleton; + +@Singleton +@Dependent +class Labrador +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Laika.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; + +import javax.context.ApplicationScoped; +import javax.ejb.Remove; +import javax.ejb.Singleton; + +@Singleton +@ApplicationScoped +class Laika +{ + + @Remove + public void remove() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Pitbull.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; + +import javax.annotation.Named; +import javax.context.ApplicationScoped; +import javax.ejb.Remove; +import javax.ejb.Stateful; + +@Stateful +@ApplicationScoped +@Named +class Pitbull implements PitbullLocal +{ + + public static boolean destructorCalled = false; + + @Remove + public void bye() + { + destructorCalled = true; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/PitbullLocal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/PitbullLocal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/PitbullLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/PitbullLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; + +public interface PitbullLocal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/PitbullLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessDecorator (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessDecorator) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessDecorator/PekingeseLocal_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessDecorator/PekingeseLocal_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessDecorator/PekingeseLocal_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.definition.statelessDecorator; +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition.statelessDecorator; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessDecorator/Pekingese_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessDecorator/Pekingese_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessDecorator/Pekingese_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.definition.statelessDecorator; +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition.statelessDecorator; import javax.decorator.Decorator; import javax.ejb.Stateless; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessDecorator/StatelessDecoratorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessDecorator/StatelessDecoratorTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessDecorator/StatelessDecoratorTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.definition.statelessDecorator; +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition.statelessDecorator; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessInterceptor (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessInterceptor) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessInterceptor/PugLocal_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessInterceptor/PugLocal_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessInterceptor/PugLocal_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.definition.statelessInterceptor; +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition.statelessInterceptor; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessInterceptor/Pug_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessInterceptor/Pug_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessInterceptor/Pug_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.definition.statelessInterceptor; +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition.statelessInterceptor; import javax.ejb.Stateless; import javax.interceptor.Interceptor; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessInterceptor/StatelessInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessInterceptor/StatelessInterceptorTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessInterceptor/StatelessInterceptorTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.definition.statelessInterceptor; +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition.statelessInterceptor; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/lifecycle) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.newAndOtherBinding; +package org.jboss.jsr299.tck.tests.implementation.enterprise.newAndOtherBinding; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.newAndOtherBinding; +package org.jboss.jsr299.tck.tests.implementation.enterprise.newAndOtherBinding; import javax.inject.Current; import javax.inject.New; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.newAndOtherBinding; +package org.jboss.jsr299.tck.tests.implementation.enterprise.newAndOtherBinding; import javax.annotation.Named; import javax.context.SessionScoped; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean) 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/unit/implementation/enterprise/newBean/GoldenRetriever.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetriever.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean; +package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean; import javax.context.RequestScoped; import javax.ejb.Remove; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetrieverLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/GoldenRetrieverLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetrieverLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean; +package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Lion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Lion.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Lion.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean; +package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/LionLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/LionLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/LionLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean; +package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean; import javax.ejb.Local; 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/unit/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean; +package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean; import java.lang.annotation.Annotation; import java.util.Set; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Order.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Order.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean; +package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/OrderLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/OrderLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/OrderLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean; +package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean; +package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/WrappedEnterpriseBean.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean; +package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean; import javax.annotation.Named; import javax.context.SessionScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBeanLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/WrappedEnterpriseBeanLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBeanLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean; +package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean; import javax.ejb.Local; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/remove) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.remove; +package org.jboss.jsr299.tck.tests.implementation.enterprise.remove; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithConversationScope) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.singletonWithConversationScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithConversationScope; import javax.context.ConversationScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.singletonWithConversationScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithConversationScope; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.singletonWithRequestScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithRequestScope; import javax.context.RequestScoped; import javax.ejb.Singleton; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.singletonWithRequestScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithRequestScope; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.singletonWithSessionScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithSessionScope; import java.io.Serializable; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.singletonWithSessionScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithSessionScope; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithApplicationScope) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/DachshundLocal_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithApplicationScope/DachshundLocal_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/DachshundLocal_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithApplicationScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithApplicationScope; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithApplicationScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithApplicationScope; import javax.context.ApplicationScoped; import javax.ejb.Stateless; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithApplicationScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithApplicationScope; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithConversationScope) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/BoxerLocal_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithConversationScope/BoxerLocal_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/BoxerLocal_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithConversationScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithConversationScope; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithConversationScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithConversationScope; import javax.context.ConversationScoped; import javax.ejb.Stateless; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithConversationScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithConversationScope; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithRequestScope) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/BeagleLocal_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithRequestScope/BeagleLocal_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/BeagleLocal_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithRequestScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithRequestScope; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithRequestScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithRequestScope; import javax.context.RequestScoped; import javax.ejb.Stateless; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithRequestScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithRequestScope; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithSessionScope) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/BullmastiffLocal_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithSessionScope/BullmastiffLocal_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/BullmastiffLocal_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithSessionScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithSessionScope; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithSessionScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithSessionScope; import javax.context.SessionScoped; import javax.ejb.Stateless; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithSessionScope; +package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithSessionScope; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/AndalusianChicken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/AndalusianChicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/AndalusianChicken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,25 @@ +package org.jboss.jsr299.tck.tests.implementation.initializer; + +import javax.ejb.Stateless; +import javax.inject.Initializer; + +@Stateless +public class AndalusianChicken implements LocalChicken +{ + + public static boolean nonBusinessMethodCalled = false; + + public void firstBusinessMethod() + { + } + + @Initializer + public void nonBusinessMethod() + { + nonBusinessMethodCalled = true; + } + + public void cluck() + { + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Chicken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Chicken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Chicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Chicken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.implementation.initializer; + +import javax.inject.Production; + +@Production +class Chicken +{ + + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenHutch.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/ChickenHutch.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenHutch.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenHutch.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.tests.implementation.initializer; + +import javax.inject.Initializer; + +class ChickenHutch +{ + + public Fox fox; + public Chicken chicken; + + @Initializer + public void setFox(Fox fox) + { + this.fox = fox; + } + + @Initializer + public void setChicken(Chicken chicken) + { + this.chicken = chicken; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/EjbInitializerMethodTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,30 @@ +package org.jboss.jsr299.tck.tests.implementation.initializer; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +(a)Packaging(PackagingType.EAR) +@IntegrationTest +public class EjbInitializerMethodTest extends AbstractDeclarativeTest +{ + + @Test(groups = { "initializerMethod", "ejb3" }) + @SpecAssertions({ + @SpecAssertion(section = "3.9", id = "e"), + @SpecAssertion(section = "3.9", id = "c") + }) + public void testInitializerMethodNotABusinessMethod() + { + AndalusianChicken.nonBusinessMethodCalled = false; + getCurrentManager().getInstanceByType(LocalChicken.class).cluck(); + assert AndalusianChicken.nonBusinessMethodCalled = true; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Fox.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Fox.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Fox.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Fox.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.implementation.initializer; + +import javax.context.Dependent; + +@Dependent +class Fox +{ + + public String getName() + { + return "gavin"; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,99 @@ +package org.jboss.jsr299.tck.tests.implementation.initializer; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + */ +@Artifact +(a)Packaging(PackagingType.EAR) +public class InitializerMethodTest extends AbstractDeclarativeTest +{ + + @Test(groups = { "stub", "initializerMethod", "servlet", "integration" }) + @SpecAssertion(section = "3.9", id = "d") + public void testInitializerMethodCalledOnServlet() + { + assert false; + } + + @Test(groups = { "stub", "initializerMethod", "ejb3", "integration" }) + @SpecAssertion(section = "3.9", id = "d") + public void testInitializerMethodCalledOnEJBSessionBean() + { + assert false; + } + + @Test(groups = { "stub", "initializerMethod", "ejb3", "integration" }) + @SpecAssertion(section = "3.9", id = "d") + public void testInitializerMethodCalledOnEJBMDB() + { + assert false; + } + + @Test(groups = { "stub", "initializerMethod", "ejb3", "singletons", "integration" }) + @SpecAssertion(section = "3.9", id = "d") + public void testInitializerMethodCalledOnEJBSingleton() + { + assert false; + } + + @Test(groups = { "stub", "initializerMethod", "interceptors" }) + @SpecAssertion(section = "3.9", id = "f") + public void testMethodInterceptorNotCalledOnInitializerMethod() + { + assert false; + } + + @Test(groups = { "initializerMethod" }) + @SpecAssertions({ + @SpecAssertion(section = "3.9", id = "g"), + @SpecAssertion(section = "5.3", id = "b"), + @SpecAssertion(section = "3.9.1", id = "a"), + @SpecAssertion(section = "3.9.3", id = "a") + }) + public void testMultipleInitializerMethodsAreCalled() + { + ChickenHutch chickenHutch = getCurrentManager().getInstanceByType(ChickenHutch.class); + assert chickenHutch.fox != null; + assert chickenHutch.chicken != null; + } + + @Test(groups = { "stub", "initializerMethod", "webbeansxml" }) + @SpecAssertion(section = "3.9.2", id = "a") + public void testInitializerMethodDeclaredInXml() + { + assert false; + } + + @Test(groups = { "stub", "initializerMethod", "webbeansxml" }) + @SpecAssertion(section = "3.9.2", id = "b") + public void testInitializerMethodDeclaredInXmlIgnoresBindingAnnotationsInJava() + { + assert false; + } + + @Test(groups = { "stub", "initializerMethod", "webbeansxml" }, expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.9.2", id = "c") + public void testInitializerMethodDeclaredInXmlDoesNotExist() + { + assert false; + } + + @Test(groups = { "stub", "initializerMethod", "webbeansxml" }) + @SpecAssertion(section = "3.9", id = "g") + public void testBeanHasAllInitializerMethodsDeclaredInJavaAndXml() + { + assert false; + } + +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/LocalChicken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/LocalChicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/LocalChicken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.implementation.initializer; + +import javax.ejb.Local; + +@Local +public interface LocalChicken +{ + public void firstBusinessMethod(); + + public void cluck(); +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/methodAnnotatedProduces) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer.methodAnnotatedProduces; +package org.jboss.jsr299.tck.tests.implementation.initializer.methodAnnotatedProduces; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer.methodAnnotatedProduces; +package org.jboss.jsr299.tck.tests.implementation.initializer.methodAnnotatedProduces; import javax.inject.Initializer; import javax.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer.parameterAnnotatedDisposes; +package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedDisposes; import javax.inject.Disposes; import javax.inject.Initializer; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ChickenHutch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/ChickenHutch.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ChickenHutch.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer.parameterAnnotatedDisposes; +package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedDisposes; class ChickenHutch Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer.parameterAnnotatedDisposes; +package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedDisposes; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/DangerCall.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/DangerCall.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/DangerCall.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer.parameterAnnotatedObserves; +package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedObserves; import javax.inject.Production; 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/unit/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer.parameterAnnotatedObserves; +package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedObserves; import javax.event.Observes; import javax.inject.Initializer; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer.parameterAnnotatedObserves; +package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedObserves; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/Dottrel_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/Dottrel_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/Dottrel_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer.staticInitializer; +package org.jboss.jsr299.tck.tests.implementation.initializer.staticInitializer; import javax.inject.Initializer; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer.staticInitializer; +package org.jboss.jsr299.tck.tests.implementation.initializer.staticInitializer; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/interceptor (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/interceptor) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/interceptor/InterceptorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/interceptor/InterceptorDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.interceptor; +package org.jboss.jsr299.tck.tests.implementation.interceptor; import org.hibernate.tck.annotations.SpecAssertion; import org.testng.annotations.Test; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/jms (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/jms) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/jms/JmsDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/jms/JmsDefinitionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/jms/JmsDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.jms; +package org.jboss.jsr299.tck.tests.implementation.jms; import org.jboss.jsr299.tck.AbstractDeclarativeTest; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Animal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Animal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +interface Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AsAnimal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AsAnimal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AsAnimal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AsAnimal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface AsAnimal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AsAnimal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidow.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidow.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidow.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +class BlackWidow extends Spider implements DeadlySpider +{ + public void bite() + { + // Test method used for proxy instances to force + // creation of the instance. + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidowProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import javax.annotation.Named; +import javax.inject.Produces; + +public class BlackWidowProducer +{ + public static BlackWidow blackWidow = new BlackWidow(); + @Produces + @Named("blackWidow") + public BlackWidow produceBlackWidow = blackWidow; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Chicken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Chicken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Chicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Chicken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import javax.inject.Produces; + + +class Chicken +{ + + @Produces @Foo + private Egg egg = new Egg(this); + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DaddyLongLegs.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DaddyLongLegs.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DaddyLongLegs.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DaddyLongLegs.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + + +class DaddyLongLegs extends Spider +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DaddyLongLegs.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DeadlyAnimal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlyAnimal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DeadlyAnimal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DeadlyAnimal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +interface DeadlyAnimal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DeadlySpider.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlySpider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DeadlySpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DeadlySpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +interface DeadlySpider extends DeadlyAnimal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DefangedTarantula.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DefangedTarantula.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DefangedTarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DefangedTarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + + +class DefangedTarantula extends Tarantula +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Egg.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Egg.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Egg.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Egg.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +class Egg +{ + + private final Chicken mother; + + public Egg(Chicken mother) + { + super(); + this.mother = mother; + } + + public Chicken getMother() + { + return mother; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Foo.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Foo +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaver.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaver.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaver.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaver.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +class FunnelWeaver<T> +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import javax.inject.Current; + +class FunnelWeaverSpiderConsumer +{ + @Current + private FunnelWeaver<Spider> injectedSpider; + + public FunnelWeaver<Spider> getInjectedSpider() + { + return injectedSpider; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import javax.inject.Produces; + +class FunnelWeaverSpiderProducer +{ + private static FunnelWeaver<Spider> spider; + @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider = new FunnelWeaver<Spider>(); + + public FunnelWeaverSpiderProducer() + { + spider = this.getFunnelWeaverSpider; + } + + public static FunnelWeaver<Spider> getSpider() + { + return spider; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/InfertileChicken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/InfertileChicken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/InfertileChicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/InfertileChicken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + + +@AnotherDeploymentType +class InfertileChicken extends Chicken +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LadybirdSpider.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/LadybirdSpider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LadybirdSpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LadybirdSpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import javax.context.ApplicationScoped; + +@ApplicationScoped +class LadybirdSpider extends Spider +{ + + public void spinWeb() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LadybirdSpider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/OtherSpiderProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import javax.annotation.Named; +import javax.inject.Produces; + +@AnotherDeploymentType +class OtherSpiderProducer +{ + + public static final Tarantula TARANTULA = new Tarantula(); + public static final BlackWidow BLACK_WIDOW = new BlackWidow(); + + @Produces @Tame public Tarantula produceTarantula = TARANTULA; + + @Produces @Tame private BlackWidow produceBlackWidow = BLACK_WIDOW; + + private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; + @Produces public Spider[] getSpiders = ALL_SPIDERS; + + @Produces @Named("SpiderSize") public int getWolfSpiderSize = 4; +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/ProducerFieldDefinitionTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,222 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import java.lang.annotation.Annotation; +import java.util.Set; + +import javax.context.RequestScoped; +import javax.inject.AnnotationLiteral; +import javax.inject.Production; +import javax.inject.manager.Bean; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.jboss.jsr299.tck.literals.CurrentBinding; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +public class ProducerFieldDefinitionTest extends AbstractDeclarativeTest +{ + + private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; + private static final Annotation FOO_LITERAL = new AnnotationLiteral<Foo>() {}; + private static final Annotation STATIC_LITERAL = new AnnotationLiteral<Static>() {}; + + @Test(groups = { "producerField" }) + @SpecAssertion(section = "2.5.3", id = "h") + public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); + assert tarantulaBeans.size() == 1; + assert tarantulaBeans.iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + } + + @Test(groups = "producerField") + @SpecAssertion(section = "3.5", id = "f") + public void testParameterizedReturnType() throws Exception + { + new RunInDependentContext() + { + public void execute() + { + FunnelWeaverSpiderConsumer spiderConsumer = getCurrentManager().getInstanceByType(FunnelWeaverSpiderConsumer.class); + assert spiderConsumer != null; + assert spiderConsumer.getInjectedSpider() != null; + assert spiderConsumer.getInjectedSpider().equals(FunnelWeaverSpiderProducer.getSpider()); + } + }.run(); + } + + @Test(groups = { "producerField", "deployment" }) + @SpecAssertions({ + @SpecAssertion(section = "3.5", id = "j"), + @SpecAssertion(section = "3.5", id = "c"), + @SpecAssertion(section = "3.5.2", id ="a") + }) + public void testBeanDeclaresMultipleProducerFields() + { + assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).size() == 1; + assert getCurrentManager().getInstanceByType(Tarantula.class, TAME_LITERAL).equals(OtherSpiderProducer.TARANTULA) ; + assert getCurrentManager().resolveByType(BlackWidow.class, TAME_LITERAL).size() == 1; + assert getCurrentManager().getInstanceByType(BlackWidow.class, TAME_LITERAL).equals(OtherSpiderProducer.BLACK_WIDOW) ; + } + + @Test(groups = "producerField") + @SpecAssertions({ + @SpecAssertion(section = "2.3.1", id = "a") + }) + public void testDefaultBindingType() + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); + assert tarantulaBeans.size() == 1; + assert tarantulaBeans.iterator().next().getBindings().contains(new CurrentBinding()); + } + + @Test(groups = "producerField") + @SpecAssertion(section = "3.5.1", id = "c") + public void testApiTypeForClassReturn() + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); + assert tarantulaBeans.size() == 1; + Bean<Tarantula> tarantulaBean = tarantulaBeans.iterator().next(); + assert tarantulaBean.getTypes().size() == 6; + assert tarantulaBean.getTypes().contains(Tarantula.class); + assert tarantulaBean.getTypes().contains(DeadlySpider.class); + assert tarantulaBean.getTypes().contains(Spider.class); + assert tarantulaBean.getTypes().contains(Animal.class); + assert tarantulaBean.getTypes().contains(DeadlyAnimal.class); + assert tarantulaBean.getTypes().contains(Object.class); + } + + @Test(groups = { "producerField" }) + @SpecAssertion(section = "3.5.1", id = "a") + public void testApiTypeForInterfaceReturn() + { + Set<Bean<Animal>> animalBeans = getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<AsAnimal>() {}); + assert animalBeans.size() == 1; + Bean<Animal> animalModel = animalBeans.iterator().next(); + assert animalModel.getTypes().size() == 2; + assert animalModel.getTypes().contains(Animal.class); + assert animalModel.getTypes().contains(Object.class); + } + + @Test(groups = { "producerField" }) + @SpecAssertion(section = "3.5.1", id = "b") + public void testApiTypeForPrimitiveReturn() + { + Set<Bean<?>> beans = getCurrentManager().resolveByName("SpiderSize"); + assert beans.size() == 1; + Bean<?> intModel = beans.iterator().next(); + assert intModel.getTypes().size() == 2; + assert intModel.getTypes().contains(int.class); + assert intModel.getTypes().contains(Object.class); + } + + @Test(groups = { "producerField" }) + @SpecAssertions({ + @SpecAssertion(section = "3.5.1", id = "b"), + @SpecAssertion(section = "2.2", id = "j") + }) + public void testApiTypeForArrayTypeReturn() + { + Set<Bean<Spider[]>> spidersBeans = getCurrentManager().resolveByType(Spider[].class); + assert spidersBeans.size() == 1; + Bean<Spider[]> spidersModel = spidersBeans.iterator().next(); + assert spidersModel.getTypes().size() == 2; + assert spidersModel.getTypes().contains(Spider[].class); + assert spidersModel.getTypes().contains(Object.class); + } + + @Test(groups = "producerField") + @SpecAssertions({ + @SpecAssertion(section = "3.5.2", id = "f"), + @SpecAssertion(section="2.3.3", id="c") + }) + public void testBindingType() + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, new TameAnnotationLiteral()); + assert tarantulaBeans.size() == 1; + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getBindings().size() == 1; + assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class); + } + + @Test(groups = "producerField") + @SpecAssertion(section = "3.5.2", id = "b") + public void testScopeType() + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL, FOO_LITERAL); + assert !tarantulaBeans.isEmpty(); + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getScopeType().equals(RequestScoped.class); + } + + @Test(groups = "producerField") + @SpecAssertion(section = "3.5.2", id = "d") + public void testDeploymentType() + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL, FOO_LITERAL); + assert !tarantulaBeans.isEmpty(); + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getDeploymentType().equals(Production.class); + } + + @Test(groups = "producerField") + @SpecAssertions({ + @SpecAssertion(section = "3.5.2", id = "c"), + @SpecAssertion(section="2.6.1", id = "d") + }) + public void testNamedField() + { + Set<Bean<?>> beans = getCurrentManager().resolveByName("blackWidow"); + assert beans.size() == 1; + + @SuppressWarnings("unchecked") + Bean<BlackWidow> blackWidowModel = (Bean<BlackWidow>) beans.iterator().next(); + assert blackWidowModel.getName().equals("blackWidow"); + } + + @Test(groups = { "producerField" }) + @SpecAssertions({ + @SpecAssertion(section = "2.6.3", id = "b"), + @SpecAssertion(section = "3.5.4", id = "a"), + @SpecAssertion(section = "2.6.1", id = "d") + }) + public void testDefaultNamedField() + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, STATIC_LITERAL); + assert tarantulaBeans.size() == 1; + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getName().equals("produceTarantula"); + } + + // review 2.2 + @Test(groups = "producerField") + @SpecAssertions({ + @SpecAssertion(section = "2.7.2", id = "c"), + @SpecAssertion(section = "3.5.2", id = "e") + }) + public void testStereotype() + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, STATIC_LITERAL); + assert !tarantulaBeans.isEmpty(); + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getScopeType().equals(RequestScoped.class); + assert tarantulaModel.getDeploymentType().equals(Production.class); + } + + @Test(groups = "producerField") + @SpecAssertion(section = "4.2", id = "k") + public void testNonStaticProducerFieldNotInherited() + { + assert !(getCurrentManager().getInstanceByType(Egg.class, FOO_LITERAL).getMother() instanceof InfertileChicken); + } +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Spider.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Spider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Spider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Spider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +class Spider implements Animal +{ + + private static final long serialVersionUID = 1L; + + public void layEggs() + { + + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderAsAnimalProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import javax.inject.Produces; + + +@AnotherDeploymentType +class SpiderAsAnimalProducer +{ + @Produces @AsAnimal + public Animal makeASpider = new WolfSpider(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Named; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; +import javax.inject.Production; + +/** + * Test stereotype used to change the scope type and deployment type + * of another bean, in particular a producer field bean. + * + * @author David Allen + * + */ +(a)Stereotype(requiredTypes=Spider.class) +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +@Named +@Production +@interface SpiderStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Static.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Static.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Static.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Static.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Static +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Static.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/StaticTarantulaProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,28 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import javax.inject.Produces; + + +@AnotherDeploymentType +class StaticTarantulaProducer +{ + @Produces @SpiderStereotype @Static public static Tarantula produceTarantula = new Tarantula(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tame.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tame.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Tame +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameAnnotationLiteral.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameAnnotationLiteral.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameAnnotationLiteral.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameAnnotationLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import javax.inject.AnnotationLiteral; + +class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameTarantulaProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import javax.context.RequestScoped; +import javax.inject.Produces; +import javax.inject.Production; + + +@AnotherDeploymentType +class TameTarantulaProducer +{ + @Produces @Foo @Tame @RequestScoped @Production public Tarantula produceTarantula = new DefangedTarantula(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tarantula.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tarantula.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +class Tarantula extends Spider implements DeadlySpider +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaConsumer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import javax.inject.Current; + +/** + * This bean contains an injection point for a Tarantula that must be provided + * by the container via a (static) producer field. + * + * @author David Allen + * + */ +class TarantulaConsumer +{ + @Current + private Tarantula consumedTarantula; + + public Tarantula getConsumedTarantula() + { + return consumedTarantula; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + +import javax.inject.Produces; + +@AnotherDeploymentType +class TarantulaProducer +{ + @Produces public Tarantula produceTarantula = new Tarantula(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/WolfSpider.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/WolfSpider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/WolfSpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/WolfSpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; + + +class WolfSpider implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/FunnelWeaver.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/FunnelWeaver.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition.parameterizedReturnTypeWithWildcard; +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.parameterizedReturnTypeWithWildcard; class FunnelWeaver<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition.parameterizedReturnTypeWithWildcard; +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.parameterizedReturnTypeWithWildcard; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition.parameterizedReturnTypeWithWildcard; +package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.parameterizedReturnTypeWithWildcard; import javax.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; interface Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidow.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidow.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; class BlackWidow extends Spider implements DeadlySpider { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidowConsumer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import javax.inject.Current; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidowProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import javax.annotation.Named; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DeadlyAnimal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/DeadlyAnimal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; interface DeadlyAnimal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DeadlySpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/DeadlySpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; interface DeadlySpider extends DeadlyAnimal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/DefangedTarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DefangedTarantula.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/DefangedTarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; class DefangedTarantula extends Tarantula { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/HighestDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Null.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Null.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Null.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderConsumer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import java.io.Serializable; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import java.io.Serializable; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import javax.annotation.Named; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import javax.annotation.Named; import javax.context.RequestScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import javax.inject.IllegalProductException; 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/unit/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import javax.inject.Produces; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Spider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Spider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; class Spider implements Animal { 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/unit/implementation/producer/field/lifecycle/SpiderStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/StaticTarantulaProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Tarantula.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Tarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; class Tarantula extends Spider implements DeadlySpider { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/TarantulaConsumer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaConsumer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import javax.inject.Current; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/TarantulaProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Working.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Working.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Working.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition) 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/unit/implementation/producer/method/definition/AndalusianChicken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; interface Animal { 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/unit/implementation/producer/method/definition/AnimalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/BeanWithStaticProducerMethod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/BeanWithStaticProducerMethod.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/BeanWithStaticProducerMethod.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; import javax.inject.Produces; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Bite.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Bite.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Bite.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; public interface Bite { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/BlackWidow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/BlackWidow.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/BlackWidow.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; class BlackWidow extends Spider implements DeadlySpider { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Chicken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Chicken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/DaddyLongLegs.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DaddyLongLegs.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/DaddyLongLegs.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; class DaddyLongLegs extends Spider { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DeadlyAnimal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/DeadlyAnimal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; interface DeadlyAnimal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DeadlySpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/DeadlySpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; interface DeadlySpider extends DeadlyAnimal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/DefangedTarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DefangedTarantula.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/DefangedTarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; class DefangedTarantula extends Tarantula { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Egg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Egg.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Egg.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; class Egg { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/FunnelWeaver.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/FunnelWeaver.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; class FunnelWeaver<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/LadybirdSpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/LadybirdSpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; import java.io.Serializable; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; import java.lang.annotation.Annotation; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Spider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Spider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; class Spider implements Animal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/SpiderDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/SpiderProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; import javax.annotation.Named; import javax.context.RequestScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Tarantula.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; class Tarantula extends Spider implements DeadlySpider { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/WolfSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/WolfSpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/WolfSpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; class WolfSpider implements Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Yummy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Yummy.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Yummy.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/disposal/definition (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/disposal/definition) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/disposal/definition/DisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/disposal/definition/DisposalMethodDefinitionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/disposal/definition/DisposalMethodDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.disposal.definition; +package org.jboss.jsr299.tck.tests.implementation.producer.method.disposal.definition; import javax.inject.DefinitionException; import javax.inject.UnsatisfiedDependencyException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle) 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/unit/implementation/producer/method/lifecycle/AndalusianChicken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; interface Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Chicken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/DeadlyAnimal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/DeadlyAnimal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; interface DeadlyAnimal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/DeadlySpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/DeadlySpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; interface DeadlySpider extends DeadlyAnimal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Egg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Egg.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Egg.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; class Egg { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/FooException.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/FooException.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/FooException.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; class FooException extends RuntimeException { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/InfertileChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/InfertileChicken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/InfertileChicken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; class InfertileChicken extends Chicken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lorry.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Lorry.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lorry.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; class Lorry { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/LorryProducer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Null.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Null.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Null.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; import javax.context.CreationalContext; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Request.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Request.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Request.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Ship.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Ship.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Ship.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; class Ship { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ShipProducer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Spider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Spider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; class Spider implements Animal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/SpiderProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/SpiderProducer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; import javax.context.RequestScoped; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Tarantula.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Tarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; class Tarantula extends Spider implements DeadlySpider { Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/notBusinessMethod (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/notBusinessMethod/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/FunnelWeaver.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/notBusinessMethod/FunnelWeaver.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.notBusinessMethod; +package org.jboss.jsr299.tck.tests.implementation.producer.method.notBusinessMethod; class FunnelWeaver<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/notBusinessMethod/NotABusinessMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/NotABusinessMethodTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/notBusinessMethod/NotABusinessMethodTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.notBusinessMethod; +package org.jboss.jsr299.tck.tests.implementation.producer.method.notBusinessMethod; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/notBusinessMethod/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/SpiderProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/notBusinessMethod/SpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.notBusinessMethod; +package org.jboss.jsr299.tck.tests.implementation.producer.method.notBusinessMethod; import javax.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedDisposes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.parameterAnnotatedDisposes; +package org.jboss.jsr299.tck.tests.implementation.producer.method.parameterAnnotatedDisposes; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.parameterAnnotatedDisposes; +package org.jboss.jsr299.tck.tests.implementation.producer.method.parameterAnnotatedDisposes; import javax.inject.Disposes; import javax.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedObserves) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.parameterAnnotatedObserves; +package org.jboss.jsr299.tck.tests.implementation.producer.method.parameterAnnotatedObserves; import javax.inject.DefinitionException; 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/unit/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.parameterAnnotatedObserves; +package org.jboss.jsr299.tck.tests.implementation.producer.method.parameterAnnotatedObserves; import javax.event.Observes; import javax.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/FunnelWeaver.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/FunnelWeaver.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.parametermizedTypeWithTypeParameter; +package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter; class FunnelWeaver<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.parametermizedTypeWithTypeParameter; +package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.parametermizedTypeWithTypeParameter; +package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter; import javax.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/FunnelWeaver.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/FunnelWeaver.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.parametermizedTypeWithWildcard; +package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithWildcard; class FunnelWeaver<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.parametermizedTypeWithWildcard; +package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithWildcard; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.parametermizedTypeWithWildcard; +package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithWildcard; import javax.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.stereotypeEnforcesRequiredTypes; +package org.jboss.jsr299.tck.tests.implementation.producer.method.stereotypeEnforcesRequiredTypes; interface Animal { 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/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.stereotypeEnforcesRequiredTypes; +package org.jboss.jsr299.tck.tests.implementation.producer.method.stereotypeEnforcesRequiredTypes; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.stereotypeEnforcesRequiredTypes; +package org.jboss.jsr299.tck.tests.implementation.producer.method.stereotypeEnforcesRequiredTypes; import javax.inject.Produces; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method.stereotypeEnforcesRequiredTypes; +package org.jboss.jsr299.tck.tests.implementation.producer.method.stereotypeEnforcesRequiredTypes; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ClovenHoved.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ClovenHoved.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ClovenHoved.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ClovenHoved.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface ClovenHoved +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ClovenHoved.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Cow_NotBean.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Cow_NotBean.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Cow_NotBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Cow_NotBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import javax.inject.Production; + +@Production +abstract class Cow_NotBean +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Cow_NotBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Donkey.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Donkey.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Donkey.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Donkey.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import javax.inject.Production; + +@Production +class Donkey +{ + + public static boolean constructedCorrectly = false; + + public Donkey() + { + constructedCorrectly = true; + } + + public Donkey(String foo) + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Donkey.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockEnterpriseBean.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import javax.ejb.EnterpriseBean; + +class MockEnterpriseBean implements EnterpriseBean +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockFilter.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockFilter.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockFilter.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockFilter.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,30 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +class MockFilter implements Filter +{ + + public void destroy() + { + + } + + public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain arg2) throws IOException, ServletException + { + + } + + public void init(FilterConfig arg0) throws ServletException + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockFilter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockHttpSessionListener.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockHttpSessionListener.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockHttpSessionListener.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockHttpSessionListener.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import javax.servlet.http.HttpSessionEvent; + +class MockHttpSessionListener implements javax.servlet.http.HttpSessionListener +{ + + public void sessionCreated(HttpSessionEvent arg0) + { + + } + + public void sessionDestroyed(HttpSessionEvent arg0) + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockHttpSessionListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockServlet.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServlet.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockServlet.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockServlet.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,39 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import java.io.IOException; + +import javax.servlet.Servlet; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +class MockServlet implements Servlet +{ + + public void destroy() + { + + } + + public ServletConfig getServletConfig() + { + return null; + } + + public String getServletInfo() + { + return null; + } + + public void init(ServletConfig arg0) throws ServletException + { + + } + + public void service(ServletRequest arg0, ServletResponse arg1) throws ServletException, IOException + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockServlet.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockServletContextListener.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletContextListener.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockServletContextListener.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockServletContextListener.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +class MockServletContextListener implements ServletContextListener +{ + + public void contextDestroyed(ServletContextEvent arg0) + { + + } + + public void contextInitialized(ServletContextEvent arg0) + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockServletContextListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockServletRequestListener.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletRequestListener.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockServletRequestListener.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockServletRequestListener.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import javax.servlet.ServletRequestEvent; +import javax.servlet.ServletRequestListener; + +class MockServletRequestListener implements ServletRequestListener +{ + + public void requestDestroyed(ServletRequestEvent arg0) + { + + } + + public void requestInitialized(ServletRequestEvent arg0) + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockServletRequestListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockUIComponent.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockUIComponent.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockUIComponent.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockUIComponent.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,255 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import java.io.IOException; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; +import javax.faces.event.AbortProcessingException; +import javax.faces.event.FacesEvent; +import javax.faces.event.FacesListener; +import javax.faces.render.Renderer; + +class MockUIComponent extends UIComponent +{ + + @Override + protected void addFacesListener(FacesListener arg0) + { + + } + + @Override + public void broadcast(FacesEvent arg0) throws AbortProcessingException + { + + } + + @Override + public void decode(FacesContext arg0) + { + + } + + @Override + public void encodeBegin(FacesContext arg0) throws IOException + { + + } + + @Override + public void encodeChildren(FacesContext arg0) throws IOException + { + + } + + @Override + public void encodeEnd(FacesContext arg0) throws IOException + { + + } + + @Override + public UIComponent findComponent(String arg0) + { + return null; + } + + @Override + public Map<String, Object> getAttributes() + { + return null; + } + + @Override + public int getChildCount() + { + return 0; + } + + @Override + public List<UIComponent> getChildren() + { + return null; + } + + @Override + public String getClientId(FacesContext arg0) + { + return null; + } + + @Override + protected FacesContext getFacesContext() + { + return null; + } + + @Override + protected FacesListener[] getFacesListeners(Class arg0) + { + return null; + } + + @Override + public UIComponent getFacet(String arg0) + { + return null; + } + + @Override + public Map<String, UIComponent> getFacets() + { + return null; + } + + @Override + public Iterator<UIComponent> getFacetsAndChildren() + { + return null; + } + + @Override + public String getFamily() + { + return null; + } + + @Override + public String getId() + { + return null; + } + + @Override + public UIComponent getParent() + { + return null; + } + + @Override + protected Renderer getRenderer(FacesContext arg0) + { + return null; + } + + @Override + public String getRendererType() + { + return null; + } + + @Override + public boolean getRendersChildren() + { + return false; + } + + @Override + public ValueBinding getValueBinding(String arg0) + { + return null; + } + + @Override + public boolean isRendered() + { + return false; + } + + @Override + public void processDecodes(FacesContext arg0) + { + + } + + @Override + public void processRestoreState(FacesContext arg0, Object arg1) + { + + } + + @Override + public Object processSaveState(FacesContext arg0) + { + return null; + } + + @Override + public void processUpdates(FacesContext arg0) + { + + } + + @Override + public void processValidators(FacesContext arg0) + { + + } + + @Override + public void queueEvent(FacesEvent arg0) + { + + } + + @Override + protected void removeFacesListener(FacesListener arg0) + { + + } + + @Override + public void setId(String arg0) + { + + } + + @Override + public void setParent(UIComponent arg0) + { + + } + + @Override + public void setRendered(boolean arg0) + { + + } + + @Override + public void setRendererType(String arg0) + { + + } + + @Override + public void setValueBinding(String arg0, ValueBinding arg1) + { + + } + + public boolean isTransient() + { + return false; + } + + public void restoreState(FacesContext arg0, Object arg1) + { + + } + + public Object saveState(FacesContext arg0) + { + return null; + } + + public void setTransient(boolean arg0) + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockUIComponent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Order.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Order.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Order.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Order.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import javax.inject.Production; + +@Production +class Order +{ + + public static boolean constructed = true; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Order.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/OuterClass.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/OuterClass.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/OuterClass.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/OuterClass.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import javax.inject.Production; + +class OuterClass +{ + + @Production + class InnerClass_NotBeean + { + + public InnerClass_NotBeean() + { + + } + + } + + static class StaticInnerClass + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/OuterClass.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ParameterizedClass_NotBean.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ParameterizedClass_NotBean.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ParameterizedClass_NotBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ParameterizedClass_NotBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +class ParameterizedClass_NotBean<T> +{ + +} \ No newline at end of file Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ParameterizedClass_NotBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Sheep.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Sheep.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Sheep.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Sheep.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,27 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import javax.inject.Initializer; +import javax.inject.Produces; +import javax.inject.Production; + +@Production +class Sheep +{ + + public static boolean constructedCorrectly = false; + + @Produces @ClovenHoved + public static String foo = "foo"; + + @Produces @ClovenHoved public static Double bar = 5.5; + + @Initializer + public Sheep(@ClovenHoved String foo, @ClovenHoved Double bar) + { + if (foo.equals(Sheep.foo) && bar.equals(Sheep.bar)) + { + constructedCorrectly = true; + } + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Sheep.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/SimpleBeanDefinitionTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,235 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.tests.implementation.simple.definition.OuterClass.InnerClass_NotBeean; +import org.jboss.jsr299.tck.tests.implementation.simple.definition.OuterClass.StaticInnerClass; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +public class SimpleBeanDefinitionTest extends AbstractDeclarativeTest +{ + + @Test + @SpecAssertions({ + @SpecAssertion(section = "3.2.1", id = "ca"), + @SpecAssertion(section = "3.2", id = "ca") + }) + public void testAbstractClassDeclaredInJavaNotDiscovered() + { + assert getCurrentManager().resolveByType(Cow_NotBean.class).size() == 0; + } + + @Test(groups = "innerClass") + @SpecAssertions({ + @SpecAssertion(section = "3.2.1", id = "cc"), + @SpecAssertion(section = "3.2.1", id = "ba") + }) + public void testStaticInnerClassDeclaredInJavaAllowed() + { + assert getCurrentManager().resolveByType(StaticInnerClass.class).size() == 1; + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "3.2.1", id = "b"), + @SpecAssertion(section = "3.2", id = "a") + }) + public void testNonStaticInnerClassDeclaredInJavaNotDiscovered() + { + assert getCurrentManager().resolveByType(InnerClass_NotBeean.class).size() == 0; + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "3.2.1", id = "a"), + @SpecAssertion(section = "3.2", id = "b") + }) + public void testParameterizedClassDeclaredInJavaIsNotDiscovered() + { + assert getCurrentManager().resolveByType(ParameterizedClass_NotBean.class).size() == 0; + } + + @Test + @SpecAssertions( { + @SpecAssertion(section = "3.2.1", id = "g"), + @SpecAssertion(section = "3.2.1", id = "h"), + @SpecAssertion(section = "3.2.1", id = "i"), + @SpecAssertion(section = "3.2.1", id = "j"), + @SpecAssertion(section = "3.2.1", id = "k")}) + public void testClassesImplementingServletInterfacesNotDiscoveredAsSimpleBeans() + { + assert getCurrentManager().resolveByType(MockFilter.class).size() == 0; + assert getCurrentManager().resolveByType(MockHttpSessionListener.class).size() == 0; + assert getCurrentManager().resolveByType(MockServlet.class).size() == 0; + assert getCurrentManager().resolveByType(MockServletContextListener.class).size() == 0; + assert getCurrentManager().resolveByType(MockServletRequestListener.class).size() == 0; + } + + @Test + @SpecAssertion(section="3.2.1", id="l") + public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean() + { + assert getCurrentManager().resolveByType(MockEnterpriseBean.class).size() == 0; + } + + @Test + @SpecAssertion(section="3.2.1", id="m") + public void testClassExtendingUiComponentNotDiscoveredAsSimpleBean() + { + assert getCurrentManager().resolveByType(MockUIComponent.class).size() == 0; + } + + @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "3.2.4", id = "e") + public void testAbstractClassDeclaredInXmlIsNotAllowed() + { + assert false; + } + + @Test(groups = { "stub", "innerClass", "webbeansxml" }) + @SpecAssertion(section = "3.2.4", id = "da") + public void testStaticInnerClassDeclaredInXmlAllowed() + { + assert false; + } + + @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "innerClass", "webbeansxml" }) + @SpecAssertion(section = "3.2.4", id = "d") + public void testNonStaticInnerClassDeclaredInXmlNotAllowed() + { + assert false; + } + + @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "3.2.4", id = "c") + public void testParameterizedClassDeclaredInXmlIsNotAllowed() + { + assert false; + } + + @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "interceptors", "webbeansxml" }) + @SpecAssertion(section = "3.2.4", id = "f") + public void testClassHasInterceptorInJavaMustHaveInterceptorInXml() + { + assert false; + } + + @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "interceptors", "webbeansxml" }) + @SpecAssertion(section = "3.2.4", id = "g") + public void testClassHasDecoratorInJavaMustHaveDecoratorInXml() + { + assert false; + } + + @Test + @SpecAssertion(section = "3.2.6.1", id = "a") + public void testInitializerAnnotatedConstructor() throws Exception + { + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + Sheep.constructedCorrectly = false; + getCurrentManager().getInstanceByType(Sheep.class); + assert Sheep.constructedCorrectly; + + } + }.run(); + + } + + @Test(groups="broken") + @SpecAssertion(section = "3.2.6.1", id = "b") + public void testImplicitConstructorUsed() + { + Order.constructed = false; + getCurrentManager().getInstanceByType(Order.class); + assert Order.constructed; + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "3.2.5", id = "a"), + @SpecAssertion(section = "3.2.6.1", id = "b"), + @SpecAssertion(section = "3.1", id = "a"), + @SpecAssertion(section = "3.2.3", id = "a") + }) + public void testEmptyConstructorUsed() + { + Donkey.constructedCorrectly = false; + getCurrentManager().getInstanceByType(Donkey.class); + assert Donkey.constructedCorrectly; + } + + @Test + @SpecAssertion(section = "3.2.6.1", id = "a") + public void testInitializerAnnotatedConstructorUsedOverEmptyConstuctor() throws Exception + { + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + getCurrentManager().getInstanceByType(Turkey.class); + assert Turkey.constructedCorrectly; + } + }.run(); + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "3.2.6.2", id = "b") + public void testImplicitConstructorDeclaredInXmlUsed() + { + assert false; + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "3.2.6.2", id = "b") + public void testEmptyConstructorDeclaredInXmlUsed() + { + assert false; + } + + @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "3.2.6.2", id = "c") + public void testConstructorDeclaredInXmlDoesNotExist() + { + assert false; + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "3.2.6.2", id = "d") + public void testConstructorDeclaredInXmlIgnoresBindingTypesDeclaredInJava() + { + assert false; + } + + @Test + @SpecAssertion(section = "3.2", id = "fa") + public void testDependentScopedBeanCanHavePublicField() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + assert getCurrentManager().getInstanceByType(Tiger.class).name.equals("pete"); + } + + }.run(); + + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Tiger.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Tiger.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Tiger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Tiger.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import javax.context.Dependent; + +@Dependent +class Tiger +{ + + public String name = "pete"; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Tiger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Turkey.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Turkey.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Turkey.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Turkey.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,31 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import javax.inject.Initializer; +import javax.inject.Produces; +import javax.inject.Production; + +@Production +class Turkey +{ + + @Produces public static String foo = "foo"; + + @Produces static Integer bar = 1; + + public static boolean constructedCorrectly = false; + + public Turkey() + { + + } + + @Initializer + public Turkey(String foo, Integer bar) + { + if (foo.equals(Turkey.foo) && bar.equals(Turkey.bar)) + { + constructedCorrectly = true; + } + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Turkey.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition.constructorHasDisposesParameter; +package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasDisposesParameter; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition.constructorHasDisposesParameter; +package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasDisposesParameter; import javax.inject.Disposes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/Duck.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/Duck.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/Duck.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition.constructorHasDisposesParameter; +package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasDisposesParameter; class Duck Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition.constructorHasObservesParameter; +package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasObservesParameter; import javax.inject.DefinitionException; 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/unit/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition.constructorHasObservesParameter; +package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasObservesParameter; import javax.event.Observes; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/dependentWithPublicField) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition.dependentWithPublicField; +package org.jboss.jsr299.tck.tests.implementation.simple.definition.dependentWithPublicField; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition.dependentWithPublicField; +package org.jboss.jsr299.tck.tests.implementation.simple.definition.dependentWithPublicField; import javax.context.RequestScoped; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/tooManyInitializerAnnotatedConstructors) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition.tooManyInitializerAnnotatedConstructors; +package org.jboss.jsr299.tck.tests.implementation.simple.definition.tooManyInitializerAnnotatedConstructors; import javax.inject.Initializer; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition.tooManyInitializerAnnotatedConstructors; +package org.jboss.jsr299.tck.tests.implementation.simple.definition.tooManyInitializerAnnotatedConstructors; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; interface Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/BookOrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/BookOrderProcessor.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/BookOrderProcessor.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; class BookOrderProcessor extends OrderProcessor { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/CdOrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/CdOrderProcessor.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/CdOrderProcessor.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; class CdOrderProcessor extends OrderProcessor { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Duck.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Duck.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Duck.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import javax.inject.Initializer; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Farm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Farm.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Farm.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import java.util.Date; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FarmOffice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FarmOffice.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FarmOffice.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; class FarmOffice Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishPond.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FishPond.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishPond.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import javax.inject.Initializer; 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/unit/implementation/simple/lifecycle/FishStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FooException.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FooException.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FooException.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; class FooException extends RuntimeException { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Goldfish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Goldfish.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Goldfish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import javax.context.RequestScoped; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Lion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Lion.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Lion.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; @Tame class Lion Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Lorry_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Lorry_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Lorry_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; class Lorry_Broken { 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/unit/implementation/simple/lifecycle/MountainLion.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/NovelOrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/NovelOrderProcessor.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/NovelOrderProcessor.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; class NovelOrderProcessor extends BookOrderProcessor { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/OrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/OrderProcessor.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/OrderProcessor.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/RedSnapper.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RedSnapper.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import javax.context.RequestScoped; 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/unit/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import java.lang.annotation.Annotation; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Synchronous.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Synchronous.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Synchronous.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Tuna.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import javax.context.RequestScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/TunaFarm.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import javax.inject.Current; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Van_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Van_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Van_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; +package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; class Van_Broken { Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Lion.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Lion.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Lion.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Lion.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean; + +@Tame +class Lion +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Lion.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,151 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean; + +import java.lang.annotation.Annotation; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.Set; + +import javax.context.Dependent; +import javax.inject.AnnotationLiteral; +import javax.inject.Current; +import javax.inject.New; +import javax.inject.Standard; +import javax.inject.manager.Bean; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.literals.NewLiteral; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +public class NewSimpleBeanTest extends AbstractDeclarativeTest +{ + + private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() + { + }; + + @Test(groups = { "new" }) + @SpecAssertion(section = "3.2.5", id = "d") + public void testNewBeanIsDependentScoped() + { + Set<Bean<WrappedSimpleBean>> beans = getCurrentManager().resolveByType(WrappedSimpleBean.class, new NewLiteral()); + assert beans.size() == 1; + Bean<WrappedSimpleBean> newSimpleBean = beans.iterator().next(); + assert Dependent.class.equals(newSimpleBean.getScopeType()); + } + + @Test(groups = { "new" }) + @SpecAssertion(section = "3.2.5", id = "e") + public void testNewBeanIsOfStandardDeploymentType() + { + Set<Bean<WrappedSimpleBean>> beans = getCurrentManager().resolveByType(WrappedSimpleBean.class, new NewLiteral()); + assert beans.size() == 1; + Bean<WrappedSimpleBean> newSimpleBean = beans.iterator().next(); + assert Standard.class.equals(newSimpleBean.getDeploymentType()); + } + + @Test(groups = { "new" }) + @SpecAssertion(section = "3.2.5", id = "f") + public void testNewBeanHasOnlyNewBinding() + { + Set<Bean<WrappedSimpleBean>> beans = getCurrentManager().resolveByType(WrappedSimpleBean.class, new NewLiteral()); + assert beans.size() == 1; + Bean<WrappedSimpleBean> newSimpleBean = beans.iterator().next(); + assert newSimpleBean.getBindings().size() == 1; + assert newSimpleBean.getBindings().iterator().next().annotationType().equals(new NewLiteral().annotationType()); + } + + @Test(groups = { "new" }) + @SpecAssertion(section = "3.2.5", id = "g") + public void testNewBeanHasNoWebBeanName() + { + Set<Bean<WrappedSimpleBean>> beans = getCurrentManager().resolveByType(WrappedSimpleBean.class, new NewLiteral()); + assert beans.size() == 1; + Bean<WrappedSimpleBean> newSimpleBean = beans.iterator().next(); + assert newSimpleBean.getName() == null; + } + + @Test(groups = { "stub", "new" }) + @SpecAssertion(section = "3.2.5", id = "h") + public void testNewBeanHasNoStereotypes() + { + assert false; + } + + @Test(groups = { "new", "stub" }) + @SpecAssertion(section = "3.2.5", id = "i") + public void testNewBeanHasNoObservers() + { + assert false; + } + + @Test(groups = { "new", "stub" }) + @SpecAssertion(section = "3.2.5", id = "k") + public void testNewBeanHasNoProducerFields() + { + assert false; + } + + @Test(groups = { "new", "stub" }) + @SpecAssertion(section = "3.2.5", id = "j") + public void testNewBeanHasNoProducerMethods() + { + assert false; + } + + @Test(groups = { "new", "stub" }) + @SpecAssertion(section = "3.2.5", id = "l") + public void testNewBeanHasNoDisposalMethods() + { + assert false; + } + + @Test(groups = { "stub", "new" }) + @SpecAssertion(section = "3.2.5", id = "c") + public void testNewBeanHasSameInterceptorMethodsAsWrappedBean() + { + assert false; + } + + @Test(groups = { "new" }) + @SpecAssertion(section = "review", id = "review") + public void testNewAnnotationCannotBeExplicitlyDeclared() + { + // All we can really do is make sure the annotation itself + // prevents the compiler from violating the assertion + Target target = New.class.getAnnotation(Target.class); + for (ElementType elementType : target.value()) + { + assert !elementType.equals(ElementType.TYPE); + } + } + + @Test + @SpecAssertion(section = "3.2.5", id = "a") + public void testForEachSimpleBeanANewBeanExists() + { + assert getCurrentManager().resolveByType(Order.class).size() == 1; + assert getCurrentManager().resolveByType(Order.class).iterator().next().getBindings().size() == 1; + assert getCurrentManager().resolveByType(Order.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class); + + assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).size() == 1; + assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().size() == 1; + assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); + + assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).size() == 1; + assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().size() == 1; + assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Tame.class); + + assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).size() == 1; + assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().size() == 1; + assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Order.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean; + +import javax.inject.Production; + +@Production +class Order +{ + + public static boolean constructed = true; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Tame.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Tame.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Tame +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Tame.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/WrappedSimpleBean.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/WrappedSimpleBean.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/WrappedSimpleBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/WrappedSimpleBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean; + +import java.io.Serializable; + +import javax.annotation.Named; +import javax.context.SessionScoped; + +@SessionScoped +@Named("Fred") +class WrappedSimpleBean implements Serializable +{ + public WrappedSimpleBean() { + + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/WrappedSimpleBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean.newAndOtherBindingType; +package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.newAndOtherBindingType; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean.newAndOtherBindingType; +package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.newAndOtherBindingType; import javax.inject.Current; import javax.inject.New; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean.newAndOtherBindingType; +package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.newAndOtherBindingType; import java.io.Serializable; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractCow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/AbstractCow.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractCow.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import javax.context.RequestScoped; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractFarmHouse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/AbstractFarmHouse.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractFarmHouse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import javax.event.Observes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractHorse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/AbstractHorse.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractHorse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import javax.context.RequestScoped; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractKennel.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/AbstractKennel.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractKennel.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractStable.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/AbstractStable.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractStable.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Cow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/Cow.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Cow.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import javax.inject.Realizes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/CowDung.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/CowDung.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/CowDung.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; class CowDung extends Dung { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Cuddly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/Cuddly.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Cuddly.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Dog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/Dog.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Dog.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; interface Dog { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Donkey.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/Donkey.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Donkey.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; class Donkey { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Dung.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/Dung.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Dung.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; class Dung { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/FarmAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/FarmAnimalDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/FarmAnimalDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/FarmHouse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/FarmHouse.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/FarmHouse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import javax.inject.Realizes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Horse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/Horse.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Horse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import javax.inject.Realizes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/HorseDung.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/HorseDung.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/HorseDung.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; class HorseDung extends Dung { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/LabradorKennel.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/LabradorKennel.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/LabradorKennel.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import javax.inject.Realizes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/RealizationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/RealizationTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Smelly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/Smelly.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Smelly.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Stable.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/Stable.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Stable.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import javax.inject.Realizes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/TameCow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/TameCow.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/TameCow.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import javax.inject.Realizes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/TameHorse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/TameHorse.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/TameHorse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.realization; +package org.jboss.jsr299.tck.tests.inheritance.realization; import javax.inject.Realizes; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Animal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Animal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +interface Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Building.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Building.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Building.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Building.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import javax.ejb.Stateful; +import javax.inject.Produces; + +@Stateful +public class Building implements BuildingLocal +{ + + @Produces + public Waste getWaste() + { + return new Waste(getClassName()); + } + + public String getClassName() + { + return Building.class.getName(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Building.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/BuildingLocal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingLocal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/BuildingLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/BuildingLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import javax.ejb.Local; + +@Local +public interface BuildingLocal +{ + + String getClassName(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/BuildingLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,63 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import java.lang.annotation.Annotation; + +import javax.inject.AnnotationLiteral; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +@IntegrationTest +(a)Packaging(PackagingType.EAR) +(a)BeansXml(&quot;beans.xml&quot;) +public class EnterpriseBeanSpecializationIntegrationTest extends AbstractDeclarativeTest +{ + + private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {}; + + @Test + @SpecAssertions({ + @SpecAssertion(section = "4.3.1", id = "f"), + @SpecAssertion(section = "3.3.7", id = "b") + }) + public void testSpecializedBeanNotInstantiated() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + FarmerLocal farmer = getCurrentManager().getInstanceByType(FarmerLocal.class, LANDOWNER_LITERAL); + assert farmer.getClassName().equals(LazyFarmer.class.getName()); + } + + }.run(); + } + + + @Test(groups="ri-broken") + @SpecAssertion(section="4.3.1", id = "g") + public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + assert getCurrentManager().resolveByType(Waste.class).size() == 1; + assert getCurrentManager().getInstanceByType(Waste.class).getFrom().equals(Office.class.getName()); + } + + }.run(); + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,72 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches; + +import java.lang.annotation.Annotation; + +import javax.inject.AnnotationLiteral; +import javax.inject.DefinitionException; +import javax.inject.manager.Bean; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + */ +@Artifact +(a)Packaging(PackagingType.EAR) +(a)BeansXml(&quot;beans.xml&quot;) +public class EnterpriseBeanSpecializationTest extends AbstractDeclarativeTest +{ + + private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {}; + + @Test + @SpecAssertions({ + @SpecAssertion(section = "4.3.1", id = "c"), + @SpecAssertion(section = "3.3.7", id = "a") + }) + public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() + { + assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1; + Bean<FarmerLocal> bean = getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next(); + assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class); + assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2; + assert annotationSetMatches( getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class); + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "4.3.1", id = "d"), + @SpecAssertion(section = "3.3.7", id = "a") + }) + public void testSpecializingBeanHasNameOfSpecializedBean() + { + assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1; + assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class); + assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer"); + } + + @Test(groups={"stub", "specialization"},expectedExceptions=DefinitionException.class) + @SpecAssertion(section="3.3.7", id = "a") + public void testSpecializingBeanDoesNotSupportAllLocalInterfacesOnSpecializedBean() + { + assert false; + } + + @Test(groups={"stub", "specialization"},expectedExceptions=DefinitionException.class) + @SpecAssertion(section="3.3.7", id = "a") + public void testSpecializingBeanDoesNotSupportLocalInterfaceView() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import javax.annotation.Named; + + +@Named("plough") +class FarmEquipment +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Farmer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Farmer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Farmer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Farmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import javax.annotation.Named; +import javax.ejb.Stateful; + + +@Landowner +@Named +@Stateful +class Farmer implements FarmerLocal +{ + + public String getClassName() + { + return Farmer.class.getName(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Farmer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmerLocal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerLocal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmerLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmerLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import javax.ejb.Local; + +@Local +public interface FarmerLocal +{ + public String getClassName(); +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmerLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Landowner.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Landowner.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Landowner.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Landowner.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Landowner +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Landowner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Lazy.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Lazy.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Lazy.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Lazy.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Lazy +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Lazy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import javax.ejb.Stateful; +import javax.inject.Specializes; + + +@Specializes @Lazy +@AnotherDeploymentType +@Stateful +public class LazyFarmer extends Farmer implements LazyFarmerLocal, FarmerLocal +{ + + @Override + public String getClassName() + { + return LazyFarmer.class.getName(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmerLocal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmerLocal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmerLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmerLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import javax.ejb.Local; + +@Local +public interface LazyFarmerLocal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmerLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Office.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import javax.ejb.Stateful; +import javax.inject.Specializes; + + + +@AnotherDeploymentType +@Stateful +@Specializes +public class Office extends Building implements OfficeLocal +{ + + @Override + public String getClassName() + { + return Office.class.getName(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/OfficeLocal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OfficeLocal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/OfficeLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/OfficeLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +public interface OfficeLocal +{ + + public String getClassName(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/OfficeLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/TractorLocal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/TractorLocal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/TractorLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/TractorLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import javax.ejb.Local; + +@Local +public interface TractorLocal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/TractorLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Waste.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Waste.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Waste.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Waste.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +public class Waste +{ + + private String from; + + public String getFrom() + { + return from; + } + + public Waste(String from) + { + super(); + this.from = from; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Yard.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Yard.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Yard.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Yard.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import javax.annotation.Named; +import javax.ejb.Stateful; + +@Named("backyard") +@Stateful +class Yard implements YardInterface +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Yard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/YardInterface.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/YardInterface.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/YardInterface.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/YardInterface.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; + +import javax.ejb.Local; + +@Local +public interface YardInterface +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/YardInterface.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/CowLocal_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/CowLocal_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/CowLocal_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsNothing; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsNothing; import javax.ejb.Local; 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/unit/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsNothing; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsNothing; import javax.ejb.Stateful; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsNothing; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsNothing; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsSimpleBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsSimpleBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsSimpleBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean; import javax.annotation.Named; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/TractorLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/TractorLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/TractorLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsSimpleBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean; import javax.ejb.Local; 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/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsSimpleBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean; import javax.ejb.Stateful; import javax.inject.Specializes; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; interface Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; 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/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; import javax.ejb.Stateful; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; 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/unit/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName; import javax.annotation.Named; import javax.ejb.Stateful; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/Yard.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/Yard.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/Yard.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName; import javax.annotation.Named; import javax.ejb.Stateful; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/YardInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/YardInterface.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/YardInterface.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName; import javax.ejb.Local; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Farmer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Farmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.samePrecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence; import javax.annotation.Named; import javax.ejb.Stateful; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/FarmerLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/FarmerLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/FarmerLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.samePrecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Landowner.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Landowner.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.samePrecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; 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/unit/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.samePrecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence; import javax.ejb.Stateful; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.samePrecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence; import javax.inject.InconsistentSpecializationException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; import javax.annotation.Named; import javax.ejb.Stateful; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FarmerInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FarmerInterface.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FarmerInterface.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; import javax.ejb.Local; 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/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; import javax.ejb.Stateful; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; 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/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; import javax.ejb.Stateful; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; import javax.inject.InconsistentSpecializationException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Expensive.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Expensive.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Expensive.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Expensive.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Expensive +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Expensive.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/JewelryShop.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method; + +import javax.inject.Produces; +import javax.inject.Specializes; + +class JewelryShop extends Shop +{ + + @Override @Produces @Specializes @Sparkly @AnotherDeploymentType + public Product getExpensiveGift() + { + return new Necklace(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Necklace.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Necklace.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Necklace.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Necklace.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method; + +class Necklace extends Product +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Necklace.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,70 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method; + +import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches; + +import java.lang.annotation.Annotation; + +import javax.inject.AnnotationLiteral; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +/** + * Spec version: PRD2 + * + */ +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +public class ProducerMethodSpecializationTest extends AbstractDeclarativeTest +{ + + private static Annotation EXPENSIVE_LITERAL = new AnnotationLiteral<Expensive>() {}; + + @Test + @SpecAssertions({ + @SpecAssertion(section = "4.3.1", id = "c"), + @SpecAssertion(section = "3.4.5", id = "a") + }) + public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() + { + assert getCurrentManager().resolveByType(Product.class, EXPENSIVE_LITERAL).size() == 1; + assert getCurrentManager().resolveByType(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings().size() == 2; + assert annotationSetMatches( getCurrentManager().resolveByType(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings(), Expensive.class, Sparkly.class); + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "4.3.1", id = "d"), + @SpecAssertion(section = "3.4.5", id = "a") + }) + public void testSpecializingBeanHasNameOfSpecializedBean() + { + assert getCurrentManager().resolveByType(Product.class, new AnnotationLiteral<Sparkly>(){}).size() == 1; + assert getCurrentManager().resolveByType(Product.class, new AnnotationLiteral<Sparkly>(){}).iterator().next().getName().equals("expensiveGift"); + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "4.3.1", id = "f"), + @SpecAssertion(section = "3.4.5", id = "a") + }) + public void testSpecializedBeanNotInstantiated() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + Product product = getCurrentManager().getInstanceByType(Product.class, EXPENSIVE_LITERAL); + assert product instanceof Necklace; + } + + }.run(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Product.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Product.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Product.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Product.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method; + +class Product +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Product.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Shop.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Shop.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Shop.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Shop.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method; + +import javax.annotation.Named; +import javax.inject.Produces; + + +class Shop +{ + + @Produces @Expensive @Named + public Product getExpensiveGift() + { + return new Product(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Shop.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Sparkly.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Sparkly.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Sparkly.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Sparkly.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Sparkly +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Sparkly.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.indirectOverride; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Expensive.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Expensive.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.indirectOverride; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.indirectOverride; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/MallShop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/MallShop.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/MallShop.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.indirectOverride; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; class MallShop extends Shop { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Product.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Product.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Product.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.indirectOverride; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; class Product { 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/unit/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.indirectOverride; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; import javax.inject.Produces; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Shop.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Shop.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.indirectOverride; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; import javax.annotation.Named; import javax.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence) 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/unit/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.lowerprecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence; import javax.inject.Produces; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Expensive.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Expensive.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.lowerprecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Product.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Product.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Product.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.lowerprecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence; class Product { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Shop.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Shop.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.lowerprecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence; import javax.annotation.Named; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.lowerprecedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence; import javax.inject.InconsistentSpecializationException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializesStaticMethod; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializesStaticMethod; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; 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/unit/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializesStaticMethod; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod; import javax.inject.Produces; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Product.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Product.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Product.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializesStaticMethod; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod; class Product { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializesStaticMethod; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod; import javax.annotation.Named; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializesStaticMethod; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; 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/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; import javax.annotation.Named; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/Pupil.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/Pupil.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/Pupil.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; class Pupil { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; import javax.annotation.Named; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; 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/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; import javax.inject.Produces; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; 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/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; import javax.inject.Produces; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Product.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Product.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Product.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; class Product { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; import javax.annotation.Named; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; +package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; import javax.inject.InconsistentSpecializationException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Animal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Animal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; + +interface Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Building.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Building.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Building.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Building.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; + +import javax.inject.Produces; + +class Building +{ + + protected String getClassName() + { + return Building.class.getName(); + } + + @Produces + public Waste getWaste() + { + return new Waste(getClassName()); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Building.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Egg.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Egg.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Egg.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Egg.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; + +class Egg +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Farmer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Farmer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Farmer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Farmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; + +import javax.annotation.Named; + + +@Landowner +@Named +class Farmer +{ + + public String getClassName() + { + return Farmer.class.getName(); + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Landowner.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Landowner.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Landowner.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Landowner.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Landowner +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Landowner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Lazy.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Lazy.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Lazy.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Lazy.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Lazy +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Lazy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/LazyFarmer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; + +import javax.inject.Specializes; + + +@Specializes @Lazy +@AnotherDeploymentType +class LazyFarmer extends Farmer +{ + + @Override + public String getClassName() + { + return LazyFarmer.class.getName(); + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Office.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; + +import javax.inject.Specializes; + + + +@AnotherDeploymentType @Specializes +class Office extends Building +{ + + @Override + protected String getClassName() + { + return Office.class.getName(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,86 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; + +import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches; + +import java.lang.annotation.Annotation; + +import javax.inject.AnnotationLiteral; +import javax.inject.DefinitionException; +import javax.inject.InconsistentSpecializationException; + +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.testng.annotations.Test; + +/** + * Spec version: PRD2 + * + */ +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +public class SimpleBeanSpecializationTest extends AbstractDeclarativeTest +{ + + private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() + { + }; + + @SuppressWarnings("unchecked") + @Test + @SpecAssertions( { @SpecAssertion(section = "4.3.1", id = "c"), @SpecAssertion(section = "3.2.7", id = "a") }) + public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() + { + assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1; + assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class); + assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2; + assert annotationSetMatches(getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class); + } + + @Test + @SpecAssertions( { @SpecAssertion(section = "4.3.1", id = "d"), @SpecAssertion(section = "3.2.7", id = "a") }) + public void testSpecializingBeanHasNameOfSpecializedBean() + { + assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1; + assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class); + assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer"); + } + + @Test + @SpecAssertions( { @SpecAssertion(section = "4.3.1", id = "f"), @SpecAssertion(section = "3.2.7", id = "b") }) + public void testSpecializedBeanNotInstantiated() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + Farmer farmer = getCurrentManager().getInstanceByType(Farmer.class, LANDOWNER_LITERAL); + assert farmer.getClassName().equals(LazyFarmer.class.getName()); + } + + }.run(); + } + + @Test + @SpecAssertion(section = "4.3.1", id = "g") + public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception + { +// deployBeans(Office.class, Building.class); + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + assert getCurrentManager().resolveByType(Waste.class).size() == 1; + assert getCurrentManager().getInstanceByType(Waste.class).getFrom().equals(Office.class.getName()); + } + + }.run(); + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Waste.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Waste.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Waste.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Waste.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; + +class Waste +{ + + private String from; + + public String getFrom() + { + return from; + } + + public Waste(String from) + { + super(); + this.from = from; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Waste.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.extendejb; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.extendejb; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb; import javax.annotation.Named; import javax.ejb.Stateful; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipmentLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/FarmEquipmentLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipmentLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.extendejb; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.extendejb; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb; import javax.inject.DefinitionException; 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/unit/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.extendejb; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb; import javax.inject.Specializes; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.names; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; 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/unit/inheritance/specialization/simple/broken/names/FarmYard_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.names; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names; import javax.annotation.Named; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.names; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names; import javax.inject.DefinitionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/Yard.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/Yard.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/Yard.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.names; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names; import javax.annotation.Named; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend1; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1; interface Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend1; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; 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/unit/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend1; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend1; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2 (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend2; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; 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/unit/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend2; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend2; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/Farmer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Farmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.precedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.precedence; import javax.annotation.Named; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/Landowner.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Landowner.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.precedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.precedence; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; 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/unit/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.precedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.precedence; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.precedence; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.precedence; import javax.inject.InconsistentSpecializationException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.two; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/Farmer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Farmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.two; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two; import javax.annotation.Named; 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/unit/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.two; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/Landowner.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Landowner.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.two; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; 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/unit/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.two; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two; import javax.inject.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.two; +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two; import javax.inject.InconsistentSpecializationException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Animal.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Animal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.lookup.byname; + +interface Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.lookup.byname; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Chunky.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Chunky.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Chunky.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Chunky.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.tests.lookup.byname; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Chunky +{ + + boolean realChunky(); + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Cod.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Cod.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Cod.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Cod.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.tests.lookup.byname; + +import javax.annotation.Named; +import javax.inject.Production; + +@Production +@Whitefish +@Chunky(realChunky=true) +@Named("whitefish") +class Cod implements ScottishFish +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Haddock.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Haddock.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Haddock.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Haddock.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.lookup.byname; + +import javax.annotation.Named; +import javax.inject.Production; + +@Production +@Named +class Haddock implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,47 @@ +package org.jboss.jsr299.tck.tests.lookup.byname; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +public class InstantiationByNameTest extends AbstractDeclarativeTest +{ + + @Test(groups={"stub", "resolution", "el"}) @SpecAssertion(section="5.10", id = "f") + //TODO Need to find a way to intercept calls to the manager to verify this condition + public void testGetInstanceByNameCalledOncePerDistinctNameInElExpression() + { + assert false; + } + + + @Test(groups = { "resolution", "el" }) + @SpecAssertions({ + @SpecAssertion(section = "5.10", id = "d"), + @SpecAssertion(section = "5.10", id = "c") + }) + public void testGetInstanceByName() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + assert getCurrentManager().resolveByName("nonexistant").size() == 0; + assert getCurrentManager().getInstanceByName("nonexistant") == null; + assert getCurrentManager().getInstanceByName("salmon") instanceof Salmon; + } + + }.run(); + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Plaice.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.lookup.byname; + +import javax.annotation.Named; + +@AnotherDeploymentType +@Whitefish +@Named("whitefish") +final class Plaice implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,37 @@ +package org.jboss.jsr299.tck.tests.lookup.byname; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +/** + * + * Spec version: Public Release Draft 2 + * + */ +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +public class ResolutionByNameTest extends AbstractDeclarativeTest +{ + + @Test(groups = { "resolution" }) + @SpecAssertion(section = "5.11", id = "c") + public void testOnlyHighestPrecedenceResolved() throws Exception + { + // Both Cod and Plaice are named "whitefish" - Plaice has the highest + // deployment type (AnotherDeploymentType) + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + assert getCurrentManager().resolveByName("whitefish").size() == 1; + assert getCurrentManager().resolveByName("whitefish").iterator().next().getTypes().contains(Plaice.class); + } + + }.run(); + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Salmon.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Salmon.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Salmon.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Salmon.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.lookup.byname; + +import javax.annotation.Named; +import javax.inject.Production; + +@Production +@Named +class Salmon implements ScottishFish +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ScottishFish.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ScottishFish.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ScottishFish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ScottishFish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.tests.lookup.byname; + + +interface ScottishFish extends Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/SeaBass.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/SeaBass.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/SeaBass.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/SeaBass.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.lookup.byname; + +import javax.context.RequestScoped; +import javax.inject.Production; + +@Production +@RequestScoped +class SeaBass implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Sole.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Sole.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Sole.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Sole.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.lookup.byname; + +import javax.annotation.Named; +import javax.inject.Production; + +@Production +@Whitefish +@Named("whitefish") +class Sole implements ScottishFish +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Tuna.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.lookup.byname; + +import javax.context.RequestScoped; + +@AnotherDeploymentType +@RequestScoped +class Tuna +{ + + public String getName() + { + return "Ophir"; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Whitefish.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Whitefish.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Whitefish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Whitefish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.lookup.byname; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Whitefish +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Cod.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Cod.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution; +package org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution; import javax.annotation.Named; import javax.inject.Production; 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/unit/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution; +package org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution; import javax.inject.AmbiguousDependencyException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Sole.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Sole.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Sole.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution; +package org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution; import javax.annotation.Named; import javax.inject.Production; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,69 @@ +package org.jboss.jsr299.tck.tests.lookup.clientProxy; + +import java.io.IOException; + +import javax.inject.manager.Bean; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +public class ClientProxyTest extends AbstractDeclarativeTest +{ + + @Test + @SpecAssertion(section = "5.4", id = "b") + public void testClientProxyUsedForNormalScope() + { + Tuna tuna = getCurrentManager().getInstanceByType(Tuna.class); + assert getCurrentConfiguration().getBeans().isProxy(tuna); + } + + @Test + @SpecAssertion(section = "5.4", id = "a") + public void testClientProxyNotUsedForPseudoScope() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + Bean<Fox> foxBean = getCurrentManager().resolveByType(Fox.class).iterator().next(); + Fox fox = getCurrentManager().getInstance(foxBean); + assert !getCurrentConfiguration().getBeans().isProxy(fox); + } + + }.run(); + } + + @Test(groups="incontainer-ri-broken") + @SpecAssertion(section = "5.4", id = "c") + public void testSimpleWebBeanClientProxyIsSerializable() throws IOException, ClassNotFoundException + { + TunedTuna tuna = getCurrentManager().getInstanceByType(TunedTuna.class); + assert getCurrentConfiguration().getBeans().isProxy(tuna); + byte[] bytes = serialize(tuna); + tuna = (TunedTuna) deserialize(bytes); + assert getCurrentConfiguration().getBeans().isProxy(tuna); + assert tuna.getState().equals("tuned"); + } + + @Test + @SpecAssertion(section = "5.4.2", id = "a") + public void testClientProxyInvocation() + { + Bean<TunedTuna> tunaBean = getCurrentManager().resolveByType(TunedTuna.class).iterator().next(); + TunedTuna tuna = getCurrentManager().getInstance(tunaBean); + assert getCurrentConfiguration().getBeans().isProxy(tuna); + assert tuna.getState().equals("tuned"); + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Fox.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Fox.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Fox.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Fox.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.lookup.clientProxy; + +import javax.context.Dependent; + +@Dependent +class Fox +{ + + public String getName() + { + return "gavin"; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Tuna.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Tuna.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Tuna.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Tuna.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.lookup.clientProxy; + +import javax.context.RequestScoped; + +@RequestScoped +class Tuna +{ + + public String getName() + { + return "Ophir"; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/TunedTuna.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/TunedTuna.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/TunedTuna.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/TunedTuna.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.lookup.clientProxy; + +import javax.context.RequestScoped; + +@RequestScoped +class TunedTuna +{ + public String getState() + { + return "tuned"; + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unknown (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unknown/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unknown/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.clientProxy.unknown; +package org.jboss.jsr299.tck.tests.lookup.clientProxy.unknown; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unknown/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/Tuna.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unknown/Tuna.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.clientProxy.unknown; +package org.jboss.jsr299.tck.tests.lookup.clientProxy.unknown; import javax.context.RequestScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unknown/UnknownBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/UnknownBeanTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unknown/UnknownBeanTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.clientProxy.unknown; +package org.jboss.jsr299.tck.tests.lookup.clientProxy.unknown; import javax.inject.DefinitionException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.clientProxy.unproxyable; +package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FinalTuna_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/FinalTuna_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FinalTuna_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.clientProxy.unproxyable; +package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable; import javax.context.RequestScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.clientProxy.unproxyable; +package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable; import javax.inject.UnproxyableDependencyException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/el) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/el/ResolutionByNameTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.el; +package org.jboss.jsr299.tck.tests.lookup.el; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.lookup.injection; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/BeanWithFinalBoundField_Broken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/BeanWithFinalBoundField_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/BeanWithFinalBoundField_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.lookup.injection; + + +class BeanWithFinalBoundField_Broken +{ + + /*@Current*/ public final Tuna tuna = null; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/BeanWithFinalBoundField_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/BeanWithStaticBoundField_Broken.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/BeanWithStaticBoundField_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/BeanWithStaticBoundField_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.lookup.injection; + + +class BeanWithStaticBoundField_Broken +{ + + /*@Current*/ public static Tuna tuna; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/BeanWithStaticBoundField_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/DeluxeHenHouse.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/DeluxeHenHouse.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/DeluxeHenHouse.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/DeluxeHenHouse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.tests.lookup.injection; + + +public class DeluxeHenHouse extends HenHouse +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Fox.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/Fox.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Fox.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Fox.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.lookup.injection; + +import javax.context.Dependent; + +@Dependent +class Fox +{ + + public String getName() + { + return "gavin"; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/FoxRun.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FoxRun.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/FoxRun.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/FoxRun.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.lookup.injection; + +import javax.inject.Current; + +class FoxRun +{ + + @Current + public Fox fox; + + @Current + public Fox anotherFox; + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/HenHouse.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/HenHouse.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/HenHouse.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/HenHouse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.lookup.injection; + +import javax.inject.Current; + +public class HenHouse +{ + + @Current + public Fox fox; + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,120 @@ +package org.jboss.jsr299.tck.tests.lookup.injection; + +import javax.context.ContextNotActiveException; +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +public class InjectionTest extends AbstractDeclarativeTest +{ + + @Test(groups = { "injection", "producerMethod" }) + @SpecAssertion(section = "5.2", id = "aa") + public void testInjectionPerformsBoxingIfNecessary() throws Exception + { + assert getCurrentManager().resolveByType(SpiderNest.class).size() == 1; + SpiderNest spiderNest = getCurrentManager().getInstanceByType(SpiderNest.class); + assert spiderNest.numberOfSpiders != null; + assert spiderNest.numberOfSpiders.equals(4); + } + + @Test(groups = { "injection", "clientProxy" }, expectedExceptions = ContextNotActiveException.class) + @SpecAssertion(section = "5.3", id = "a") + public void testInvokeNormalInjectedWebBeanWhenContextNotActive() + { + assert getCurrentManager().resolveByType(TunaFarm.class).size() == 1; + TunaFarm tunaFarm = getCurrentManager().getInstanceByType(TunaFarm.class); + assert tunaFarm.tuna != null; + getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getRequestContext()); + tunaFarm.tuna.getName(); + } + + @Test(groups = "injection") + @SpecAssertion(section = "5.3", id = "b") + public void testInvokeDependentScopeWhenContextNotActive() + { + assert getCurrentManager().resolveByType(FoxRun.class).size() == 1; + FoxRun foxRun = getCurrentManager().getInstanceByType(FoxRun.class); + assert foxRun.fox.getName().equals("gavin"); + } + + @Test @SpecAssertion(section="4.2", id = "a") + public void testFieldDeclaredInSuperclassInjected() throws Exception + { + + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + DeluxeHenHouse henHouse = getCurrentManager().getInstanceByType(DeluxeHenHouse.class); + assert henHouse.fox != null; + assert henHouse.fox.getName().equals("gavin"); + } + }.run(); + } + + @Test(groups = { "stub", "injection", "webbeansxml" }) + @SpecAssertion(section = "3.8.2", id = "a") + public void testInjectFieldsDeclaredInXml() + { + assert false; + } + + @Test(groups = { "stub", "injection", "webbeansxml" }) + @SpecAssertion(section = "3.8.2", id = "b") + public void testInjectedFieldDeclaredInXmlIgnoresJavaAnnotations() + { + assert false; + } + + @Test(groups = { "stub", "injection", "webbeansxml" }) + @SpecAssertion(section = "3.8.2", id = "c") + public void testInjectedFieldDeclaredInXmlAssumesCurrent() + { + assert false; + } + + @Test(groups = { "stub", "injection", "webbeansxml" }, expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.8.2", id = "d") + public void testNonexistentFieldDefinedInXml() + { + assert false; + } + + @Test(groups = { "stub", "injection", "webbeansxml" }) + @SpecAssertion(section = "3.8.2", id = "e") + public void testInjectFieldsDeclaredInXmlAndJava() + { + assert false; + } + + + @Test(groups = {"injection", "underInvestigation"}) + @SpecAssertion(section = "3.8", id = "aa") + public void testInjectingStaticField() + { + assert getCurrentManager().resolveByType(BeanWithStaticBoundField_Broken.class).size() == 1; + assert getCurrentManager().getInstanceByType(BeanWithStaticBoundField_Broken.class).tuna == null; + } + + @Test(groups = {"injection", "underInvestigation"}) + @SpecAssertion(section = "3.8", id = "ab") + public void testInjectingFinalField() + { + assert getCurrentManager().resolveByType(BeanWithFinalBoundField_Broken.class).size() == 1; + assert getCurrentManager().getInstanceByType(BeanWithFinalBoundField_Broken.class).tuna == null; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderNest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/SpiderNest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderNest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderNest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.tests.lookup.injection; + +import javax.inject.Initializer; + +class SpiderNest +{ + + public Integer numberOfSpiders; + + @Initializer + public SpiderNest(Integer numberOfSpiders) + { + this.numberOfSpiders = numberOfSpiders; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/SpiderProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.lookup.injection; + +import javax.inject.Produces; + +@AnotherDeploymentType +class SpiderProducer +{ + + @Produces public int getWolfSpiderSize() + { + return 4; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/Tuna.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.lookup.injection; + +import javax.context.RequestScoped; + +@AnotherDeploymentType +@RequestScoped +class Tuna +{ + + public String getName() + { + return "Ophir"; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/TunaFarm.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/TunaFarm.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/TunaFarm.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/TunaFarm.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.tests.lookup.injection; + +import javax.inject.Current; +import javax.inject.Production; + +@Production +class TunaFarm +{ + + @SuppressWarnings("unused") + @Current + public Tuna tuna; + + public Tuna notInjectedTuna = new Tuna(); + + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouseProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouseProducer_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouseProducer_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.injection.nullableBean; +package org.jboss.jsr299.tck.tests.lookup.injection.nullableBean; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouse_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouse_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouse_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.injection.nullableBean; +package org.jboss.jsr299.tck.tests.lookup.injection.nullableBean; import javax.inject.Current; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/NullableBeanTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.injection.nullableBean; +package org.jboss.jsr299.tck.tests.lookup.injection.nullableBean; import javax.inject.NullableDependencyException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.injectionpoint; +package org.jboss.jsr299.tck.tests.lookup.injectionpoint; interface Animal { 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/unit/lookup/injectionpoint/AnimalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.injectionpoint; +package org.jboss.jsr299.tck.tests.lookup.injectionpoint; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.injectionpoint; +package org.jboss.jsr299.tck.tests.lookup.injectionpoint; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/BeanWithInjectionPointMetadata.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.jsr299.tck.unit.lookup.injectionpoint; +package org.jboss.jsr299.tck.tests.lookup.injectionpoint; import javax.inject.Current; import javax.inject.manager.InjectionPoint; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/ConstructorInjectionPointBean.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.jsr299.tck.unit.lookup.injectionpoint; +package org.jboss.jsr299.tck.tests.lookup.injectionpoint; import javax.inject.Current; import javax.inject.Initializer; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/FieldInjectionPointBean.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.lookup.injectionpoint; +package org.jboss.jsr299.tck.tests.lookup.injectionpoint; import javax.context.RequestScoped; import javax.inject.Current; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.jsr299.tck.unit.lookup.injectionpoint; +package org.jboss.jsr299.tck.tests.lookup.injectionpoint; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/MethodInjectionPointBean.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.unit.lookup.injectionpoint; +package org.jboss.jsr299.tck.tests.lookup.injectionpoint; import javax.inject.Current; import javax.inject.Initializer; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/FishFarmOffice.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/FishFarmOffice.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/FishFarmOffice.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/FishFarmOffice.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.lookup.manager; + +import javax.inject.Current; +import javax.inject.manager.Manager; + +class FishFarmOffice +{ + + @Current public Manager manager; + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/ManagerTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,33 @@ +package org.jboss.jsr299.tck.tests.lookup.manager; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +public class ManagerTest extends AbstractDeclarativeTest +{ + @Test(groups={"manager", "injection", "deployment"}) + @SpecAssertion(section="5.7.2", id = "a") + public void testInjectingManager() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + FishFarmOffice fishFarmOffice = getCurrentManager().getInstanceByType(FishFarmOffice.class); + assert fishFarmOffice.manager != null; + } + + }.run(); + + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/jndi) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/jndi/ManagerTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.manager.jndi; +package org.jboss.jsr299.tck.tests.lookup.manager.jndi; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/nonContextual) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/nonContextual/NonContextualInjectionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.nonContextual; +package org.jboss.jsr299.tck.tests.lookup.nonContextual; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; +package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; interface Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; +package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; +package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Chunky.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Chunky.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; +package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Cod.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Cod.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; +package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; import javax.annotation.Named; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/FakeFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/FakeFish.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/FakeFish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; +package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/InstantiationByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/InstantiationByTypeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/InstantiationByTypeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; +package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; import javax.inject.AmbiguousDependencyException; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/ParameterizedBean_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/ParameterizedBean_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/ParameterizedBean_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; +package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; class ParameterizedBean_Broken<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Salmon.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Salmon.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Salmon.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; +package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; import javax.annotation.Named; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/ScottishFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/ScottishFish.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/ScottishFish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; +package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Sole.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Sole.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Sole.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; +package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; import javax.annotation.Named; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Tuna.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Tuna.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; +package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; import javax.context.RequestScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Whitefish.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Whitefish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; +package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution (from rev 1737, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; interface Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnimalFarmer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; class AnimalFarmer extends Farmer<Animal> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Chunky.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Chunky.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ChunkyLiteral.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Cod.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cod.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.annotation.Named; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DaddyLongLegs.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DaddyLongLegs.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DaddyLongLegs.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; class DaddyLongLegs extends Spider { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DeadlyAnimal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DeadlyAnimal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; interface DeadlyAnimal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DeadlySpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DeadlySpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; interface DeadlySpider extends DeadlyAnimal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Expensive.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ExpensiveLiteral.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.inject.AnnotationLiteral; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FakeFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/FakeFish.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FakeFish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Farmer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FishILike.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/FishILike.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FishILike.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Haddock.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Haddock.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.annotation.Named; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Halibut.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Halibut.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Halibut.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; @Expensive(cost=50, veryExpensive=true) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/LadybirdSpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/LadybirdSpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.context.ApplicationScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ParameterizedBean_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ParameterizedBean_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ParameterizedBean_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; class ParameterizedBean_Broken<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Plaice.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.annotation.Named; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import java.util.ArrayList; import java.util.List; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/RoundWhitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/RoundWhitefish.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/RoundWhitefish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; @Expensive(cost=60, veryExpensive=true) @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Salmon.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Salmon.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Salmon.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.annotation.Named; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ScottishFish.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; interface ScottishFish extends Animal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ScottishFishFarmer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/SeaBass.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SeaBass.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.context.RequestScoped; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Sole.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Sole.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Sole.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.annotation.Named; import javax.inject.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Spider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Spider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; class Spider implements Animal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/SpiderProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Tarantula.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; class Tarantula extends Spider implements DeadlySpider { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Tuna.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import javax.context.RequestScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Whitefish.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Whitefish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; +package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextIntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextIntegrationTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextIntegrationTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.jsr299.tck.unit.context; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - */ -@Artifact -@IntegrationTest -public class ContextIntegrationTest -{ - @Test(groups = { "stub", "contexts", "integration" }) - @SpecAssertion(section = "8.5", id = "c") - public void testBuiltInNormalScopedContextsDoNotPropagateAcrossRemoteMethodInvocations() - { - assert false; - } - - @Test(groups = { "stub", "contexts", "integration" }) - @SpecAssertion(section = "8.5", id = "c") - public void testBuiltInNormalScopedContextsDoNotPropagateAcrossAsynchronousMethodInvocations() - { - assert false; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,106 +0,0 @@ -package org.jboss.jsr299.tck.unit.context; - -import java.lang.annotation.Annotation; - -import javax.context.Context; -import javax.context.ContextNotActiveException; -import javax.context.Contextual; -import javax.context.CreationalContext; -import javax.context.RequestScoped; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - */ -@Artifact -public class ContextTest extends AbstractDeclarativeTest -{ - - private @interface Dummy - { - - } - - private @interface Unregistered - { - - } - - private static class DummyContext implements Context - { - - public <T> T get(Contextual<T> bean, CreationalContext<T> creationalContext) - { - throw new UnsupportedOperationException(); - } - - public <T> T get(Contextual<T> contextual) - { - return get(contextual, null); - } - - public Class<? extends Annotation> getScopeType() - { - return Dummy.class; - } - - public boolean isActive() - { - return true; - } - } - - @Test(expectedExceptions = { ContextNotActiveException.class }, groups = { "manager" }) - @SpecAssertion(section = "8.6", id = "c") - public void testGetContextWithNoActiveContextsFails() - { - getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getRequestContext()); - getCurrentManager().getContext(RequestScoped.class); - } - - @Test(expectedExceptions = { IllegalStateException.class }, groups = { "manager" }) - @SpecAssertion(section = "8.6", id = "d") - public void testGetContextWithTooManyActiveContextsFails() - { - Context firstContext = new DummyContext() - { - }; - Context secondContext = new DummyContext() - { - }; - getCurrentManager().addContext(firstContext); - getCurrentManager().addContext(secondContext); - getCurrentManager().getContext(Dummy.class); - } - - @Test(expectedExceptions = { ContextNotActiveException.class }, groups = { "manager" }) - @SpecAssertion(section = "8.6", id = "c") - public void testGetContextWithNoRegisteredContextsFails() - { - getCurrentManager().getContext(Unregistered.class); - } - - @Test(groups = { "manager" }) - @SpecAssertion(section = "8.6", id = "b") - public void testGetContextReturnsActiveContext() - { - getCurrentManager().getContext(RequestScoped.class); - } - - /** - * For each of the built-in normal scopes, contexts propagate across any Java - * method call, including invocation of EJB local business methods. - */ - @Test(groups = { "stub", "contexts", "underInvestigation" }) - @SpecAssertion(section = "8.5", id = "b") - public void testBuiltInNormalScopedContextsPropagateAcrossAnyJavaMethodCall() - { - assert false; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DestroyedInstanceReturnedByGetTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DestroyedInstanceReturnedByGetTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DestroyedInstanceReturnedByGetTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,54 +0,0 @@ -package org.jboss.jsr299.tck.unit.context; - -import javax.context.ApplicationScoped; -import javax.context.Context; -import javax.context.SessionScoped; -import javax.inject.manager.Bean; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -@Artifact -public class DestroyedInstanceReturnedByGetTest extends AbstractDeclarativeTest -{ - - - Context context; - - @BeforeMethod(dependsOnMethods = "beforeMethod") - public void initContext() - { - if (context == null) - { - context = new DummyContext(); - getCurrentManager().addContext(context); - } - } - - @Test(groups = { "contexts", "ri-broken" }) - @SpecAssertion(section = "8.1", id = "g") - public void testDestroyedInstanceMustNotBeReturnedByGet() - { - Bean<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); - MyCreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); - MySessionBean beanInstance = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext); - assert beanInstance != null; - mySessionBean.destroy(beanInstance); - MySessionBean beanInstanceFromGet = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean); - assert beanInstanceFromGet != beanInstance; - - Bean<MyApplicationBean> myApplicationBean = getCurrentManager().resolveByType(MyApplicationBean.class).iterator().next(); - MyCreationalContext<MyApplicationBean> myCreationalContextForApplication = new MyCreationalContext<MyApplicationBean>(); - MyApplicationBean myApplicationBeanInstance = getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean, myCreationalContextForApplication); - assert myApplicationBeanInstance != null; - myApplicationBean.destroy(myApplicationBeanInstance); - - MyApplicationBean mySecondApplicationBeanInstance = getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean); - assert mySecondApplicationBeanInstance != null; - assert myApplicationBeanInstance != mySecondApplicationBeanInstance; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DummyContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DummyContext.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DummyContext.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,30 +0,0 @@ -package org.jboss.jsr299.tck.unit.context; - -import java.lang.annotation.Annotation; - -import javax.context.Context; -import javax.context.Contextual; -import javax.context.CreationalContext; - -class DummyContext implements Context -{ - public <T> T get(Contextual<T> bean, CreationalContext<T> creationalContext) - { - throw new UnsupportedOperationException(); - } - - public <T> T get(Contextual<T> contextual) - { - return get(contextual, null); - } - - public Class<? extends Annotation> getScopeType() - { - return DummyScoped.class; - } - - public boolean isActive() - { - return true; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DummyScoped.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DummyScoped.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DummyScoped.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.unit.context; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -import javax.context.ScopeType; - -@ScopeType -(a)Retention(RetentionPolicy.RUNTIME) -@interface DummyScoped -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetOnInactiveContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetOnInactiveContextTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetOnInactiveContextTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,43 +0,0 @@ -package org.jboss.jsr299.tck.unit.context; - -import javax.context.Context; -import javax.context.ContextNotActiveException; -import javax.context.Contextual; -import javax.context.SessionScoped; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.testng.annotations.Test; - -@Artifact -public class GetOnInactiveContextTest extends AbstractDeclarativeTest -{ - - - Context context; - - public void initContext() - { - initContext(); - if (context == null) - { - context = new DummyContext(); - getCurrentManager().addContext(context); - } - } - - - @Test(groups = { "contexts" }, expectedExceptions = { ContextNotActiveException.class }) - @SpecAssertion(section = "8.1", id = "h") - public void testInvokingGetOnInactiveContextFails() - { - Context sessionContext = getCurrentManager().getContext(SessionScoped.class); - assert sessionContext.isActive(); - setContextInactive(sessionContext); - - Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); - sessionContext.get(mySessionBean); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,49 +0,0 @@ -package org.jboss.jsr299.tck.unit.context; - -import javax.context.ApplicationScoped; -import javax.context.Context; -import javax.context.Contextual; -import javax.context.CreationalContext; -import javax.context.SessionScoped; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.testng.annotations.Test; - -@Artifact -public class GetTest extends AbstractDeclarativeTest -{ - - Context context; - - public void initContext() - { - if (context == null) - { - context = new DummyContext(); - getCurrentManager().addContext(context); - } - } - - - @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.1", id = "e") - public void testGetMayNotCreateNewInstanceUnlessCreationalContextGiven() - { - initContext(); - Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); - assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean) == null; - - Contextual<MyApplicationBean> myApplicationBean = getCurrentManager().resolveByType(MyApplicationBean.class).iterator().next(); - assert getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean) == null; - - // Now try same operation with a CreationalContext - CreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); - assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext) != null; - - CreationalContext<MyApplicationBean> myOtherCreationalContext = new MyCreationalContext<MyApplicationBean>(); - assert getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean, myOtherCreationalContext) != null; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetWithNoCreationalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetWithNoCreationalContextTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetWithNoCreationalContextTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,37 +0,0 @@ -package org.jboss.jsr299.tck.unit.context; - -import javax.context.Context; -import javax.context.Contextual; -import javax.context.SessionScoped; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.testng.annotations.Test; - -@Artifact -public class GetWithNoCreationalContextTest extends AbstractDeclarativeTest -{ - - Context context; - - public void initContext() - { - if (context == null) - { - context = new DummyContext(); - getCurrentManager().addContext(context); - } - } - - - @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.1", id = "b") - public void testGetWithoutCreationalContextReturnsNull() - { - initContext(); - Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); - assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean) == null; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MyApplicationBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MyApplicationBean.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MyApplicationBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.context; - -import java.io.Serializable; - -import javax.context.ApplicationScoped; - -@ApplicationScoped -class MyApplicationBean implements Serializable -{ - - /** - * - */ - private static final long serialVersionUID = 1L; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MyContextual.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MyContextual.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MyContextual.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,107 +0,0 @@ -package org.jboss.jsr299.tck.unit.context; - -import java.io.Serializable; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - -import javax.context.CreationalContext; -import javax.context.SessionScoped; -import javax.inject.Standard; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; -import javax.inject.manager.Manager; - -class MyContextual extends Bean<MySessionBean> -{ - private boolean createCalled = false; - private boolean destroyCalled = false; - private boolean shouldReturnNullInstances = false; - - protected MyContextual(Manager manager) - { - super(manager); - } - - @Override - public Set<Annotation> getBindings() - { - return Collections.emptySet(); - } - - @Override - public Class<? extends Annotation> getDeploymentType() - { - return Standard.class; - } - - @Override - public Set<? extends InjectionPoint> getInjectionPoints() - { - return Collections.emptySet(); - } - - @Override - public String getName() - { - return "my-session-bean"; - } - - @Override - public Class<? extends Annotation> getScopeType() - { - return SessionScoped.class; - } - - @SuppressWarnings("unchecked") - @Override - public Set<Type> getTypes() - { - return new HashSet<Type>(Arrays.asList(Object.class, MySessionBean.class, Serializable.class)); - } - - @Override - public boolean isNullable() - { - return false; - } - - @Override - public boolean isSerializable() - { - return true; - } - - public MySessionBean create(CreationalContext<MySessionBean> creationalContext) - { - createCalled = true; - if (shouldReturnNullInstances) - return null; - else - return new MySessionBean(); - } - - public void destroy(MySessionBean instance) - { - destroyCalled = true; - } - - public boolean isCreateCalled() - { - return createCalled; - } - - public boolean isDestroyCalled() - { - return destroyCalled; - } - - public void setShouldReturnNullInstances(boolean shouldReturnNullInstances) - { - this.shouldReturnNullInstances = shouldReturnNullInstances; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MyCreationalContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MyCreationalContext.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MyCreationalContext.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.context; - -import javax.context.CreationalContext; - -class MyCreationalContext<T> implements CreationalContext<T> -{ - - public void push(T incompleteInstance) - { - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MySessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MySessionBean.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/MySessionBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.context; - -import java.io.Serializable; - -@DummyScoped -class MySessionBean implements Serializable -{ - - /** - * - */ - private static final long serialVersionUID = 1L; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,114 +0,0 @@ -package org.jboss.jsr299.tck.unit.context; - -import javax.context.Context; -import javax.context.Contextual; -import javax.context.CreationalContext; -import javax.context.SessionScoped; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.testng.annotations.Test; - -/** - * - * @author Nicklas Karlsson - * @author Pete Muir - * @author David Allen - * - * This class tests a basic context against section 8 of the - * specification - * - * Spec version: PRD2 - */ -@Artifact -public class NormalContextTest extends AbstractDeclarativeTest -{ - - Context context; - - public void initContext() - { - if (context == null) - { - context = new DummyContext(); - getCurrentManager().addContext(context); - } - } - - @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.1", id = "a") - public void testGetReturnsExistingInstance() - { - initContext(); - Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); - MyCreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); - MySessionBean beanInstance = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext); - assert beanInstance != null; - MySessionBean beanInstanceFromGet = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean); - assert beanInstanceFromGet == beanInstance; - } - - @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.1", id = "c") - public void testGetWithCreationalContextReturnsNewInstance() - { - initContext(); - MyContextual bean = new MyContextual(getCurrentManager()); - bean.setShouldReturnNullInstances(false); - getCurrentManager().addBean(bean); - - CreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); - assert getCurrentManager().getContext(SessionScoped.class).get(bean, myCreationalContext) != null; - assert bean.isCreateCalled(); - } - - @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.1", id = "d") - public void testGetMayNotReturnNullUnlessNoCreationalContextOrContextualCreateReturnsNull() - { - initContext(); - // The case of no creational context is already tested where a null is - // returned. Here we just test that the contextual create can return null. - MyContextual bean = new MyContextual(getCurrentManager()); - bean.setShouldReturnNullInstances(true); - getCurrentManager().addBean(bean); - - CreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); - assert getCurrentManager().getContext(SessionScoped.class).get(bean, myCreationalContext) == null; - assert bean.isCreateCalled(); - } - - @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.1", id = "f") - public void testContextDestroysBeansWhenDestroyed() - { - initContext(); - MyContextual bean = new MyContextual(getCurrentManager()); - bean.setShouldReturnNullInstances(false); - getCurrentManager().addBean(bean); - - CreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); - Context sessionContext = getCurrentManager().getContext(SessionScoped.class); - assert sessionContext.get(bean, myCreationalContext) != null; - assert bean.isCreateCalled(); - - destroyContext(sessionContext); - assert bean.isDestroyCalled(); - } - - - - - /** - * There may be no more than one mapped instance per contextual type per - * thread - */ - @Test(groups = { "contexts", "stub", "underInvestigation" }) - @SpecAssertion(section = "8.2", id = "a") - public void testOnlyOneMappedInstancePerContextualTypePerThread() - { - assert false; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface AnotherDeploymentType -{ - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Big.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Big.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Big.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Big -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/City.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/City.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/City.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -class City -{ - public void ping() { - - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityBinding.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.context.Dependent; -import javax.interceptor.InterceptorBindingType; - -@InterceptorBindingType -@Dependent -@Target({TYPE, METHOD}) -@Retention(RUNTIME) -@interface CityBinding -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityInterface.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityInterface.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -interface CityInterface -{ - public void foo(); -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.context.Dependent; -import javax.inject.Produces; - -@AnotherDeploymentType -class CityProducer -{ - @Produces @Dependent public Violation reference = new Violation(); -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer2.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer2.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer2.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.context.Dependent; -import javax.inject.Produces; - -@AnotherDeploymentType -class CityProducer2 -{ - @Produces @Dependent @Big - public Violation create() - { - return new Violation(); - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/FooConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/FooConsumer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/FooConsumer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.context.RequestScoped; -import javax.inject.Current; - -@RequestScoped -class FooConsumer -{ - - @Current SerializableFoo foo; - - public void ping(){}; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Generator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Generator.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Generator.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,28 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - - -import java.io.Serializable; - -import javax.context.ApplicationScoped; -import javax.inject.Produces; - -@ApplicationScoped -@AnotherDeploymentType -class Generator implements Serializable -{ - - private static final long serialVersionUID = -7213673465118041882L; - - private int number = 100; - - @Produces int getNumber() - { - return number; - } - - @Produces SerializableFoo getFoo() - { - return new SerializableFoo(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Helsinki.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Helsinki.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Helsinki.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.context.Dependent; -import javax.ejb.Stateful; - -@Dependent -@Stateful -class Helsinki implements HelsinkiLocal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/HelsinkiLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/HelsinkiLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/HelsinkiLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.ejb.Local; - -@Local -public interface HelsinkiLocal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Hyvinkaa.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Hyvinkaa.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Hyvinkaa.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; -import javax.inject.Current; - -@SuppressWarnings("serial") -@SessionScoped -class Hyvinkaa implements Serializable -{ - @SuppressWarnings("unused") - @Current - private transient Violation reference; -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Jamsa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Jamsa_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Jamsa_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,25 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; -import javax.inject.Current; -import javax.inject.Produces; - -@SessionScoped -@AnotherDeploymentType -class Jamsa_Broken extends City implements Serializable -{ - private static final long serialVersionUID = 8228981889946806181L; - - public Jamsa_Broken() - { - } - - @Produces - @SessionScoped - public Violation2 create(@Current Violation violation) - { - return new Violation2(); - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Joensuu.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Joensuu.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Joensuu.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; -import javax.inject.Current; - -@SuppressWarnings("serial") -@SessionScoped -class Joensuu implements Serializable -{ - @SuppressWarnings("unused") - @Current - private transient Violation reference; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Jyvaskyla.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Jyvaskyla.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Jyvaskyla.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; - -@SuppressWarnings("serial") -@SessionScoped -class Jyvaskyla implements Serializable -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kajaani.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kajaani.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kajaani.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; - -@SessionScoped -public class Kajaani implements Serializable -{ - private static final long serialVersionUID = 1L; - private Integer theNumber = 0; - - public int getTheNumber() - { - return theNumber; - } - - public void setTheNumber(int theNumber) - { - this.theNumber = theNumber; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kuopio_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kuopio_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kuopio_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; -import javax.inject.Initializer; - -@SessionScoped -class Kuopio_Broken extends City implements Serializable -{ - private static final long serialVersionUID = 2446135216757213774L; - - public Kuopio_Broken() { - - } - - @Initializer - public void init(@Big Violation reference) { - - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/London_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/London_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/London_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,25 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; -import javax.inject.Produces; - -@SessionScoped -@AnotherDeploymentType -class London_Broken extends City implements Serializable -{ - private static final long serialVersionUID = 8228981889946806181L; - - public London_Broken() - { - } - - @Produces - @SessionScoped - @Big - public Violation2 create(@Big Violation violation) - { - return new Violation2(); - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; -import javax.inject.Initializer; - -@SessionScoped -class Loviisa_Broken extends City implements Serializable -{ - private static final long serialVersionUID = -2866858442948392508L; - - public Loviisa_Broken() { - } - - @Initializer - public Loviisa_Broken(@Big Violation reference) { - - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/MaarianHaminaLocal_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/MaarianHaminaLocal_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/MaarianHaminaLocal_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.ejb.Local; - -@Local -public interface MaarianHaminaLocal_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Maarianhamina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Maarianhamina_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Maarianhamina_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.context.SessionScoped; -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.inject.Current; - -@Stateful -@SessionScoped -class Maarianhamina_Broken implements MaarianHaminaLocal_Broken -{ - @SuppressWarnings("unused") - @Current - private Violation reference; - - @Remove - public void bye() { - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Mikkeli_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Mikkeli_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Mikkeli_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,23 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; -import javax.inject.Current; -import javax.inject.Initializer; - -@SessionScoped -class Mikkeli_Broken extends City implements Serializable -{ - private static final long serialVersionUID = -3853118456066667893L; - - public Mikkeli_Broken() - { - } - - @Initializer - public Mikkeli_Broken(@Current Violation reference) - { - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Nokia_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Nokia_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Nokia_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; -import javax.inject.Current; - -@SessionScoped -class Nokia_Broken extends City implements Serializable -{ - private static final long serialVersionUID = -9104722758108835718L; - - @SuppressWarnings("unused") - @Current - private Violation reference; -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/NumberConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/NumberConsumer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/NumberConsumer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.context.RequestScoped; -import javax.inject.Current; - -@RequestScoped -class NumberConsumer -{ - - @Current int number; - - public void ping(){}; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextIntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextIntegrationTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextIntegrationTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,54 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.IOException; - -import javax.inject.IllegalProductException; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; -import org.testng.annotations.Test; - -@Artifact -@IntegrationTest -(a)Packaging(PackagingType.EAR) -public class PassivatingContextIntegrationTest extends AbstractDeclarativeTest -{ - - @Test(groups = { "stub", "contexts", "passivation", "jms" }) - @SpecAssertion(section = "8.4", id = "u") - public void testJMSEndpointProxyIsSerializable() - { - assert false; - } - - @Test(groups = { "contexts", "passivation", "integration", "broken" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "8.4", id = "p") - public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails() throws SecurityException, NoSuchMethodException - { - getCurrentManager().getInstanceByType(MaarianHaminaLocal_Broken.class); - } - - /** - * the Web Bean is an EJB stateful session bean, and it is passivated by the - * EJB container. - */ - // TODO requires an EJB instance - @Test(groups = { "contexts", "passivation", "stub", "integration" }) - @SpecAssertion(section = "8.4", id = "g") - public void testStatefulEJBIsSerializedWhenPassivatedByEJBContainer() throws IOException, ClassNotFoundException - { - assert false; - } - - @Test(groups = { "contexts", "passivation", "stub", "integration" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "8.4", id = "p") - public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails() throws Exception - { - assert false; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,182 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.IOException; -import java.lang.annotation.Annotation; -import java.util.Set; - -import javax.context.Context; -import javax.context.SessionScoped; -import javax.inject.AnnotationLiteral; -import javax.inject.IllegalProductException; -import javax.inject.manager.Bean; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; -import org.testng.annotations.Test; - -/** - * - * @author Nicklas Karlsson - * @author David Allen - * - * Spec version: PRD2 - */ -@Artifact -(a)BeansXml(&quot;beans.xml&quot;) -(a)Packaging(PackagingType.EAR) -public class PassivatingContextTest extends AbstractDeclarativeTest -{ - - private static final Annotation BIG_LITERAL = new AnnotationLiteral<Big>() {}; - - @Test(groups = { "contexts", "passivation" }) - @SpecAssertion(section = "8.4", id = "b") - public void testSimpleWebBeanWithSerializableImplementationClassOK() - { - Set<Bean<Jyvaskyla>> beans = getCurrentManager().resolveByType(Jyvaskyla.class); - assert !beans.isEmpty(); - } - - @Test @SpecAssertion(section="8.4", id = "ca") - public void testInjectionOfDependentSerializableProductIntoNormalBean() - { - getCurrentManager().getInstanceByType(NumberConsumer.class).ping(); - } - - @Test @SpecAssertion(section="8.4", id = "cb") - public void testInjectionOfDependentPrimitiveProductIntoNormalBean() - { - getCurrentManager().getInstanceByType(FooConsumer.class).ping(); - } - - @Test(groups = { "contexts", "passivation" }) - @SpecAssertions({ - @SpecAssertion(section = "8.4", id = "f"), - @SpecAssertion(section = "8.4", id = "i") - }) - public void testSimpleWebBeanDeclaringPassivatingScopeIsSerializedWhenContextIsPassivated() throws IOException, ClassNotFoundException - { - Kajaani instance = getCurrentManager().getInstanceByType(Kajaani.class); - instance.setTheNumber(100); - Context sessionContext = getCurrentManager().getContext(SessionScoped.class); - setContextInactive(sessionContext); - setContextActive(sessionContext); - instance = getCurrentManager().getInstanceByType(Kajaani.class); - assert instance.getTheNumber() == 100; - } - - @SuppressWarnings("unchecked") - private <T> boolean testSerialize(Bean<T> bean) throws IOException, ClassNotFoundException - { - getCurrentManager().addBean(bean); - T instance = getCurrentManager().getInstance(bean); - byte[] data = serialize(instance); - T resurrected = (T) deserialize(data); - return resurrected.toString().equals(instance.toString()); - } - - /** - * @throws ClassNotFoundException - * @throws IOException - */ - @Test(groups = { "contexts", "passivation", "incontainer-ri-broken" }) - @SpecAssertion(section = "8.4", id = "j") - public void testDependentEJBsAreSerializable() throws IOException, ClassNotFoundException - { - Set<Bean<Vaasa>> vaasaBeans = getCurrentManager().resolveByType(Vaasa.class); - assert vaasaBeans.size() == 1; - assert testSerialize(vaasaBeans.iterator().next()); - } - - @Test(groups = { "contexts", "passivation" }) - @SpecAssertion(section = "8.4", id = "l") - public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoTransientFieldOK() - { - Set<Bean<Joensuu>> beans = getCurrentManager().resolveByType(Joensuu.class); - assert !beans.isEmpty(); - } - - @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "8.4", id = "q") - public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoNonTransientFieldOfWebBeanWithPassivatingScopeFails() - { - getCurrentManager().getInstanceByType(Nokia_Broken.class).ping(); - } - - @Test(groups = { "contexts", "passivation" }) - @SpecAssertion(section = "8.4", id = "q") - public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoTransientFieldOfWebBeanWithPassivatingScopeOK() - { - Set<Bean<Hyvinkaa>> beans = getCurrentManager().resolveByType(Hyvinkaa.class); - assert !beans.isEmpty(); - } - - @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "8.4", id = "r") - public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoConstructorParameterOfWebBeanWithPassivatingScopeFails() - { - getCurrentManager().getInstanceByType(Loviisa_Broken.class).ping(); - } - - @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "8.4", id = "s") - public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoInitializerParameterOfWebBeanWithPassivatingScopeFails() - { - getCurrentManager().getInstanceByType(Kuopio_Broken.class).ping(); - } - - @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "8.4", id = "t") - public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoProducerMethodParameterWithPassivatingScopeFails() - { - getCurrentManager().getInstanceByType(Violation2.class).ping(); - } - - @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "8.4", id = "q") - public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoNonTransientFieldOfWebBeanWithPassivatingScopeFails() - { - getCurrentManager().getInstanceByType(Uusikaupunki_Broken.class).ping(); - } - - @Test(groups = { "contexts", "passivation" }) - @SpecAssertion(section = "8.4", id = "q") - public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoTransientFieldOfWebBeanWithPassivatingScopeOK() - { - getCurrentManager().getInstanceByType(Salo_Broken.class).ping(); - } - - @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "8.4", id = "r") - public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoConstructorParameterOfWebBeanWithPassivatingScopeFails() - { - getCurrentManager().getInstanceByType(Loviisa_Broken.class).ping(); - } - - @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "8.4", id = "s") - public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoInitializerParameterOfWebBeanWithPassivatingScopeFails() - { - getCurrentManager().getInstanceByType(Mikkeli_Broken.class).ping(); - } - - @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "8.4", id = "t") - public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoProducerMethodParameterWithPassivatingScopeFails() - { - getCurrentManager().getInstanceByType(Violation2.class, BIG_LITERAL).ping(); - } - - @Test(groups = { "contexts", "passivation", "enterpriseBean", "integration" }) - @SpecAssertion(section = "8.4", id = "a") - public void testEJBWebBeanCanDeclarePassivatingScope() - { - assert getCurrentManager().resolveByType(TurkuLocal.class).size() == 1; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Salo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Salo_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Salo_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; -import javax.inject.Current; - -@SessionScoped -class Salo_Broken extends City implements Serializable -{ - private static final long serialVersionUID = 5500591077418621816L; - - @SuppressWarnings("unused") - @Current - private transient Violation reference; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/SerializableFoo.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/SerializableFoo.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/SerializableFoo.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -public class SerializableFoo implements Serializable -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Turku.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Turku.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Turku.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.context.SessionScoped; -import javax.ejb.Remove; -import javax.ejb.Stateful; - -@Stateful -@SessionScoped -class Turku implements TurkuLocal -{ - @Remove - public void bye() { - - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/TurkuLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/TurkuLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/TurkuLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.ejb.Local; - -@Local -public interface TurkuLocal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Uusikaupunki_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Uusikaupunki_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Uusikaupunki_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; -import javax.inject.Current; - -@SessionScoped -class Uusikaupunki_Broken extends City implements Serializable -{ - private static final long serialVersionUID = 5097928748462594346L; - - @SuppressWarnings("unused") - @Current - private Violation reference; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Vaasa.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Vaasa.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Vaasa.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; -import javax.inject.Current; - -@SuppressWarnings("serial") -@SessionScoped -class Vaasa implements Serializable -{ - @SuppressWarnings("unused") - @Current private HelsinkiLocal ejb; -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.context.Dependent; - -@Dependent -class Violation -{ - - public void ping() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation2.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation2.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation2.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.context.Dependent; - -@Dependent -class Violation2 -{ - - public void ping() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -interface Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@Inherited -@interface AnotherDeploymentType -{ - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/BlackWidow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/BlackWidow.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/BlackWidow.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -class BlackWidow extends Spider implements DeadlySpider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/BorderCollie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/BorderCollie.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/BorderCollie.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -class BorderCollie extends Dog -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeadlyAnimal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeadlyAnimal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -interface DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeadlySpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeadlySpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -interface DeadlySpider extends DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,143 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -import javax.inject.DeploymentException; -import javax.inject.Production; -import javax.inject.UnsatisfiedDependencyException; -import javax.inject.manager.Bean; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; -import org.testng.annotations.Test; - -/** - * - * Spec version: Public Release Draft 2 - * - */ -@Artifact -(a)BeansXml(&quot;beans.xml&quot;) -public class DeploymentTypeDefinitionTest extends AbstractDeclarativeTest -{ - - /** - * - * TODO This text is not really a testable assertion - */ - @Test(groups = { "stub", "annotationDefinition", "deploymentType" }) - @SpecAssertion(section = "2.5.2", id = "a") - public void testDeploymentTypeHasCorrectTarget() - { - assert false; - } - - /** - * - * TODO This text is not really a testable assertion - */ - @Test(groups = { "stub", "annotationDefinition", "deploymentType" }) - @SpecAssertion(section = "2.5.2", id = "c") - public void testDeploymentTypeDeclaresDeploymentTypeAnnotation() - { - assert false; - } - - @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "2.5.3", id = "c") - public void testDeploymentTypeInhertitedFromDeclaringBean() throws Exception - { - assert getCurrentManager().resolveByType(BlackWidow.class).size() == 1; - Bean<BlackWidow> blackWidowSpiderModel = getCurrentManager().resolveByType(BlackWidow.class).iterator().next(); - assert blackWidowSpiderModel.getDeploymentType().equals(AnotherDeploymentType.class); - } - - /** - * - * TODO Section 2.5.4 does not claim that XML overrides Java for deployment - * types - */ - @Test(groups = { "stub", "webbeansxml", "deploymentType" }) - @SpecAssertion(section = "2.5.4", id = "a") - public void testXmlDeploymentTypeElement() - { - assert false; - } - - @Test(groups = { "webbeansxml", "deploymentType" }) - @SpecAssertion(section = "2.5.5", id = "a") - public void testDefaultDeploymentType() - { - assert getCurrentManager().resolveByType(Tarantula.class).size() == 1; - Bean<Tarantula> bean = getCurrentManager().resolveByType(Tarantula.class).iterator().next(); - assert bean.getDeploymentType().equals(Production.class); - } - - @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "2.5.5", id = "b") - public void testHighestPrecedenceDeploymentTypeFromStereotype() - { - assert getCurrentManager().resolveByType(Rhinoceros.class).size() == 1; - Bean<?> bean = getCurrentManager().resolveByType(Rhinoceros.class).iterator().next(); - assert bean.getDeploymentType().equals(HornedAnimalDeploymentType.class); - } - - @Test(groups = { "beanLifecycle", "deploymentType" }, expectedExceptions = UnsatisfiedDependencyException.class) - @SpecAssertion(section = "2.5.6", id = "a") - public void testBeanWithDisabledDeploymentTypeNotInstantiated() - { - getCurrentManager().getInstanceByType(RedSnapper.class); - } - - @Test(groups = { "stub", "webbeansxml", "deploymentType" }, expectedExceptions = DeploymentException.class) - @SpecAssertion(section = "2.5.4", id = "b") - public void testMultipleDeployElementsCannotBeDefined() - { - assert false; - } - - @Test(groups = { "deploymentType" }) - @SpecAssertions( { @SpecAssertion(section = "2.5.5", id = "c"), - @SpecAssertion(section = "2.7.2", id = "da"), - @SpecAssertion(section = "4.1", id = "d") }) - public void testWebBeanDeploymentTypeOverridesStereotype() - { - assert getCurrentManager().resolveByType(Reindeer.class).size() == 1; - Bean<Reindeer> bean = getCurrentManager().resolveByType(Reindeer.class).iterator().next(); - assert bean.getDeploymentType().equals(Production.class); - } - - @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "4.1", id = "c") - public void testDeploymentTypeDeclaredInheritedIsInherited() throws Exception - { - assert getCurrentManager().resolveByType(BorderCollie.class).size() == 1; - assert getCurrentManager().resolveByType(BorderCollie.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); - } - - @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "4.1", id = "c") - public void testDeploymentTypeNotDeclaredInheritedIsNotInherited() - { - assert getCurrentManager().resolveByType(ShetlandPony.class).size() == 1; - assert getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class); - } - - @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "4.1", id = "c") - public void testDeploymentTypeDeclaredInheritedIsBlockedByIntermediateDeploymentTypeNotMarkedInherited() - { - assert getCurrentManager().resolveByType(GoldenRetriever.class).size() == 1; - assert getCurrentManager().resolveByType(GoldenRetriever.class).iterator().next().getDeploymentType().equals(Production.class); - } - - @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "4.1", id = "c") - public void testDeploymentTypeDeclaredInheritedIsBlockedByIntermediateDeploymentTypeMarkedInherited() - { - assert getCurrentManager().resolveByType(GoldenLabrador.class).size() == 1; - assert getCurrentManager().resolveByType(GoldenLabrador.class).iterator().next().getDeploymentType().equals(InheritedDeploymentType.class); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DisabledDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DisabledDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DisabledDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface DisabledDeploymentType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Dog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Dog.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Dog.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - - -@AnotherDeploymentType -class Dog -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/FishStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/FishStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.ApplicationScoped; - -(a)Stereotype(requiredTypes=Animal.class) -@Target( { TYPE }) -@Retention(RUNTIME) -@ApplicationScoped -@Named -@interface FishStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/GoldenLabrador.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/GoldenLabrador.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/GoldenLabrador.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -class GoldenLabrador extends Labrador -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/GoldenRetriever.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/GoldenRetriever.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/GoldenRetriever.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -class GoldenRetriever extends Retriever -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/HornedAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/HornedAnimalDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/HornedAnimalDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface HornedAnimalDeploymentType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/HornedMammalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/HornedMammalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.annotation.Stereotype; - -(a)Stereotype(requiredTypes=Animal.class) -@Target( { TYPE }) -@Retention(RUNTIME) -@HornedAnimalDeploymentType -@interface HornedMammalStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Horse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Horse.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Horse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - - -@NotInheritedDeploymentType -class Horse -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/InheritedDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/InheritedDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/InheritedDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@Inherited -@interface InheritedDeploymentType -{ - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Labrador.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Labrador.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Labrador.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - - -@InheritedDeploymentType -class Labrador extends Dog -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/MammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/MammalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/MammalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.annotation.Stereotype; - -(a)Stereotype(requiredTypes=Animal.class) -@Target( { TYPE }) -@Retention(RUNTIME) -@AnotherDeploymentType -@interface MammalStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/NotInheritedDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/NotInheritedDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/NotInheritedDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface NotInheritedDeploymentType -{ - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/RedSnapper.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/RedSnapper.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -import javax.context.RequestScoped; - -@FishStereotype -@RequestScoped -@DisabledDeploymentType -class RedSnapper implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Reindeer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Reindeer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Reindeer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -import javax.inject.Production; - -@HornedMammalStereotype -@Production -class Reindeer implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Retriever.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Retriever.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Retriever.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -@NotInheritedDeploymentType -class Retriever extends Dog -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Rhinoceros.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Rhinoceros.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Rhinoceros.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -@HornedMammalStereotype -@MammalStereotype -class Rhinoceros implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/ShetlandPony.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/ShetlandPony.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/ShetlandPony.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -class ShetlandPony extends Horse -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Spider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Spider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - - -class Spider implements Animal -{ - - public final void layEggs() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/SpiderProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/SpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -import javax.annotation.Named; -import javax.inject.Produces; - -@AnotherDeploymentType -class SpiderProducer -{ - - @Produces @Named("blackWidow") public BlackWidow produceBlackWidow() - { - return new BlackWidow(); - } - - - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Tarantula.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/Tarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -class Tarantula -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,31 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment.broken; - -import javax.inject.DeploymentException; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - */ -@Artifact -(a)BeansXml(&quot;beans.xml&quot;) -(a)ExpectedDeploymentException(DeploymentException.class) -public class BrokenDeploymentTypeTest extends AbstractDeclarativeTest -{ - - @SuppressWarnings("unchecked") - @Test - @SpecAssertion(section="2.5.6", id = "c") - public void testStandardMustBeDeclared() - { - assert false; - } - - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -interface Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnimalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,23 +0,0 @@ -package org.jboss.jsr299.tck.unit.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.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.annotation.Stereotype; -import javax.context.RequestScoped; - -import org.jboss.jsr299.tck.unit.definition.scope.Animal; - -(a)Stereotype(requiredTypes=Animal.class) -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@RequestScoped -@interface AnimalStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnotherScope.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnotherScope.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnotherScope.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.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.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.context.ScopeType; - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@ScopeType -@interface AnotherScope -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnotherScopeType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnotherScopeType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnotherScopeType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.context.ScopeType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@ScopeType -@interface AnotherScopeType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/BorderCollie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/BorderCollie.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/BorderCollie.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -class BorderCollie extends Dog -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Dog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Dog.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Dog.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -import javax.context.RequestScoped; - -@RequestScoped -class Dog -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/FishStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/FishStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.ApplicationScoped; - -(a)Stereotype(requiredTypes=Animal.class) -@Target( { TYPE }) -@Retention(RUNTIME) -@ApplicationScoped -@Named -@interface FishStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/GoldenLabrador.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/GoldenLabrador.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/GoldenLabrador.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -class GoldenLabrador extends Labrador -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/GoldenRetriever.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/GoldenRetriever.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/GoldenRetriever.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -class GoldenRetriever extends Retriever -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Grayling.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Grayling.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Grayling.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -@RiverFishStereotype -@FishStereotype -class Grayling implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Horse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Horse.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Horse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - - -@AnotherScope -class Horse -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Labrador.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Labrador.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Labrador.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - - -@NotInheritedScope -class Labrador extends Dog -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Minnow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Minnow.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Minnow.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -import javax.context.RequestScoped; - -@RiverFishStereotype -@RequestScoped -class Minnow implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Mullet.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Mullet.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Mullet.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -@AnotherScopeType -class Mullet -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/NotInheritedScope.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/NotInheritedScope.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/NotInheritedScope.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.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.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.context.ScopeType; - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@ScopeType -@interface NotInheritedScope -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Order.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Order.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -import javax.inject.Production; - -@Production -class Order -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Pollock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Pollock.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Pollock.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -import javax.context.Dependent; - -@AnimalStereotype -@FishStereotype -@Dependent -class Pollock implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/RedSnapper.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/RedSnapper.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -import javax.context.RequestScoped; - -@FishStereotype -@RequestScoped -class RedSnapper implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Retriever.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Retriever.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Retriever.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -import javax.context.ApplicationScoped; - -@ApplicationScoped -class Retriever extends Dog -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/RiverFishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/RiverFishStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/RiverFishStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.annotation.Stereotype; -import javax.context.ApplicationScoped; - -(a)Stereotype(requiredTypes=Animal.class) -@Target( { TYPE }) -@Retention(RUNTIME) -@ApplicationScoped -@interface RiverFishStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,135 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -import javax.context.ApplicationScoped; -import javax.context.Dependent; -import javax.context.RequestScoped; -import javax.inject.manager.Bean; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -@Artifact -public class ScopeDefinitionTest extends AbstractDeclarativeTest -{ - - @Test @SpecAssertion(section="2.4", id = "c") - public void testScopeTypesAreExtensible() - { - assert getCurrentManager().resolveByType(Mullet.class).size() == 1; - Bean<Mullet> bean = getCurrentManager().resolveByType(Mullet.class).iterator().next(); - assert bean.getScopeType().equals(AnotherScopeType.class); - } - - @Test(groups={"stub", "annotationDefinition"}) - @SpecAssertion(section="2.4.2", id = "aa") - public void testScopeTypeHasCorrectTarget() - { - assert false; - } - - @Test(groups={"stub", "annotationDefinition"}) - @SpecAssertion(section="2.4.2", id = "b") - public void testScopeTypeDeclaresScopeTypeAnnotation() - { - assert false; - } - - @Test @SpecAssertion(section="2.4.3", id = "a") - public void testScopeDeclaredInJava() - { - assert getCurrentManager().resolveByType(SeaBass.class).size() == 1; - Bean<SeaBass> bean = getCurrentManager().resolveByType(SeaBass.class).iterator().next(); - assert bean.getScopeType().equals(RequestScoped.class); - } - - @Test(groups={"stub", "webbeansxml"}) - @SpecAssertion(section="2.4.4", id = "a") - public void testScopeDeclaredInXml() - { - assert false; - } - - @Test @SpecAssertion(section="2.4.5", id = "a") - public void testDefaultScope() - { - assert getCurrentManager().resolveByType(Order.class).size() == 1; - Bean<Order> bean = getCurrentManager().resolveByType(Order.class).iterator().next(); - assert bean.getScopeType().equals(Dependent.class); - } - - @Test - @SpecAssertions({ - @SpecAssertion(section = "2.4.5", id = "e"), - @SpecAssertion(section = "2.7.2", id = "a") - }) - public void testScopeSpecifiedAndStereotyped() - { - assert getCurrentManager().resolveByType(Minnow.class).size() == 1; - Bean<Minnow> bean = getCurrentManager().resolveByType(Minnow.class).iterator().next(); - assert bean.getScopeType().equals(RequestScoped.class); - } - - @Test @SpecAssertion(section="2.4.5", id = "d") - public void testMutipleIncompatibleScopeStereotypesWithScopeSpecified() - { - assert getCurrentManager().resolveByType(Pollock.class).size() == 1; - Bean<Pollock> bean = getCurrentManager().resolveByType(Pollock.class).iterator().next(); - assert bean.getScopeType().equals(Dependent.class); - } - - @Test @SpecAssertion(section="2.4.5", id = "c") - public void testMutipleCompatibleScopeStereotypes() - { - assert getCurrentManager().resolveByType(Grayling.class).size() == 1; - Bean<Grayling> bean = getCurrentManager().resolveByType(Grayling.class).iterator().next(); - assert bean.getScopeType().equals(ApplicationScoped.class); - } - - @Test - @SpecAssertions({ - @SpecAssertion(section = "2.7.2", id = "db"), - @SpecAssertion(section = "4.1", id = "h") - }) - public void testWebBeanScopeTypeOverridesStereotype() - { - assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1; - Bean<RedSnapper> bean = getCurrentManager().resolveByType(RedSnapper.class).iterator().next(); - assert bean.getScopeType().equals(RequestScoped.class); - } - - @Test @SpecAssertion(section="4.1", id = "b") - public void testScopeTypeDeclaredInheritedIsInherited() throws Exception - { - assert getCurrentManager().resolveByType(BorderCollie.class).size() == 1; - assert getCurrentManager().resolveByType(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class); - } - - @Test @SpecAssertion(section="4.1", id = "b") - public void testScopeTypeNotDeclaredInheritedIsNotInherited() - { - assert getCurrentManager().resolveByType(ShetlandPony.class).size() == 1; - assert getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getScopeType().equals(Dependent.class); - } - - @Test @SpecAssertion(section="4.1", id = "b") - public void testScopeTypeDeclaredInheritedIsBlockedByIntermediateScopeTypeMarkedInherited() - { - assert getCurrentManager().resolveByType(GoldenRetriever.class).size() == 1; - } - - @Test @SpecAssertion(section="4.1", id = "b") - public void testScopeTypeDeclaredInheritedIsBlockedByIntermediateScopeTypeNotMarkedInherited() - { - assert getCurrentManager().resolveByType(GoldenLabrador.class).size() == 1; - assert getCurrentManager().resolveByType(GoldenLabrador.class).iterator().next().getScopeType().equals(Dependent.class); - } - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/SeaBass.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/SeaBass.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -import javax.context.RequestScoped; -import javax.inject.Production; - -@Production -@RequestScoped -class SeaBass implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ShetlandPony.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ShetlandPony.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ShetlandPony.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.scope; - -class ShetlandPony extends Horse -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -interface Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/AnimalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/AnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,23 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.annotation.Stereotype; -import javax.context.RequestScoped; - -(a)Stereotype(requiredTypes=Animal.class) -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@RequestScoped -@Inherited -@interface AnimalStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface AnotherDeploymentType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/AnotherStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/AnotherStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/AnotherStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.annotation.Stereotype; - -@Stereotype -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@AnotherDeploymentType -@interface AnotherStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.annotation.Stereotype; -import javax.context.ApplicationScoped; - -@ApplicationScoped -(a)Stereotype(supportedScopes=ApplicationScoped.class) -@Target( { TYPE }) -@Retention(RUNTIME) -@HornedAnimalDeploymentType -@interface ApplicationScopedHornedMammalStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/BorderCollie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/BorderCollie.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/BorderCollie.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -class BorderCollie extends LongHairedDog -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Goldfish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Goldfish.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Goldfish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -import javax.context.RequestScoped; - -@RequestScopedAnimalStereotype -@RequestScoped -class Goldfish implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/HighlandCow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/HighlandCow.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/HighlandCow.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -import javax.context.RequestScoped; - -@HornedMammalStereotype -@RequestScopedAnimalStereotype -@RequestScoped -@Tame -class HighlandCow implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/HornedAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/HornedAnimalDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/HornedAnimalDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface HornedAnimalDeploymentType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/HornedMammalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/HornedMammalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.annotation.Stereotype; - -(a)Stereotype(requiredTypes=Animal.class) -@Target( { TYPE }) -@Retention(RUNTIME) -@HornedAnimalDeploymentType -@interface HornedMammalStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Horse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Horse.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Horse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -@AnotherStereotype -class Horse -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/LongHairedDog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/LongHairedDog.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/LongHairedDog.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -@AnimalStereotype -class LongHairedDog implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Moose.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Moose.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Moose.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -@AnimalStereotype -class Moose implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Reindeer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Reindeer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Reindeer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -@HornedMammalStereotype -class Reindeer implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/RequestScopedAnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/RequestScopedAnimalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/RequestScopedAnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.annotation.Stereotype; -import javax.context.RequestScoped; - -(a)Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class) -@Target( { TYPE }) -@Retention(RUNTIME) -@interface RequestScopedAnimalStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/ShetlandPony.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/ShetlandPony.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/ShetlandPony.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -class ShetlandPony extends Horse -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Springbok.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Springbok.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Springbok.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -import javax.context.ApplicationScoped; - -@ApplicationScopedHornedMammalStereotype -@RequestScopedAnimalStereotype -@ApplicationScoped -class Springbok implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,167 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -import java.lang.annotation.Annotation; - -import javax.context.ApplicationScoped; -import javax.context.Dependent; -import javax.context.RequestScoped; -import javax.inject.AnnotationLiteral; -import javax.inject.Production; -import javax.inject.manager.Bean; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -@Artifact -(a)BeansXml(&quot;beans.xml&quot;) -public class StereotypeDefinitionTest extends AbstractDeclarativeTest -{ - - private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; - - /** - * TODO Difficult to test since all user defined stereotypes are not known - * here - * - * PLM - agreed, as the spec doesn't say what exception to throw. Probably this won't be tested - */ - @Test(groups = { "stub", "annotationDefinition" }) - @SpecAssertion(section = "2.7.1", id = "aa") - public void testHasCorrectTarget() - { - assert false; - } - - /** - * TODO If the stereotype does not have a stereotype annotation, then it - * isn't one and is difficult to test - * - * PLM - just test that a stereotype which doesn't have the annotation isn't used as such - */ - @Test(groups = { "stub", "annotationDefinition" }) - @SpecAssertion(section = "2.7.1", id = "b") - public void testHasStereotypeAnnotation() - { - assert false; - } - - @Test - @SpecAssertions({ - @SpecAssertion(section = "2.7.1.1", id = "a"), - @SpecAssertion(section = "2.4.3", id = "c") - }) - public void testStereotypeWithScopeType() - { - assert getCurrentManager().resolveByType(Moose.class).size() == 1; - assert getCurrentManager().resolveByType(Moose.class).iterator().next().getScopeType().equals(RequestScoped.class); - } - - @Test - @SpecAssertions({ - @SpecAssertion(section = "2.7.1.1", id = "a"), - @SpecAssertion(section="2.4.5", id = "b") - }) - public void testStereotypeWithoutScopeType() - { - assert getCurrentManager().resolveByType(Reindeer.class).size() == 1; - assert getCurrentManager().resolveByType(Reindeer.class).iterator().next().getScopeType().equals(Dependent.class); - } - - @Test( groups = "stub" ) - @SpecAssertion(section = "2.7.1.2", id = "a") - public void testStereotypeWithoutInterceptors() - { - assert false; - } - - @Test(groups = { "stub", "interceptors" }) - @SpecAssertion(section = "2.7.1.2", id = "b") - public void testStereotypeWithInterceptors() - { - assert false; - } - - @Test - @SpecAssertions({ - @SpecAssertion(section = "2.7.2", id = "e"), - @SpecAssertion(section = "2.7.4", id = "c"), - @SpecAssertion(section = "2.7", id = "d") - }) - public void testMultipleStereotypes() - { - assert getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).size() == 1; - Bean<HighlandCow> highlandCow = getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).iterator().next(); - assert highlandCow.getName() == null; - assert highlandCow.getBindings().iterator().next().annotationType().equals(Tame.class); - assert highlandCow.getScopeType().equals(RequestScoped.class); - assert highlandCow.getDeploymentType().equals(HornedAnimalDeploymentType.class); - } - - @Test - @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), - @SpecAssertion(section = "2.7.4", id = "c") }) - public void testMultipleStereotypesMergesScopes() - { - assert getCurrentManager().resolveByType(Springbok.class).size() == 1; - assert getCurrentManager().resolveByType(Springbok.class).iterator().next().getScopeType().equals(ApplicationScoped.class); - } - - @Test(groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "2.7.3", id = "a") - public void testStereotypeDeclaredInXmlIgnoresJavaStereotypes() - { - assert false; - } - - @Test(groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "2.7.3", id = "a") - public void testStereotypeDeclaredInXmlIgnoresJavaBindingTypes() - { - assert false; - - } - - @Test - @SpecAssertions( { @SpecAssertion(section = "2.7.1.4", id = "b"), - @SpecAssertion(section = "2.7.4", id = "a") }) - public void testRequiredTypeIsImplemented() - { - assert getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).iterator().next().getTypes().contains(Animal.class); - } - - @Test - @SpecAssertions( { @SpecAssertion(section = "2.7.1.4", id = "a"), - @SpecAssertion(section = "2.7.4", id = "b") }) - public void testScopeIsSupported() - { - assert getCurrentManager().resolveByType(Goldfish.class).size() == 1; - assert getCurrentManager().resolveByType(Goldfish.class).iterator().next().getScopeType().equals(RequestScoped.class); - } - - @Test - @SpecAssertion(section = "4.1", id = "a") - public void testStereotypeDeclaredInheritedIsInherited() throws Exception - { - assert getCurrentManager().resolveByType(BorderCollie.class).size() == 1; - assert getCurrentManager().resolveByType(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class); - } - - @Test - @SpecAssertion(section = "4.1", id = "a") - public void testStereotypeNotDeclaredInheritedIsNotInherited() - { - assert getCurrentManager().resolveByType(ShetlandPony.class).size() == 1; - assert getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.stereotype; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Tame -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnimalStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnimalStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.annotation.Stereotype; -import javax.context.RequestScoped; - -@Stereotype() -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@RequestScoped -@interface AnimalStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnimalStereotypeAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnimalStereotypeAnnotationLiteral.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnimalStereotypeAnnotationLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.inject.AnnotationLiteral; - -class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface AnotherDeploymentType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BananaSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BananaSpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BananaSpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,24 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import java.util.Set; - -import javax.event.Observer; -import javax.event.Observes; -import javax.inject.Current; -import javax.inject.manager.Manager; - -/** - * Simple bean with observer method and another injectable parameter. - * - */ -class BananaSpider -{ - public void observeStringEvent(@Observes String someEvent, @Current Manager manager) - { - assert someEvent != null; - assert manager != null; - Set<Observer<String>> allStringObservers = manager.resolveObservers(someEvent); - assert allStringObservers != null; - assert allStringObservers.size() > 0; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BullTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BullTerrier.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BullTerrier.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.event.Observes; - -class BullTerrier -{ - public void observesBadEvent(@Observes @Role("Admin") @Tame MultiBindingType someEvent) - { - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ConditionalEvent.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ConditionalEvent.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ConditionalEvent.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -class ConditionalEvent -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Delivery.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Delivery.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Delivery.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -class Delivery -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EJBEvent.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EJBEvent.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EJBEvent.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -class EJBEvent -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Egg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Egg.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Egg.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -class Egg -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,768 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.Set; - -import javax.context.Dependent; -import javax.event.Event; -import javax.event.Observer; -import javax.inject.DuplicateBindingTypeException; -import javax.inject.Standard; -import javax.inject.manager.Bean; -import javax.inject.manager.Manager; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; -import org.testng.annotations.Test; - -/** - * Event bus tests - * - * @author Nicklas Karlsson - * @author David Allen - * - * Spec version: Public Release Draft 2 - */ -@Artifact -(a)BeansXml(&quot;beans.xml&quot;) -public class EventTest extends AbstractDeclarativeTest -{ - - public static class AnEventType - { - } - - public static class ATemplatedEventType<T> - { - } - - public static class AnObserver implements Observer<AnEventType> - { - public boolean wasNotified = false; - - public void notify(AnEventType event) - { - wasNotified = true; - } - } - - public static class AListObserver implements Observer<ArrayList<String>> - { - public boolean wasNotified = false; - - public void notify(ArrayList<String> event) - { - wasNotified = true; - } - } - - public static class AnotherListObserver implements Observer<ArrayList<Integer>> - { - public boolean wasNotified = false; - - public void notify(ArrayList<Integer> event) - { - wasNotified = true; - } - } - - public static class AnObserverWithException implements Observer<AnEventType> - { - public boolean wasNotified = false; - public RuntimeException theException = new RuntimeException("RE1"); - - public void notify(AnEventType event) - { - wasNotified = true; - throw theException; - } - } - - /** - * An event binding type is a Java annotation defined as @Target({FIELD, - * PARAMETER}) ~or @Target({METHOD, FIELD, PARAMETER, TYPE}) and - * - * @Retention(RUNTIME)~ - */ - @Test(groups = { "events", "stub" }) - @SpecAssertions( { @SpecAssertion(section = "7.1", id = "d") }) - public void testEventBindingTypeTargetMostAndRuntime() - { - - } - - /** - * An event binding type is a Java annotation defined as ~@Target({FIELD, - * PARAMETER}) or~ @Target({METHOD, FIELD, PARAMETER, TYPE}) ~and - * - * @Retention(RUNTIME)~ - */ - @Test(groups = { "events", "stub" }) - @SpecAssertions( { @SpecAssertion(section = "7.1", id = "e") }) - public void testEventBindingTypeTargetsFieldParameterAndRuntime() - { - - } - - /** - * An event binding type is a Java annotation defined as ~@Target({FIELD, - * PARAMETER}) or @Target({METHOD, FIELD, PARAMETER, TYPE}) and - * ~@Retention(RUNTIME) TODO If the binding does not have RUNTIME retention, - * it cannot be tested - */ - @Test(groups = { "events", "broken" }) - @SpecAssertions( { @SpecAssertion(section = "7.1", id = "f") }) - public void testEventBindingTypeNotRuntime() - { - - } - - // TODO How to test all annotations w/o BindingType are not event bindings - @Test(groups = { "events", "broken" }) - @SpecAssertions( { @SpecAssertion(section = "7.1", id = "g") }) - public void testEventBindingTypesSpecifyBinding() - { - - } - - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertions( { @SpecAssertion(section = "7.1", id = "a"), @SpecAssertion(section = "7.2", id = "b") }) - public void testManagerFireEventWithEventTypeParametersFails() - { - ATemplatedEventType<String> anEvent = new ATemplatedEventType<String>(); - getCurrentManager().fireEvent(anEvent); - } - - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertions( { @SpecAssertion(section = "7.1", id = "b"), @SpecAssertion(section = "7.2", id = "c") }) - public void testManagerFireEventWithEventTypeWildcardsFails() - { - // Although the above test is really the same as with a wildcard, - // we will test it anyhow since the specification calls it out separately. - ATemplatedEventType<?> anEventOnAnyType = new ATemplatedEventType<String>(); - getCurrentManager().fireEvent(anEventOnAnyType); - } - - @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.2", id = "a") }) - public void testManagerInterfaceForFireEventMethod() throws Exception - { - assert Manager.class.getDeclaredMethod("fireEvent", Object.class, Annotation[].class) != null; - } - - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertions( { @SpecAssertion(section = "7.2", id = "d") }) - public void testManagerFireEventWithNonBindingAnnotationsFails() - { - // The specs are not exactly clear on what is supposed to happen here, - // but borrowing from Section 8.3, we'll expect the same behavior here - // for a consistent API. - // TODO Verify that fireEvent should fail on non-binding annotations - AnEventType anEvent = new AnEventType(); - getCurrentManager().fireEvent(anEvent, new AnimalStereotypeAnnotationLiteral()); - } - - /** - * The Manager interface provides a method for firing events: - */ - @Test(groups = { "events" }) - @SpecAssertion(section = "7.2", id = "a") - public void testManagerFireEvent() - { - // First a simple event with no bindings is fired - AnEventType anEvent = new AnEventType(); - getCurrentManager().fireEvent(anEvent); - - // Next an event with some event bindings is fired - getCurrentManager().fireEvent(anEvent, new RoleBinding("Admin")); - } - - // TODO This is not an assertion but a definition which is circular - @Test(groups = { "events" }) - @SpecAssertion(section = "7.3", id = "a") - public void testObserversImplementObserverInterface() - { - Observer<String> observer = new Observer<String>() - { - public void notify(String event) - { - } - }; - assert observer != null; - } - - @Test(groups = { "events", "broken" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertions( { @SpecAssertion(section = "7.3", id = "f") }) - public void testManagerAddObserverWithEventTypeParametersFails() - { - assert false; - // ATemplatedEventType<String> anEvent = new - // ATemplatedEventType<String>(); - // Observer<AnEventType> observer = new AnObserver(); - // getCurrentManager().addObserver(observer, anEvent.getClass()); - } - - @Test(groups = { "events", "broken" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertions( { @SpecAssertion(section = "7.3", id = "g") }) - public void testManagerAddObserverWithEventTypeWildcardsFails() - { - // Although the above test is really the same as with a wildcard, - // we will test it anyhow since the specification calls it out separately. - ATemplatedEventType<?> anEventOnAnyType = new ATemplatedEventType<String>(); - assert false; - } - - @Test(groups = { "events", "broken" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertions( { @SpecAssertion(section = "7.3", id = "h") }) - public void testManagerRemoveObserverWithEventTypeParametersFails() - { - assert false; - // ATemplatedEventType<String> anEvent = new - // ATemplatedEventType<String>(); - // Observer<AnEventType> observer = new AnObserver(); - // getCurrentManager().addObserver(observer, anEvent.getClass()); - } - - @Test(groups = { "events", "stub" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertions( { @SpecAssertion(section = "7.3", id = "i") }) - public void testManagerRemoveObserverWithEventTypeWildcardsFails() - { - // Although the above test is really the same as with a wildcard, - // we will test it anyhow since the specification calls it out separately. - ATemplatedEventType<?> anEventOnAnyType = new ATemplatedEventType<String>(); - assert false; - } - - @Test(groups = { "events", "stub" }) - @SpecAssertions( { @SpecAssertion(section = "7.4", id = "a") }) - public void testObserverNotificationCallsResolveObservers() - { - assert false; - } - - @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.5", id = "a"), @SpecAssertion(section = "7.5.2", id = "a")} ) - public void testObserverMethodAutomaticallyRegistered() - { - assert !getCurrentManager().resolveObservers("event").isEmpty(); - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.5", id = "e") - public void testMultipleObserverMethodsForSameEventOK() - { - assert getCurrentManager().resolveObservers("event").size() > 1; - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.5", id = "f") - public void testMultipleObserverMethodsOnBeanOK() - { - // Resolve the observers for types 1 and 2 - Set<Observer<ObservedType1>> resolvedStringObservers = getCurrentManager().resolveObservers(new ObservedType1()); - assert resolvedStringObservers.size() == 1; - - Set<Observer<ObservedType2>> resolvedIntegerObservers = getCurrentManager().resolveObservers(new ObservedType2()); - assert resolvedIntegerObservers.size() == 1; - } - - @Test(groups = { "events", "ejb" }) - @SpecAssertion(section = "7.5", id = "d") - public void testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic() - { - Set<Observer<EJBEvent>> observers = getCurrentManager().resolveObservers(new EJBEvent()); - assert observers.size() == 2; - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.5.1", id = "b") - public void testObserverMethodWithoutBindingTypesObservesEventsWithoutBindingTypes() - { - // Resolve registered observers with an event containing no binding types - Set<Observer<SimpleEventType>> resolvedObservers = getCurrentManager().resolveObservers(new SimpleEventType()); - assert resolvedObservers.size() == 2; - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.5.2", id = "g") - public void testObserverMethodMayHaveMultipleBindingTypes() - { - Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class); - assert beans != null; - // If we can resolve the observer with the two binding types, - // then it worked - Set<Observer<MultiBindingType>> resolvedObservers = getCurrentManager().resolveObservers(new MultiBindingType(), new RoleBinding("Admin"), new TameAnnotationLiteral()); - assert resolvedObservers.size() == 1; - - } - - @Test(groups = { "stub", "events", "webbeansxml" }) - @SpecAssertions( { @SpecAssertion(section = "7.5.3", id = "a"), @SpecAssertion(section = "7.5.3", id = "b") } ) - public void testXMLDefinedObserverMethodIgnoresBindingAnnotations() - { - assert false; - } - - @Test(groups = { "stub", "events", "webbeansxml" }) - @SpecAssertion(section = "7.5.3", id = "c") - public void testXMLDefinedObserverNotFindingImplementationMethodFails() - { - assert false; - } - - /** - * In addition to the event parameter, observer methods may declare - * additional parameters, which may declare bindings. The container calls the - * method Manager.getInstanceToInject() defined in Section 5.7.1, "Resolving - * dependencies" to determine a value for each parameter of an observer - * method and calls the observer method with those parameter values. - * - * To invoke an observer method, the container must pass the event object to - * the event parameter and the object returned by - * Manager.getInstanceToInject() to each of the other parameters. - */ - @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.5.4", id = "a"), @SpecAssertion(section = "7.5.8", id = "j") }) - public void testObserverMethodReceivesInjectionsOnNonObservesParameters() - { - Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class); - assert beans != null; - } - - // TODO This test was working well in January 2009 but no longer creates the - // observer - @Test(groups = { "events", "broken" }) - @SpecAssertions( { @SpecAssertion(section = "7.5.5", id = "a"), @SpecAssertion(section = "7.5.5", id = "b")} ) - public void testConditionalObserver() throws Exception - { - RecluseSpider.notified = false; - getCurrentManager().fireEvent(new ConditionalEvent()); - // Should not be notified since bean is not instantiated yet - assert !RecluseSpider.notified; - - // Now instantiate the bean and fire another event - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - RecluseSpider bean = getCurrentManager().getInstanceByType(RecluseSpider.class); - assert bean != null; - - getCurrentManager().fireEvent(new ConditionalEvent()); - assert RecluseSpider.notified; - } - - }.run(); - } - - @Test(groups = { "events", "stub" }) - @SpecAssertions( { @SpecAssertion(section = "7.5.5", id = "c") } ) - public void testConditionalObserverDefinedByXML() - { - assert false; - } - - @Test(groups = { "stub", "events" }) - @SpecAssertion(section = "7.5.7", id = "a") - public void testAsynchronousObserverIsAsynchronous() - { - assert false; - } - - @Test(groups = { "stub", "events", "webbeansxml" }) - @SpecAssertion(section = "7.5.7", id = "b") - public void testAsynchronousObserverDeclaredByXML() - { - assert false; - } - - @Test(groups = { "stub", "events" }) - @SpecAssertion(section = "7.5.7", id = "c") - public void testAsynchronousObserverAlsoTransactional() - { - assert false; - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.5.8", id = "a") - public void testObserverMethodRegistration() - { - // Resolve registered observers with an event containing no binding types - Set<Observer<SimpleEventType>> resolvedObservers = getCurrentManager().resolveObservers(new SimpleEventType()); - assert resolvedObservers.size() == 2; - } - - @Test(groups = { "stub", "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.5.8", id = "c"), @SpecAssertion(section = "7.5.8", id = "g")} ) - public void testAsynchronousObserverMethodCalledAsynchronously() - { - assert false; - } - - @Test(groups = { "stub", "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.5.8", id = "b"), @SpecAssertion(section = "7.5.8", id = "h")} ) - public void testObserverMethodCalledImmediately() - { - - assert false; - } - - @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.5", id = "c"), @SpecAssertion(section = "7.5.8", id = "k")} ) - public void testStaticObserverMethodInvoked() - { - getCurrentManager().fireEvent(new Delivery()); - assert StaticObserver.isDeliveryReceived(); - } - - /** - * Otherwise, if the observer method is non-static, the container must: - * - * • obtain the Bean object for the most specialized bean that specializes - * the bean which declares the observer method, and then - * - */ - @Test(groups = { "events" }) - @SpecAssertion(section = "7.5.8", id = "l") - public void testObserverCalledOnMostSpecializedInstance() - { - Shop.deliveryObservedBy = null; - getCurrentManager().fireEvent(new Delivery()); - assert Shop.deliveryObservedBy.equals(FarmShop.class.getName()); - } - - /** - * obtain the context object by calling Manager.getContext(), passing the - * bean scope, then - */ - @Test(groups = { "stub", "events" }) - @SpecAssertion(section = "7.5.8", id = "m") - public void testObserverContextRetrieved() - { - assert false; - } - - /** - * obtain an instance of the bean by calling Context.get(), passing the Bean - * instance representing the bean, together with a CreationalContext unless - * this observer method is a conditional observer method, and then - */ - @Test(groups = { "stub", "events" }) - @SpecAssertion(section = "7.5.8", id = "n") - public void testObserverInstanceRetrievedFromContext() - { - assert false; - } - - /** - * if the get() method returned a non-null value, invoke the observer method - * on the returned instance - */ - @Test(groups = { "stub", "events" }) - @SpecAssertion(section = "7.5.8", id = "o") - public void testObserverMethodInvokedOnReturnedInstanceFromContext() - { - assert false; - } - - @Test(groups = { "stub", "events" }) - @SpecAssertion(section = "7.5.8", id = "p") - public void testAsynchronousObserverThrowsExceptionIsLogged() - { - assert false; - } - - @Test(groups = { "stub", "events" }) - @SpecAssertion(section = "7.5.9", id = "a") - public void testAsynchronousObserverMethodContexts() - { - assert false; - } - - @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class }) - @SpecAssertion(section = "7.6", id = "g") - public void testDuplicateBindingsToFireFails() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - SweeWaxbill bean = getCurrentManager().getInstanceByType(SweeWaxbill.class); - bean.methodThatFiresEvent(); - } - - }.run(); - } - - @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class }) - @SpecAssertion(section = "7.6", id = "g") - public void testDuplicateBindingsToObservesFails() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - SweeWaxbill bean = getCurrentManager().getInstanceByType(SweeWaxbill.class); - bean.methodThatRegistersObserver(); - } - - }.run(); - } - - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "7.6", id = "h") - public void testNonBindingTypePassedToFireFails() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - OwlFinch_Broken bean = getCurrentManager().getInstanceByType(OwlFinch_Broken.class); - bean.methodThatFiresEvent(); - } - - }.run(); - } - - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "7.6", id = "h") - public void testNonBindingTypePassedToObservesFails() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - OwlFinch_Broken bean = getCurrentManager().getInstanceByType(OwlFinch_Broken.class); - bean.methodThatRegistersObserver(); - } - - }.run(); - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.6", id = "n") - public void testImplicitEventBeanMatchesAPITypeOfInectionPoint() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - // Retrieve the implicit event bean from the manager only by - // its API type - Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding()); - assert !eventBeans.isEmpty(); - } - - }.run(); - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.6", id = "n") - public void testImplicitEventBeanMatchesBindingAnnotationsOfInjectionPoint() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - // Retrieve the implicit event bean from the manager - // by its binding types (uses OrangeCheekedWaxbill) - Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding(), new TameAnnotationLiteral(), new RoleBinding("Admin")); - assert !eventBeans.isEmpty(); - } - - }.run(); - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.6", id = "o") - public void testImplicitEventBeanHasStandardDeploymentType() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - // Retrieve the implicit event bean from the manager - // only by its API type (uses BlueFacedParrotFinch) - Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding()); - assert eventBeans.size() == 1; - Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); - assert eventBean.getDeploymentType().equals(Standard.class); - } - - }.run(); - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.6", id = "p") - public void testImplicitEventBeanHasDependentScope() throws Exception - { - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - // Retrieve the implicit event bean from the manager only - // by its API type (uses BlueFacedParrotFinch) - Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding()); - assert eventBeans.size() == 1; - Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); - assert eventBean.getScopeType().equals(Dependent.class); - } - }.run(); - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.6", id = "q") - public void testImplicitEventBeanHasNoName() throws Exception - { - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - // Retrieve the implicit event bean from the manager only - // by its API type (uses BlueFacedParrotFinch) - Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding()); - assert eventBeans.size() == 1; - Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); - assert eventBean.getName() == null; - } - }.run(); - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.6", id = "r") - public void testImplicitEventBeanProvidedByContainer() throws Exception - { - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - // Retrieve the implicit event bean from the manager only - // by its API type (uses BlueFacedParrotFinch) - Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding()); - assert eventBeans.size() == 1; - } - }.run(); - } - - // TODO The manager related tests require intercepting all calls - // to it to verify that the correct calls are made. - @Test(groups = { "events", "underInvestigation" }) - @SpecAssertion(section = "7.6", id = "s") - public void testFireMethodCallsManagerFireWithEventObject() - { - assert false; - } - - @Test(groups = { "events", "underInvestigation" }) - @SpecAssertion(section = "7.6", id = "s") - public void testFireMethodCallsManagerFireWithBindingAnnotationsExceptFires() - { - assert false; - } - - @Test(groups = { "events", "underInvestigation" }) - @SpecAssertion(section = "7.6", id = "s") - public void testFireMethodCallsManagerFireWithAllBindingAnnotationInstances() - { - assert false; - } - - @Test(groups = { "events", "underInvestigation" }) - @SpecAssertions( { @SpecAssertion(section = "7.5.8", id = "s"), @SpecAssertion(section = "7.6", id = "u")} ) - public void testObserverMethodCallsManagerAddObserverWithObserverObject() - { - assert false; - } - - @Test(groups = { "events", "underInvestigation" }) - @SpecAssertion(section = "7.6", id = "u") - public void testObserverMethodCallsManagerAddObserverWithAllBindingAnnotationsExceptFires() - { - assert false; - } - - @Test(groups = { "events", "underInvestigation" }) - @SpecAssertion(section = "7.6", id = "u") - public void testObserverMethodCallsManagerAddObserverWithAllBindingAnnotationInstance() - { - assert false; - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.7", id = "b") - public void testEventObjectContainsTypeVariablesWhenResolvingFails() - { - eventObjectContainsTypeVariables(new ArrayList<String>()); - } - - private <E> void eventObjectContainsTypeVariables(ArrayList<E> eventToFire) - { - getCurrentManager().resolveObservers(eventToFire); - } - - @Test(groups = { "broken", "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "7.7", id = "c") - public void testEventObjectContainsWildcardsWhenResolvingFails() - { - eventObjectContainsWildcards(new ArrayList<String>()); - } - - private void eventObjectContainsWildcards(ArrayList<?> eventToFire) - { - // TODO There does not seem to be a way to get wildcarded types passed - getCurrentManager().resolveObservers(eventToFire); - } - - /** - * By default, Java implementation reuse is assumed. In this case, the - * producer, disposal and observer methods of the first bean are not - * inherited by the second bean. - * - * @throws Exception - */ - @Test(groups = { "events", "inheritance" }) - @SpecAssertion(section = "4", id = "a") - public void testNonStaticObserverMethodNotInherited() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - Set<Observer<Egg>> observers = getCurrentManager().resolveObservers(new Egg()); - assert observers.size() == 1; - - // Notify the observer so we can confirm that it - // is a method only on Farmer, and not LazyFarmer - observers.iterator().next().notify(new Egg()); - assert Farmer.getObserverClazz().equals(Farmer.class); - } - - }.run(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FarmShop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FarmShop.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FarmShop.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.inject.Specializes; - -@Specializes @AnotherDeploymentType -class FarmShop extends Shop -{ - - @Override - public String getClassName() - { - return FarmShop.class.getName(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Farmer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Farmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.event.Observes; - -class Farmer -{ - private static Class<?> observerClazz; - - public void observeEggLaying(@Observes Egg egg) - { - observerClazz = this.getClass(); - } - - public static Class<?> getObserverClazz() - { - return observerClazz; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FiresBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FiresBinding.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FiresBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.event.Fires; -import javax.inject.AnnotationLiteral; - -public class FiresBinding extends AnnotationLiteral<Fires> implements Fires -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/LazyFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/LazyFarmer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/LazyFarmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - - -class LazyFarmer extends Farmer -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/MultiBindingType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/MultiBindingType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/MultiBindingType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -class MultiBindingType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType1.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType1.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType1.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -class ObservedType1 -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType2.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType2.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType2.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -class ObservedType2 -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.event.Event; -import javax.event.Fires; - - -class OrangeCheekedWaxbill -{ - @Fires @Role("Admin") @Tame - protected Event<String> simpleEvent; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OwlFinch_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OwlFinch_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OwlFinch_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,27 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.event.Event; -import javax.event.Fires; -import javax.event.Observer; - - -class OwlFinch_Broken -{ - @Fires - private Event<String> simpleEvent; - - public void methodThatFiresEvent() - { - simpleEvent.fire("An event", new AnimalStereotypeAnnotationLiteral()); - } - - public void methodThatRegistersObserver() - { - simpleEvent.observe(new Observer<String>() - { - public void notify(String event) - { - } - }, new AnimalStereotypeAnnotationLiteral()); - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Pomeranian.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Pomeranian.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Pomeranian.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.annotation.Named; -import javax.event.Observes; - -@Named("Teddy") -class Pomeranian -{ - public static Thread notificationThread; - - public void observeSimpleEvent(@Observes SimpleEventType someEvent) - { - notificationThread = Thread.currentThread(); - } - - public static void staticallyObserveEvent(@Observes SimpleEventType someEvent) - { - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/PomeranianInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/PomeranianInterface.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/PomeranianInterface.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.ejb.Local; -import javax.event.Observes; - -@Local -public interface PomeranianInterface -{ - public void observeSimpleEvent(@Observes EJBEvent someEvent); -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/RecluseSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/RecluseSpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/RecluseSpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.event.IfExists; -import javax.event.Observes; - -/** - * Simple web bean that conditionally listens to events. - * - */ -class RecluseSpider -{ - public static boolean notified = false; - - public void observe(@Observes @IfExists ConditionalEvent someEvent) - { - notified = true; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Role.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Role.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Role.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { FIELD, PARAMETER }) -@Retention(RUNTIME) -@BindingType -@interface Role -{ - String value(); -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/RoleBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/RoleBinding.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/RoleBinding.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.inject.AnnotationLiteral; - - -class RoleBinding extends AnnotationLiteral<Role> implements Role -{ - private String value = null; - - public RoleBinding(String value) - { - this.value = value; - } - - public String value() - { - return value; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Shop.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Shop.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.event.Observes; - -class Shop -{ - - public static String deliveryObservedBy = null; - - public String getClassName() - { - return Shop.class.getName(); - } - - public void observeDelivery(@Observes Delivery delivery) - { - deliveryObservedBy = getClassName(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SimpleEventType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SimpleEventType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SimpleEventType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -class SimpleEventType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Spitz.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Spitz.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Spitz.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.annotation.Named; -import javax.ejb.Stateful; -import javax.event.Observes; - -@Stateful -@Tame -@Named("Teddy") -public class Spitz implements PomeranianInterface -{ - public void observeSimpleEvent(@Observes EJBEvent someEvent) - { - } - - public static void staticallyObserveEvent(@Observes EJBEvent someEvent) - { - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StaticObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StaticObserver.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StaticObserver.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,23 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.event.Observes; - -class StaticObserver -{ - private static boolean deliveryReceived = false; - - public static void accept(@Observes Delivery delivery) - { - setDeliveryReceived(true); - } - - public static boolean isDeliveryReceived() - { - return deliveryReceived; - } - - public static void setDeliveryReceived(boolean deliveryReceived) - { - StaticObserver.deliveryReceived = deliveryReceived; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StringObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StringObserver.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StringObserver.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.event.Observes; - -class StringObserver -{ - public void anotherObserver(@Observes String event) - { - - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SweeWaxbill.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SweeWaxbill.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SweeWaxbill.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,28 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.event.Event; -import javax.event.Fires; -import javax.event.Observer; - - -class SweeWaxbill -{ - @Fires @Role("Admin") - private Event<String> simpleEvent; - - public void methodThatFiresEvent() - { - simpleEvent.fire("An event", new RoleBinding("Admin")); - } - - public void methodThatRegistersObserver() - { - simpleEvent.observe(new Observer<String>() - { - - public void notify(String event) - { - } - }, new RoleBinding("Admin")); - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Tame -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TameAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TameAnnotationLiteral.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TameAnnotationLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.inject.AnnotationLiteral; - -class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TeaCupPomeranian.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TeaCupPomeranian.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TeaCupPomeranian.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,30 +0,0 @@ -package org.jboss.jsr299.tck.unit.event; - -import javax.annotation.Named; -import javax.event.Observes; - -@Tame -@Named("Teddy") -class TeaCupPomeranian -{ - public static class OversizedException extends RuntimeException - { - private static final long serialVersionUID = 1L; - - } - - public static class TooSmallException extends Exception - { - private static final long serialVersionUID = 1L; - } - - public void observeSimpleEvent(@Observes ObservedType1 someEvent) - { - throw new OversizedException(); - } - - public void observeAnotherSimpleEvent(@Observes ObservedType2 someEvent) throws TooSmallException - { - throw new TooSmallException(); - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,120 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.definition; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; -import org.testng.annotations.Test; - -/** - * @author Nicklas Karlsson - * - * Spec version: PRD2 - */ -@Artifact -(a)Packaging(PackagingType.EAR) -public class EnterpriseBeanDefinitionTest extends AbstractDeclarativeTest -{ - @Test(groups = { "enterpriseBeans" }) - @SpecAssertion(section = "3.3", id = "b") - public void testStatelessWithDependentScopeOK() - { - assert getCurrentManager().resolveByType(GiraffeLocal.class).size() == 1; - } - - @Test(groups = { "enterpriseBeans" }) - @SpecAssertion(section = "3.3", id = "c") - public void testSingletonWithDependentScopeOK() - { - assert getCurrentManager().resolveByType(Labrador.class).size() == 1; - } - - @Test(groups = { "enterpriseBeans" }) - @SpecAssertion(section = "3.3", id = "c") - public void testSingletonWithApplicationScopeOK() - { - assert getCurrentManager().resolveByType(Laika.class).size() == 1; - } - - @Test(groups = { "webbeansxml", "enterpriseBeans", "stub" }) - @SpecAssertion(section = "3.3", id = "e") - public void testMultipleXMLDefinedEnterpriseBeansWithSameImplementationClassNotOK() - { - assert false; - } - - @Test(groups = { "enterpriseBeans", "stub" }) - @SpecAssertion(section = "3.3.2", id = "a") - public void testAnnotatedEnterpriseBean() - { - // TODO: dupe? - assert false; - } - - @Test(groups = { "enterpriseBeans", "webbeansxml", "stub" }) - @SpecAssertion(section = "3.3.2", id = "a") - public void testAnnotatedEnterpriseBeanComplementedWithXML() - { - // TODO dupe? - assert false; - } - - @Test(groups = { "enterpriseBeans", "ejbjarxml", "stub" }) - @SpecAssertion(section = "3.3.2", id = "b") - public void testEJBJARDefinedEnterpriseBean() - { - // TODO dupe? - assert false; - } - - @Test(groups = { "enterpriseBeans", "ejbjarxml", "webbeansxml", "stub" }) - @SpecAssertion(section = "3.3.2", id = "b") - public void testEJBJARDefinedEnterpriseBeanComplementedWithXML() - { - // TODO dupe? - assert false; - } - - @Test(groups = { "enterpriseBeans", "stub" }) - @SpecAssertion(section = "3.3.3", id = "a") - public void testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces() - { - assert false; - } - - @Test(groups = { "enterpriseBeans", "stub" }) - @SpecAssertion(section = "3.3.3", id = "b") - public void testEnterpriseBeanWithLocalViewAndParameterizedTypeIncludesBeanClassAndSuperclassesInBeanTypes() - { - assert false; - } - - @Test(groups = "enterpriseBeans") - @SpecAssertions({ - @SpecAssertion(section = "3.3.3", id = "c"), - @SpecAssertion(section = "2.2", id = "l") - }) - public void testObjectIsInAPITypes() - { - assert getCurrentManager().resolveByType(GiraffeLocal.class).size() == 1; - assert getCurrentManager().resolveByType(GiraffeLocal.class).iterator().next().getTypes().contains(Object.class); - } - - @Test(groups = { "enterpriseBeans", "stub" }) - @SpecAssertion(section = "3.3.3", id = "d") - public void testRemoteInterfacesAreNotInAPITypes() - { - assert false; - } - - @Test(groups = "enterpriseBeans") - @SpecAssertion(section = "3.3.8", id = "a") - public void testDefaultName() - { - assert getCurrentManager().resolveByType(PitbullLocal.class).size() == 1; - assert getCurrentManager().resolveByType(PitbullLocal.class).iterator().next().getName().equals("pitbull"); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Giraffe.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Giraffe.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Giraffe.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.definition; - -import javax.ejb.Stateless; - -@Stateless -class Giraffe implements GiraffeLocal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/GiraffeLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/GiraffeLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/GiraffeLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.definition; - -public interface GiraffeLocal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Labrador.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Labrador.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Labrador.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.definition; - -import javax.context.Dependent; -import javax.ejb.Singleton; - -@Singleton -@Dependent -class Labrador -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Laika.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Laika.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Laika.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.definition; - -import javax.context.ApplicationScoped; -import javax.ejb.Remove; -import javax.ejb.Singleton; - -@Singleton -@ApplicationScoped -class Laika -{ - - @Remove - public void remove() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Pitbull.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Pitbull.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Pitbull.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.definition; - -import javax.annotation.Named; -import javax.context.ApplicationScoped; -import javax.ejb.Remove; -import javax.ejb.Stateful; - -@Stateful -@ApplicationScoped -@Named -class Pitbull implements PitbullLocal -{ - - public static boolean destructorCalled = false; - - @Remove - public void bye() - { - destructorCalled = true; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/PitbullLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/PitbullLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/PitbullLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise.definition; - -public interface PitbullLocal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,25 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer; - -import javax.ejb.Stateless; -import javax.inject.Initializer; - -@Stateless -public class AndalusianChicken implements LocalChicken -{ - - public static boolean nonBusinessMethodCalled = false; - - public void firstBusinessMethod() - { - } - - @Initializer - public void nonBusinessMethod() - { - nonBusinessMethodCalled = true; - } - - public void cluck() - { - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Chicken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Chicken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer; - -import javax.inject.Production; - -@Production -class Chicken -{ - - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/ChickenHutch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/ChickenHutch.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/ChickenHutch.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,23 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer; - -import javax.inject.Initializer; - -class ChickenHutch -{ - - public Fox fox; - public Chicken chicken; - - @Initializer - public void setFox(Fox fox) - { - this.fox = fox; - } - - @Initializer - public void setChicken(Chicken chicken) - { - this.chicken = chicken; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/EjbInitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/EjbInitializerMethodTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/EjbInitializerMethodTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,30 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; -import org.testng.annotations.Test; - -@Artifact -(a)Packaging(PackagingType.EAR) -@IntegrationTest -public class EjbInitializerMethodTest extends AbstractDeclarativeTest -{ - - @Test(groups = { "initializerMethod", "ejb3" }) - @SpecAssertions({ - @SpecAssertion(section = "3.9", id = "e"), - @SpecAssertion(section = "3.9", id = "c") - }) - public void testInitializerMethodNotABusinessMethod() - { - AndalusianChicken.nonBusinessMethodCalled = false; - getCurrentManager().getInstanceByType(LocalChicken.class).cluck(); - assert AndalusianChicken.nonBusinessMethodCalled = true; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Fox.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Fox.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer; - -import javax.context.Dependent; - -@Dependent -class Fox -{ - - public String getName() - { - return "gavin"; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,99 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer; - -import javax.inject.DefinitionException; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - */ -@Artifact -(a)Packaging(PackagingType.EAR) -public class InitializerMethodTest extends AbstractDeclarativeTest -{ - - @Test(groups = { "stub", "initializerMethod", "servlet", "integration" }) - @SpecAssertion(section = "3.9", id = "d") - public void testInitializerMethodCalledOnServlet() - { - assert false; - } - - @Test(groups = { "stub", "initializerMethod", "ejb3", "integration" }) - @SpecAssertion(section = "3.9", id = "d") - public void testInitializerMethodCalledOnEJBSessionBean() - { - assert false; - } - - @Test(groups = { "stub", "initializerMethod", "ejb3", "integration" }) - @SpecAssertion(section = "3.9", id = "d") - public void testInitializerMethodCalledOnEJBMDB() - { - assert false; - } - - @Test(groups = { "stub", "initializerMethod", "ejb3", "singletons", "integration" }) - @SpecAssertion(section = "3.9", id = "d") - public void testInitializerMethodCalledOnEJBSingleton() - { - assert false; - } - - @Test(groups = { "stub", "initializerMethod", "interceptors" }) - @SpecAssertion(section = "3.9", id = "f") - public void testMethodInterceptorNotCalledOnInitializerMethod() - { - assert false; - } - - @Test(groups = { "initializerMethod" }) - @SpecAssertions({ - @SpecAssertion(section = "3.9", id = "g"), - @SpecAssertion(section = "5.3", id = "b"), - @SpecAssertion(section = "3.9.1", id = "a"), - @SpecAssertion(section = "3.9.3", id = "a") - }) - public void testMultipleInitializerMethodsAreCalled() - { - ChickenHutch chickenHutch = getCurrentManager().getInstanceByType(ChickenHutch.class); - assert chickenHutch.fox != null; - assert chickenHutch.chicken != null; - } - - @Test(groups = { "stub", "initializerMethod", "webbeansxml" }) - @SpecAssertion(section = "3.9.2", id = "a") - public void testInitializerMethodDeclaredInXml() - { - assert false; - } - - @Test(groups = { "stub", "initializerMethod", "webbeansxml" }) - @SpecAssertion(section = "3.9.2", id = "b") - public void testInitializerMethodDeclaredInXmlIgnoresBindingAnnotationsInJava() - { - assert false; - } - - @Test(groups = { "stub", "initializerMethod", "webbeansxml" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.9.2", id = "c") - public void testInitializerMethodDeclaredInXmlDoesNotExist() - { - assert false; - } - - @Test(groups = { "stub", "initializerMethod", "webbeansxml" }) - @SpecAssertion(section = "3.9", id = "g") - public void testBeanHasAllInitializerMethodsDeclaredInJavaAndXml() - { - assert false; - } - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer; - -import javax.ejb.Local; - -@Local -public interface LocalChicken -{ - public void firstBusinessMethod(); - - public void cluck(); -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -interface Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface AnotherDeploymentType -{ - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AsAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AsAnimal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AsAnimal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface AsAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidow.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidow.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -class BlackWidow extends Spider implements DeadlySpider -{ - public void bite() - { - // Test method used for proxy instances to force - // creation of the instance. - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidowProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidowProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidowProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import javax.annotation.Named; -import javax.inject.Produces; - -public class BlackWidowProducer -{ - public static BlackWidow blackWidow = new BlackWidow(); - @Produces - @Named("blackWidow") - public BlackWidow produceBlackWidow = blackWidow; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Chicken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Chicken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import javax.inject.Produces; - - -class Chicken -{ - - @Produces @Foo - private Egg egg = new Egg(this); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DaddyLongLegs.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DaddyLongLegs.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DaddyLongLegs.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - - -class DaddyLongLegs extends Spider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlyAnimal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlyAnimal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -interface DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlySpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlySpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -interface DeadlySpider extends DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DefangedTarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DefangedTarantula.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DefangedTarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - - -class DefangedTarantula extends Tarantula -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Egg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Egg.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Egg.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -class Egg -{ - - private final Chicken mother; - - public Egg(Chicken mother) - { - super(); - this.mother = mother; - } - - public Chicken getMother() - { - return mother; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Foo.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Foo.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Foo.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Foo -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaver.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaver.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -class FunnelWeaver<T> -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import javax.inject.Current; - -class FunnelWeaverSpiderConsumer -{ - @Current - private FunnelWeaver<Spider> injectedSpider; - - public FunnelWeaver<Spider> getInjectedSpider() - { - return injectedSpider; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import javax.inject.Produces; - -class FunnelWeaverSpiderProducer -{ - private static FunnelWeaver<Spider> spider; - @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider = new FunnelWeaver<Spider>(); - - public FunnelWeaverSpiderProducer() - { - spider = this.getFunnelWeaverSpider; - } - - public static FunnelWeaver<Spider> getSpider() - { - return spider; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/InfertileChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/InfertileChicken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/InfertileChicken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - - -@AnotherDeploymentType -class InfertileChicken extends Chicken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/LadybirdSpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/LadybirdSpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import javax.context.ApplicationScoped; - -@ApplicationScoped -class LadybirdSpider extends Spider -{ - - public void spinWeb() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/OtherSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/OtherSpiderProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/OtherSpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import javax.annotation.Named; -import javax.inject.Produces; - -@AnotherDeploymentType -class OtherSpiderProducer -{ - - public static final Tarantula TARANTULA = new Tarantula(); - public static final BlackWidow BLACK_WIDOW = new BlackWidow(); - - @Produces @Tame public Tarantula produceTarantula = TARANTULA; - - @Produces @Tame private BlackWidow produceBlackWidow = BLACK_WIDOW; - - private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; - @Produces public Spider[] getSpiders = ALL_SPIDERS; - - @Produces @Named("SpiderSize") public int getWolfSpiderSize = 4; -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,222 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import java.lang.annotation.Annotation; -import java.util.Set; - -import javax.context.RequestScoped; -import javax.inject.AnnotationLiteral; -import javax.inject.Production; -import javax.inject.manager.Bean; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; -import org.jboss.jsr299.tck.literals.CurrentBinding; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -@Artifact -(a)BeansXml(&quot;beans.xml&quot;) -public class ProducerFieldDefinitionTest extends AbstractDeclarativeTest -{ - - private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; - private static final Annotation FOO_LITERAL = new AnnotationLiteral<Foo>() {}; - private static final Annotation STATIC_LITERAL = new AnnotationLiteral<Static>() {}; - - @Test(groups = { "producerField" }) - @SpecAssertion(section = "2.5.3", id = "h") - public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception - { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); - assert tarantulaBeans.size() == 1; - assert tarantulaBeans.iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); - } - - @Test(groups = "producerField") - @SpecAssertion(section = "3.5", id = "f") - public void testParameterizedReturnType() throws Exception - { - new RunInDependentContext() - { - public void execute() - { - FunnelWeaverSpiderConsumer spiderConsumer = getCurrentManager().getInstanceByType(FunnelWeaverSpiderConsumer.class); - assert spiderConsumer != null; - assert spiderConsumer.getInjectedSpider() != null; - assert spiderConsumer.getInjectedSpider().equals(FunnelWeaverSpiderProducer.getSpider()); - } - }.run(); - } - - @Test(groups = { "producerField", "deployment" }) - @SpecAssertions({ - @SpecAssertion(section = "3.5", id = "j"), - @SpecAssertion(section = "3.5", id = "c"), - @SpecAssertion(section = "3.5.2", id ="a") - }) - public void testBeanDeclaresMultipleProducerFields() - { - assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).size() == 1; - assert getCurrentManager().getInstanceByType(Tarantula.class, TAME_LITERAL).equals(OtherSpiderProducer.TARANTULA) ; - assert getCurrentManager().resolveByType(BlackWidow.class, TAME_LITERAL).size() == 1; - assert getCurrentManager().getInstanceByType(BlackWidow.class, TAME_LITERAL).equals(OtherSpiderProducer.BLACK_WIDOW) ; - } - - @Test(groups = "producerField") - @SpecAssertions({ - @SpecAssertion(section = "2.3.1", id = "a") - }) - public void testDefaultBindingType() - { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); - assert tarantulaBeans.size() == 1; - assert tarantulaBeans.iterator().next().getBindings().contains(new CurrentBinding()); - } - - @Test(groups = "producerField") - @SpecAssertion(section = "3.5.1", id = "c") - public void testApiTypeForClassReturn() - { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); - assert tarantulaBeans.size() == 1; - Bean<Tarantula> tarantulaBean = tarantulaBeans.iterator().next(); - assert tarantulaBean.getTypes().size() == 6; - assert tarantulaBean.getTypes().contains(Tarantula.class); - assert tarantulaBean.getTypes().contains(DeadlySpider.class); - assert tarantulaBean.getTypes().contains(Spider.class); - assert tarantulaBean.getTypes().contains(Animal.class); - assert tarantulaBean.getTypes().contains(DeadlyAnimal.class); - assert tarantulaBean.getTypes().contains(Object.class); - } - - @Test(groups = { "producerField" }) - @SpecAssertion(section = "3.5.1", id = "a") - public void testApiTypeForInterfaceReturn() - { - Set<Bean<Animal>> animalBeans = getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<AsAnimal>() {}); - assert animalBeans.size() == 1; - Bean<Animal> animalModel = animalBeans.iterator().next(); - assert animalModel.getTypes().size() == 2; - assert animalModel.getTypes().contains(Animal.class); - assert animalModel.getTypes().contains(Object.class); - } - - @Test(groups = { "producerField" }) - @SpecAssertion(section = "3.5.1", id = "b") - public void testApiTypeForPrimitiveReturn() - { - Set<Bean<?>> beans = getCurrentManager().resolveByName("SpiderSize"); - assert beans.size() == 1; - Bean<?> intModel = beans.iterator().next(); - assert intModel.getTypes().size() == 2; - assert intModel.getTypes().contains(int.class); - assert intModel.getTypes().contains(Object.class); - } - - @Test(groups = { "producerField" }) - @SpecAssertions({ - @SpecAssertion(section = "3.5.1", id = "b"), - @SpecAssertion(section = "2.2", id = "j") - }) - public void testApiTypeForArrayTypeReturn() - { - Set<Bean<Spider[]>> spidersBeans = getCurrentManager().resolveByType(Spider[].class); - assert spidersBeans.size() == 1; - Bean<Spider[]> spidersModel = spidersBeans.iterator().next(); - assert spidersModel.getTypes().size() == 2; - assert spidersModel.getTypes().contains(Spider[].class); - assert spidersModel.getTypes().contains(Object.class); - } - - @Test(groups = "producerField") - @SpecAssertions({ - @SpecAssertion(section = "3.5.2", id = "f"), - @SpecAssertion(section="2.3.3", id="c") - }) - public void testBindingType() - { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, new TameAnnotationLiteral()); - assert tarantulaBeans.size() == 1; - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getBindings().size() == 1; - assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class); - } - - @Test(groups = "producerField") - @SpecAssertion(section = "3.5.2", id = "b") - public void testScopeType() - { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL, FOO_LITERAL); - assert !tarantulaBeans.isEmpty(); - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getScopeType().equals(RequestScoped.class); - } - - @Test(groups = "producerField") - @SpecAssertion(section = "3.5.2", id = "d") - public void testDeploymentType() - { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL, FOO_LITERAL); - assert !tarantulaBeans.isEmpty(); - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getDeploymentType().equals(Production.class); - } - - @Test(groups = "producerField") - @SpecAssertions({ - @SpecAssertion(section = "3.5.2", id = "c"), - @SpecAssertion(section="2.6.1", id = "d") - }) - public void testNamedField() - { - Set<Bean<?>> beans = getCurrentManager().resolveByName("blackWidow"); - assert beans.size() == 1; - - @SuppressWarnings("unchecked") - Bean<BlackWidow> blackWidowModel = (Bean<BlackWidow>) beans.iterator().next(); - assert blackWidowModel.getName().equals("blackWidow"); - } - - @Test(groups = { "producerField" }) - @SpecAssertions({ - @SpecAssertion(section = "2.6.3", id = "b"), - @SpecAssertion(section = "3.5.4", id = "a"), - @SpecAssertion(section = "2.6.1", id = "d") - }) - public void testDefaultNamedField() - { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, STATIC_LITERAL); - assert tarantulaBeans.size() == 1; - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getName().equals("produceTarantula"); - } - - // review 2.2 - @Test(groups = "producerField") - @SpecAssertions({ - @SpecAssertion(section = "2.7.2", id = "c"), - @SpecAssertion(section = "3.5.2", id = "e") - }) - public void testStereotype() - { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, STATIC_LITERAL); - assert !tarantulaBeans.isEmpty(); - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getScopeType().equals(RequestScoped.class); - assert tarantulaModel.getDeploymentType().equals(Production.class); - } - - @Test(groups = "producerField") - @SpecAssertion(section = "4.2", id = "k") - public void testNonStaticProducerFieldNotInherited() - { - assert !(getCurrentManager().getInstanceByType(Egg.class, FOO_LITERAL).getMother() instanceof InfertileChicken); - } -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Spider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Spider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -class Spider implements Animal -{ - - private static final long serialVersionUID = 1L; - - public void layEggs() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderAsAnimalProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderAsAnimalProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderAsAnimalProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import javax.inject.Produces; - - -@AnotherDeploymentType -class SpiderAsAnimalProducer -{ - @Produces @AsAnimal - public Animal makeASpider = new WolfSpider(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderStereotype.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderStereotype.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,49 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; -import javax.inject.Production; - -/** - * Test stereotype used to change the scope type and deployment type - * of another bean, in particular a producer field bean. - * - * @author David Allen - * - */ -(a)Stereotype(requiredTypes=Spider.class) -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@RequestScoped -@Named -@Production -@interface SpiderStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Static.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Static.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Static.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Static -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/StaticTarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/StaticTarantulaProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/StaticTarantulaProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,28 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import javax.inject.Produces; - - -@AnotherDeploymentType -class StaticTarantulaProducer -{ - @Produces @SpiderStereotype @Static public static Tarantula produceTarantula = new Tarantula(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Tame -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameAnnotationLiteral.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameAnnotationLiteral.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import javax.inject.AnnotationLiteral; - -class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameTarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameTarantulaProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameTarantulaProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import javax.context.RequestScoped; -import javax.inject.Produces; -import javax.inject.Production; - - -@AnotherDeploymentType -class TameTarantulaProducer -{ - @Produces @Foo @Tame @RequestScoped @Production public Tarantula produceTarantula = new DefangedTarantula(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tarantula.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tarantula.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -class Tarantula extends Spider implements DeadlySpider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaConsumer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaConsumer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import javax.inject.Current; - -/** - * This bean contains an injection point for a Tarantula that must be provided - * by the container via a (static) producer field. - * - * @author David Allen - * - */ -class TarantulaConsumer -{ - @Current - private Tarantula consumedTarantula; - - public Tarantula getConsumedTarantula() - { - return consumedTarantula; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - -import javax.inject.Produces; - -@AnotherDeploymentType -class TarantulaProducer -{ - @Produces public Tarantula produceTarantula = new Tarantula(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/WolfSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/WolfSpider.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/WolfSpider.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; - - -class WolfSpider implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ClovenHoved.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ClovenHoved.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ClovenHoved.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface ClovenHoved -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Cow_NotBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Cow_NotBean.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Cow_NotBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import javax.inject.Production; - -@Production -abstract class Cow_NotBean -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Donkey.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Donkey.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Donkey.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import javax.inject.Production; - -@Production -class Donkey -{ - - public static boolean constructedCorrectly = false; - - public Donkey() - { - constructedCorrectly = true; - } - - public Donkey(String foo) - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockEnterpriseBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockEnterpriseBean.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockEnterpriseBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import javax.ejb.EnterpriseBean; - -class MockEnterpriseBean implements EnterpriseBean -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockFilter.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockFilter.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockFilter.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,30 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import java.io.IOException; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - -class MockFilter implements Filter -{ - - public void destroy() - { - - } - - public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain arg2) throws IOException, ServletException - { - - } - - public void init(FilterConfig arg0) throws ServletException - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockHttpSessionListener.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockHttpSessionListener.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockHttpSessionListener.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import javax.servlet.http.HttpSessionEvent; - -class MockHttpSessionListener implements javax.servlet.http.HttpSessionListener -{ - - public void sessionCreated(HttpSessionEvent arg0) - { - - } - - public void sessionDestroyed(HttpSessionEvent arg0) - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServlet.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServlet.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServlet.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,39 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import java.io.IOException; - -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - -class MockServlet implements Servlet -{ - - public void destroy() - { - - } - - public ServletConfig getServletConfig() - { - return null; - } - - public String getServletInfo() - { - return null; - } - - public void init(ServletConfig arg0) throws ServletException - { - - } - - public void service(ServletRequest arg0, ServletResponse arg1) throws ServletException, IOException - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletContextListener.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletContextListener.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletContextListener.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - -class MockServletContextListener implements ServletContextListener -{ - - public void contextDestroyed(ServletContextEvent arg0) - { - - } - - public void contextInitialized(ServletContextEvent arg0) - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletRequestListener.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletRequestListener.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletRequestListener.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import javax.servlet.ServletRequestEvent; -import javax.servlet.ServletRequestListener; - -class MockServletRequestListener implements ServletRequestListener -{ - - public void requestDestroyed(ServletRequestEvent arg0) - { - - } - - public void requestInitialized(ServletRequestEvent arg0) - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockUIComponent.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockUIComponent.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockUIComponent.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,255 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import java.io.IOException; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.el.ValueBinding; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.FacesEvent; -import javax.faces.event.FacesListener; -import javax.faces.render.Renderer; - -class MockUIComponent extends UIComponent -{ - - @Override - protected void addFacesListener(FacesListener arg0) - { - - } - - @Override - public void broadcast(FacesEvent arg0) throws AbortProcessingException - { - - } - - @Override - public void decode(FacesContext arg0) - { - - } - - @Override - public void encodeBegin(FacesContext arg0) throws IOException - { - - } - - @Override - public void encodeChildren(FacesContext arg0) throws IOException - { - - } - - @Override - public void encodeEnd(FacesContext arg0) throws IOException - { - - } - - @Override - public UIComponent findComponent(String arg0) - { - return null; - } - - @Override - public Map<String, Object> getAttributes() - { - return null; - } - - @Override - public int getChildCount() - { - return 0; - } - - @Override - public List<UIComponent> getChildren() - { - return null; - } - - @Override - public String getClientId(FacesContext arg0) - { - return null; - } - - @Override - protected FacesContext getFacesContext() - { - return null; - } - - @Override - protected FacesListener[] getFacesListeners(Class arg0) - { - return null; - } - - @Override - public UIComponent getFacet(String arg0) - { - return null; - } - - @Override - public Map<String, UIComponent> getFacets() - { - return null; - } - - @Override - public Iterator<UIComponent> getFacetsAndChildren() - { - return null; - } - - @Override - public String getFamily() - { - return null; - } - - @Override - public String getId() - { - return null; - } - - @Override - public UIComponent getParent() - { - return null; - } - - @Override - protected Renderer getRenderer(FacesContext arg0) - { - return null; - } - - @Override - public String getRendererType() - { - return null; - } - - @Override - public boolean getRendersChildren() - { - return false; - } - - @Override - public ValueBinding getValueBinding(String arg0) - { - return null; - } - - @Override - public boolean isRendered() - { - return false; - } - - @Override - public void processDecodes(FacesContext arg0) - { - - } - - @Override - public void processRestoreState(FacesContext arg0, Object arg1) - { - - } - - @Override - public Object processSaveState(FacesContext arg0) - { - return null; - } - - @Override - public void processUpdates(FacesContext arg0) - { - - } - - @Override - public void processValidators(FacesContext arg0) - { - - } - - @Override - public void queueEvent(FacesEvent arg0) - { - - } - - @Override - protected void removeFacesListener(FacesListener arg0) - { - - } - - @Override - public void setId(String arg0) - { - - } - - @Override - public void setParent(UIComponent arg0) - { - - } - - @Override - public void setRendered(boolean arg0) - { - - } - - @Override - public void setRendererType(String arg0) - { - - } - - @Override - public void setValueBinding(String arg0, ValueBinding arg1) - { - - } - - public boolean isTransient() - { - return false; - } - - public void restoreState(FacesContext arg0, Object arg1) - { - - } - - public Object saveState(FacesContext arg0) - { - return null; - } - - public void setTransient(boolean arg0) - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Order.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Order.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import javax.inject.Production; - -@Production -class Order -{ - - public static boolean constructed = true; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/OuterClass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/OuterClass.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/OuterClass.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,24 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import javax.inject.Production; - -class OuterClass -{ - - @Production - class InnerClass_NotBeean - { - - public InnerClass_NotBeean() - { - - } - - } - - static class StaticInnerClass - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ParameterizedClass_NotBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ParameterizedClass_NotBean.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ParameterizedClass_NotBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -class ParameterizedClass_NotBean<T> -{ - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Sheep.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Sheep.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Sheep.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,27 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import javax.inject.Initializer; -import javax.inject.Produces; -import javax.inject.Production; - -@Production -class Sheep -{ - - public static boolean constructedCorrectly = false; - - @Produces @ClovenHoved - public static String foo = "foo"; - - @Produces @ClovenHoved public static Double bar = 5.5; - - @Initializer - public Sheep(@ClovenHoved String foo, @ClovenHoved Double bar) - { - if (foo.equals(Sheep.foo) && bar.equals(Sheep.bar)) - { - constructedCorrectly = true; - } - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/SimpleBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,235 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import javax.inject.DefinitionException; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.unit.implementation.simple.definition.OuterClass.InnerClass_NotBeean; -import org.jboss.jsr299.tck.unit.implementation.simple.definition.OuterClass.StaticInnerClass; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -@Artifact -public class SimpleBeanDefinitionTest extends AbstractDeclarativeTest -{ - - @Test - @SpecAssertions({ - @SpecAssertion(section = "3.2.1", id = "ca"), - @SpecAssertion(section = "3.2", id = "ca") - }) - public void testAbstractClassDeclaredInJavaNotDiscovered() - { - assert getCurrentManager().resolveByType(Cow_NotBean.class).size() == 0; - } - - @Test(groups = "innerClass") - @SpecAssertions({ - @SpecAssertion(section = "3.2.1", id = "cc"), - @SpecAssertion(section = "3.2.1", id = "ba") - }) - public void testStaticInnerClassDeclaredInJavaAllowed() - { - assert getCurrentManager().resolveByType(StaticInnerClass.class).size() == 1; - } - - @Test - @SpecAssertions({ - @SpecAssertion(section = "3.2.1", id = "b"), - @SpecAssertion(section = "3.2", id = "a") - }) - public void testNonStaticInnerClassDeclaredInJavaNotDiscovered() - { - assert getCurrentManager().resolveByType(InnerClass_NotBeean.class).size() == 0; - } - - @Test - @SpecAssertions({ - @SpecAssertion(section = "3.2.1", id = "a"), - @SpecAssertion(section = "3.2", id = "b") - }) - public void testParameterizedClassDeclaredInJavaIsNotDiscovered() - { - assert getCurrentManager().resolveByType(ParameterizedClass_NotBean.class).size() == 0; - } - - @Test - @SpecAssertions( { - @SpecAssertion(section = "3.2.1", id = "g"), - @SpecAssertion(section = "3.2.1", id = "h"), - @SpecAssertion(section = "3.2.1", id = "i"), - @SpecAssertion(section = "3.2.1", id = "j"), - @SpecAssertion(section = "3.2.1", id = "k")}) - public void testClassesImplementingServletInterfacesNotDiscoveredAsSimpleBeans() - { - assert getCurrentManager().resolveByType(MockFilter.class).size() == 0; - assert getCurrentManager().resolveByType(MockHttpSessionListener.class).size() == 0; - assert getCurrentManager().resolveByType(MockServlet.class).size() == 0; - assert getCurrentManager().resolveByType(MockServletContextListener.class).size() == 0; - assert getCurrentManager().resolveByType(MockServletRequestListener.class).size() == 0; - } - - @Test - @SpecAssertion(section="3.2.1", id="l") - public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean() - { - assert getCurrentManager().resolveByType(MockEnterpriseBean.class).size() == 0; - } - - @Test - @SpecAssertion(section="3.2.1", id="m") - public void testClassExtendingUiComponentNotDiscoveredAsSimpleBean() - { - assert getCurrentManager().resolveByType(MockUIComponent.class).size() == 0; - } - - @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "e") - public void testAbstractClassDeclaredInXmlIsNotAllowed() - { - assert false; - } - - @Test(groups = { "stub", "innerClass", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "da") - public void testStaticInnerClassDeclaredInXmlAllowed() - { - assert false; - } - - @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "innerClass", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "d") - public void testNonStaticInnerClassDeclaredInXmlNotAllowed() - { - assert false; - } - - @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "c") - public void testParameterizedClassDeclaredInXmlIsNotAllowed() - { - assert false; - } - - @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "interceptors", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "f") - public void testClassHasInterceptorInJavaMustHaveInterceptorInXml() - { - assert false; - } - - @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "interceptors", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "g") - public void testClassHasDecoratorInJavaMustHaveDecoratorInXml() - { - assert false; - } - - @Test - @SpecAssertion(section = "3.2.6.1", id = "a") - public void testInitializerAnnotatedConstructor() throws Exception - { - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - Sheep.constructedCorrectly = false; - getCurrentManager().getInstanceByType(Sheep.class); - assert Sheep.constructedCorrectly; - - } - }.run(); - - } - - @Test(groups="broken") - @SpecAssertion(section = "3.2.6.1", id = "b") - public void testImplicitConstructorUsed() - { - Order.constructed = false; - getCurrentManager().getInstanceByType(Order.class); - assert Order.constructed; - } - - @Test - @SpecAssertions({ - @SpecAssertion(section = "3.2.5", id = "a"), - @SpecAssertion(section = "3.2.6.1", id = "b"), - @SpecAssertion(section = "3.1", id = "a"), - @SpecAssertion(section = "3.2.3", id = "a") - }) - public void testEmptyConstructorUsed() - { - Donkey.constructedCorrectly = false; - getCurrentManager().getInstanceByType(Donkey.class); - assert Donkey.constructedCorrectly; - } - - @Test - @SpecAssertion(section = "3.2.6.1", id = "a") - public void testInitializerAnnotatedConstructorUsedOverEmptyConstuctor() throws Exception - { - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - getCurrentManager().getInstanceByType(Turkey.class); - assert Turkey.constructedCorrectly; - } - }.run(); - } - - @Test(groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "3.2.6.2", id = "b") - public void testImplicitConstructorDeclaredInXmlUsed() - { - assert false; - } - - @Test(groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "3.2.6.2", id = "b") - public void testEmptyConstructorDeclaredInXmlUsed() - { - assert false; - } - - @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "3.2.6.2", id = "c") - public void testConstructorDeclaredInXmlDoesNotExist() - { - assert false; - } - - @Test(groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "3.2.6.2", id = "d") - public void testConstructorDeclaredInXmlIgnoresBindingTypesDeclaredInJava() - { - assert false; - } - - @Test - @SpecAssertion(section = "3.2", id = "fa") - public void testDependentScopedBeanCanHavePublicField() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - assert getCurrentManager().getInstanceByType(Tiger.class).name.equals("pete"); - } - - }.run(); - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Tiger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Tiger.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Tiger.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import javax.context.Dependent; - -@Dependent -class Tiger -{ - - public String name = "pete"; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Turkey.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Turkey.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Turkey.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,31 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.definition; - -import javax.inject.Initializer; -import javax.inject.Produces; -import javax.inject.Production; - -@Production -class Turkey -{ - - @Produces public static String foo = "foo"; - - @Produces static Integer bar = 1; - - public static boolean constructedCorrectly = false; - - public Turkey() - { - - } - - @Initializer - public Turkey(String foo, Integer bar) - { - if (foo.equals(Turkey.foo) && bar.equals(Turkey.bar)) - { - constructedCorrectly = true; - } - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Lion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Lion.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Lion.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean; - -@Tame -class Lion -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,151 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean; - -import java.lang.annotation.Annotation; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; -import java.util.Set; - -import javax.context.Dependent; -import javax.inject.AnnotationLiteral; -import javax.inject.Current; -import javax.inject.New; -import javax.inject.Standard; -import javax.inject.manager.Bean; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.literals.NewLiteral; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -@Artifact -public class NewSimpleBeanTest extends AbstractDeclarativeTest -{ - - private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() - { - }; - - @Test(groups = { "new" }) - @SpecAssertion(section = "3.2.5", id = "d") - public void testNewBeanIsDependentScoped() - { - Set<Bean<WrappedSimpleBean>> beans = getCurrentManager().resolveByType(WrappedSimpleBean.class, new NewLiteral()); - assert beans.size() == 1; - Bean<WrappedSimpleBean> newSimpleBean = beans.iterator().next(); - assert Dependent.class.equals(newSimpleBean.getScopeType()); - } - - @Test(groups = { "new" }) - @SpecAssertion(section = "3.2.5", id = "e") - public void testNewBeanIsOfStandardDeploymentType() - { - Set<Bean<WrappedSimpleBean>> beans = getCurrentManager().resolveByType(WrappedSimpleBean.class, new NewLiteral()); - assert beans.size() == 1; - Bean<WrappedSimpleBean> newSimpleBean = beans.iterator().next(); - assert Standard.class.equals(newSimpleBean.getDeploymentType()); - } - - @Test(groups = { "new" }) - @SpecAssertion(section = "3.2.5", id = "f") - public void testNewBeanHasOnlyNewBinding() - { - Set<Bean<WrappedSimpleBean>> beans = getCurrentManager().resolveByType(WrappedSimpleBean.class, new NewLiteral()); - assert beans.size() == 1; - Bean<WrappedSimpleBean> newSimpleBean = beans.iterator().next(); - assert newSimpleBean.getBindings().size() == 1; - assert newSimpleBean.getBindings().iterator().next().annotationType().equals(new NewLiteral().annotationType()); - } - - @Test(groups = { "new" }) - @SpecAssertion(section = "3.2.5", id = "g") - public void testNewBeanHasNoWebBeanName() - { - Set<Bean<WrappedSimpleBean>> beans = getCurrentManager().resolveByType(WrappedSimpleBean.class, new NewLiteral()); - assert beans.size() == 1; - Bean<WrappedSimpleBean> newSimpleBean = beans.iterator().next(); - assert newSimpleBean.getName() == null; - } - - @Test(groups = { "stub", "new" }) - @SpecAssertion(section = "3.2.5", id = "h") - public void testNewBeanHasNoStereotypes() - { - assert false; - } - - @Test(groups = { "new", "stub" }) - @SpecAssertion(section = "3.2.5", id = "i") - public void testNewBeanHasNoObservers() - { - assert false; - } - - @Test(groups = { "new", "stub" }) - @SpecAssertion(section = "3.2.5", id = "k") - public void testNewBeanHasNoProducerFields() - { - assert false; - } - - @Test(groups = { "new", "stub" }) - @SpecAssertion(section = "3.2.5", id = "j") - public void testNewBeanHasNoProducerMethods() - { - assert false; - } - - @Test(groups = { "new", "stub" }) - @SpecAssertion(section = "3.2.5", id = "l") - public void testNewBeanHasNoDisposalMethods() - { - assert false; - } - - @Test(groups = { "stub", "new" }) - @SpecAssertion(section = "3.2.5", id = "c") - public void testNewBeanHasSameInterceptorMethodsAsWrappedBean() - { - assert false; - } - - @Test(groups = { "new" }) - @SpecAssertion(section = "review", id = "review") - public void testNewAnnotationCannotBeExplicitlyDeclared() - { - // All we can really do is make sure the annotation itself - // prevents the compiler from violating the assertion - Target target = New.class.getAnnotation(Target.class); - for (ElementType elementType : target.value()) - { - assert !elementType.equals(ElementType.TYPE); - } - } - - @Test - @SpecAssertion(section = "3.2.5", id = "a") - public void testForEachSimpleBeanANewBeanExists() - { - assert getCurrentManager().resolveByType(Order.class).size() == 1; - assert getCurrentManager().resolveByType(Order.class).iterator().next().getBindings().size() == 1; - assert getCurrentManager().resolveByType(Order.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class); - - assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).size() == 1; - assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().size() == 1; - assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); - - assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().size() == 1; - assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Tame.class); - - assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).size() == 1; - assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().size() == 1; - assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Order.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Order.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean; - -import javax.inject.Production; - -@Production -class Order -{ - - public static boolean constructed = true; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Tame.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Tame.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Tame -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/WrappedSimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/WrappedSimpleBean.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/WrappedSimpleBean.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean; - -import java.io.Serializable; - -import javax.annotation.Named; -import javax.context.SessionScoped; - -@SessionScoped -@Named("Fred") -class WrappedSimpleBean implements Serializable -{ - public WrappedSimpleBean() { - - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -interface Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface AnotherDeploymentType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Building.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Building.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Building.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Stateful; -import javax.inject.Produces; - -@Stateful -public class Building implements BuildingLocal -{ - - @Produces - public Waste getWaste() - { - return new Waste(getClassName()); - } - - public String getClassName() - { - return Building.class.getName(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Local; - -@Local -public interface BuildingLocal -{ - - String getClassName(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,63 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import java.lang.annotation.Annotation; - -import javax.inject.AnnotationLiteral; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; -import org.testng.annotations.Test; - -@Artifact -@IntegrationTest -(a)Packaging(PackagingType.EAR) -(a)BeansXml(&quot;beans.xml&quot;) -public class EnterpriseBeanSpecializationIntegrationTest extends AbstractDeclarativeTest -{ - - private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {}; - - @Test - @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "f"), - @SpecAssertion(section = "3.3.7", id = "b") - }) - public void testSpecializedBeanNotInstantiated() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - FarmerLocal farmer = getCurrentManager().getInstanceByType(FarmerLocal.class, LANDOWNER_LITERAL); - assert farmer.getClassName().equals(LazyFarmer.class.getName()); - } - - }.run(); - } - - - @Test(groups="ri-broken") - @SpecAssertion(section="4.3.1", id = "g") - public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - assert getCurrentManager().resolveByType(Waste.class).size() == 1; - assert getCurrentManager().getInstanceByType(Waste.class).getFrom().equals(Office.class.getName()); - } - - }.run(); - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,72 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches; - -import java.lang.annotation.Annotation; - -import javax.inject.AnnotationLiteral; -import javax.inject.DefinitionException; -import javax.inject.manager.Bean; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - */ -@Artifact -(a)Packaging(PackagingType.EAR) -(a)BeansXml(&quot;beans.xml&quot;) -public class EnterpriseBeanSpecializationTest extends AbstractDeclarativeTest -{ - - private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {}; - - @Test - @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "c"), - @SpecAssertion(section = "3.3.7", id = "a") - }) - public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() - { - assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1; - Bean<FarmerLocal> bean = getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next(); - assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class); - assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2; - assert annotationSetMatches( getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class); - } - - @Test - @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "d"), - @SpecAssertion(section = "3.3.7", id = "a") - }) - public void testSpecializingBeanHasNameOfSpecializedBean() - { - assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class); - assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer"); - } - - @Test(groups={"stub", "specialization"},expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.3.7", id = "a") - public void testSpecializingBeanDoesNotSupportAllLocalInterfacesOnSpecializedBean() - { - assert false; - } - - @Test(groups={"stub", "specialization"},expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.3.7", id = "a") - public void testSpecializingBeanDoesNotSupportLocalInterfaceView() - { - assert false; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmEquipment.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.annotation.Named; - - -@Named("plough") -class FarmEquipment -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Farmer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Farmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.annotation.Named; -import javax.ejb.Stateful; - - -@Landowner -@Named -@Stateful -class Farmer implements FarmerLocal -{ - - public String getClassName() - { - return Farmer.class.getName(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Local; - -@Local -public interface FarmerLocal -{ - public String getClassName(); -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Landowner.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Landowner.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Landowner -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Lazy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Lazy.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Lazy.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Lazy -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Stateful; -import javax.inject.Specializes; - - -@Specializes @Lazy -@AnotherDeploymentType -@Stateful -public class LazyFarmer extends Farmer implements LazyFarmerLocal, FarmerLocal -{ - - @Override - public String getClassName() - { - return LazyFarmer.class.getName(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmerLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmerLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmerLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Local; - -@Local -public interface LazyFarmerLocal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Office.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Office.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Office.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Stateful; -import javax.inject.Specializes; - - - -@AnotherDeploymentType -@Stateful -@Specializes -public class Office extends Building implements OfficeLocal -{ - - @Override - public String getClassName() - { - return Office.class.getName(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OfficeLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OfficeLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OfficeLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -public interface OfficeLocal -{ - - public String getClassName(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/TractorLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/TractorLocal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/TractorLocal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Local; - -@Local -public interface TractorLocal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Waste.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Waste.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Waste.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -public class Waste -{ - - private String from; - - public String getFrom() - { - return from; - } - - public Waste(String from) - { - super(); - this.from = from; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Yard.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Yard.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Yard.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.annotation.Named; -import javax.ejb.Stateful; - -@Named("backyard") -@Stateful -class Yard implements YardInterface -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/YardInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/YardInterface.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/YardInterface.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise; - -import javax.ejb.Local; - -@Local -public interface YardInterface -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface AnotherDeploymentType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Expensive.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Expensive.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Expensive -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/JewelryShop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/JewelryShop.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/JewelryShop.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -import javax.inject.Produces; -import javax.inject.Specializes; - -class JewelryShop extends Shop -{ - - @Override @Produces @Specializes @Sparkly @AnotherDeploymentType - public Product getExpensiveGift() - { - return new Necklace(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Necklace.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Necklace.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Necklace.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -class Necklace extends Product -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,70 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches; - -import java.lang.annotation.Annotation; - -import javax.inject.AnnotationLiteral; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; -import org.testng.annotations.Test; - -/** - * Spec version: PRD2 - * - */ -@Artifact -(a)BeansXml(&quot;beans.xml&quot;) -public class ProducerMethodSpecializationTest extends AbstractDeclarativeTest -{ - - private static Annotation EXPENSIVE_LITERAL = new AnnotationLiteral<Expensive>() {}; - - @Test - @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "c"), - @SpecAssertion(section = "3.4.5", id = "a") - }) - public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() - { - assert getCurrentManager().resolveByType(Product.class, EXPENSIVE_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings().size() == 2; - assert annotationSetMatches( getCurrentManager().resolveByType(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings(), Expensive.class, Sparkly.class); - } - - @Test - @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "d"), - @SpecAssertion(section = "3.4.5", id = "a") - }) - public void testSpecializingBeanHasNameOfSpecializedBean() - { - assert getCurrentManager().resolveByType(Product.class, new AnnotationLiteral<Sparkly>(){}).size() == 1; - assert getCurrentManager().resolveByType(Product.class, new AnnotationLiteral<Sparkly>(){}).iterator().next().getName().equals("expensiveGift"); - } - - @Test - @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "f"), - @SpecAssertion(section = "3.4.5", id = "a") - }) - public void testSpecializedBeanNotInstantiated() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - Product product = getCurrentManager().getInstanceByType(Product.class, EXPENSIVE_LITERAL); - assert product instanceof Necklace; - } - - }.run(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Product.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Product.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Product.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -class Product -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Shop.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Shop.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -import javax.annotation.Named; -import javax.inject.Produces; - - -class Shop -{ - - @Produces @Expensive @Named - public Product getExpensiveGift() - { - return new Product(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Sparkly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Sparkly.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Sparkly.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Sparkly -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -interface Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface AnotherDeploymentType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Building.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Building.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Building.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import javax.inject.Produces; - -class Building -{ - - protected String getClassName() - { - return Building.class.getName(); - } - - @Produces - public Waste getWaste() - { - return new Waste(getClassName()); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Egg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Egg.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Egg.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -class Egg -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Farmer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Farmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import javax.annotation.Named; - - -@Landowner -@Named -class Farmer -{ - - public String getClassName() - { - return Farmer.class.getName(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Landowner.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Landowner.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Landowner -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Lazy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Lazy.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Lazy.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Lazy -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/LazyFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/LazyFarmer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/LazyFarmer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import javax.inject.Specializes; - - -@Specializes @Lazy -@AnotherDeploymentType -class LazyFarmer extends Farmer -{ - - @Override - public String getClassName() - { - return LazyFarmer.class.getName(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Office.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Office.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Office.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import javax.inject.Specializes; - - - -@AnotherDeploymentType @Specializes -class Office extends Building -{ - - @Override - protected String getClassName() - { - return Office.class.getName(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,86 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches; - -import java.lang.annotation.Annotation; - -import javax.inject.AnnotationLiteral; -import javax.inject.DefinitionException; -import javax.inject.InconsistentSpecializationException; - -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.testng.annotations.Test; - -/** - * Spec version: PRD2 - * - */ -@Artifact -(a)BeansXml(&quot;beans.xml&quot;) -public class SimpleBeanSpecializationTest extends AbstractDeclarativeTest -{ - - private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() - { - }; - - @SuppressWarnings("unchecked") - @Test - @SpecAssertions( { @SpecAssertion(section = "4.3.1", id = "c"), @SpecAssertion(section = "3.2.7", id = "a") }) - public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() - { - assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class); - assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2; - assert annotationSetMatches(getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class); - } - - @Test - @SpecAssertions( { @SpecAssertion(section = "4.3.1", id = "d"), @SpecAssertion(section = "3.2.7", id = "a") }) - public void testSpecializingBeanHasNameOfSpecializedBean() - { - assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class); - assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer"); - } - - @Test - @SpecAssertions( { @SpecAssertion(section = "4.3.1", id = "f"), @SpecAssertion(section = "3.2.7", id = "b") }) - public void testSpecializedBeanNotInstantiated() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - Farmer farmer = getCurrentManager().getInstanceByType(Farmer.class, LANDOWNER_LITERAL); - assert farmer.getClassName().equals(LazyFarmer.class.getName()); - } - - }.run(); - } - - @Test - @SpecAssertion(section = "4.3.1", id = "g") - public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception - { -// deployBeans(Office.class, Building.class); - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - assert getCurrentManager().resolveByType(Waste.class).size() == 1; - assert getCurrentManager().getInstanceByType(Waste.class).getFrom().equals(Office.class.getName()); - } - - }.run(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Waste.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Waste.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Waste.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -class Waste -{ - - private String from; - - public String getFrom() - { - return from; - } - - public Waste(String from) - { - super(); - this.from = from; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Animal.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Animal.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.byname; - -interface Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.byname; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface AnotherDeploymentType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Chunky.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Chunky.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,24 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.byname; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Chunky -{ - - boolean realChunky(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Cod.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Cod.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.byname; - -import javax.annotation.Named; -import javax.inject.Production; - -@Production -@Whitefish -@Chunky(realChunky=true) -@Named("whitefish") -class Cod implements ScottishFish -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Haddock.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Haddock.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.byname; - -import javax.annotation.Named; -import javax.inject.Production; - -@Production -@Named -class Haddock implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,47 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.byname; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -@Artifact -public class InstantiationByNameTest extends AbstractDeclarativeTest -{ - - @Test(groups={"stub", "resolution", "el"}) @SpecAssertion(section="5.10", id = "f") - //TODO Need to find a way to intercept calls to the manager to verify this condition - public void testGetInstanceByNameCalledOncePerDistinctNameInElExpression() - { - assert false; - } - - - @Test(groups = { "resolution", "el" }) - @SpecAssertions({ - @SpecAssertion(section = "5.10", id = "d"), - @SpecAssertion(section = "5.10", id = "c") - }) - public void testGetInstanceByName() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - assert getCurrentManager().resolveByName("nonexistant").size() == 0; - assert getCurrentManager().getInstanceByName("nonexistant") == null; - assert getCurrentManager().getInstanceByName("salmon") instanceof Salmon; - } - - }.run(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Plaice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Plaice.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Plaice.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.byname; - -import javax.annotation.Named; - -@AnotherDeploymentType -@Whitefish -@Named("whitefish") -final class Plaice implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,37 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.byname; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; -import org.testng.annotations.Test; - -/** - * - * Spec version: Public Release Draft 2 - * - */ -@Artifact -(a)BeansXml(&quot;beans.xml&quot;) -public class ResolutionByNameTest extends AbstractDeclarativeTest -{ - - @Test(groups = { "resolution" }) - @SpecAssertion(section = "5.11", id = "c") - public void testOnlyHighestPrecedenceResolved() throws Exception - { - // Both Cod and Plaice are named "whitefish" - Plaice has the highest - // deployment type (AnotherDeploymentType) - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - assert getCurrentManager().resolveByName("whitefish").size() == 1; - assert getCurrentManager().resolveByName("whitefish").iterator().next().getTypes().contains(Plaice.class); - } - - }.run(); - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Salmon.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Salmon.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Salmon.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.byname; - -import javax.annotation.Named; -import javax.inject.Production; - -@Production -@Named -class Salmon implements ScottishFish -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ScottishFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ScottishFish.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ScottishFish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.byname; - - -interface ScottishFish extends Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/SeaBass.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/SeaBass.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.byname; - -import javax.context.RequestScoped; -import javax.inject.Production; - -@Production -@RequestScoped -class SeaBass implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Sole.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Sole.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Sole.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.byname; - -import javax.annotation.Named; -import javax.inject.Production; - -@Production -@Whitefish -@Named("whitefish") -class Sole implements ScottishFish -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Tuna.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Tuna.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.byname; - -import javax.context.RequestScoped; - -@AnotherDeploymentType -@RequestScoped -class Tuna -{ - - public String getName() - { - return "Ophir"; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Whitefish.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/Whitefish.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.byname; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Whitefish -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,69 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.clientProxy; - -import java.io.IOException; - -import javax.inject.manager.Bean; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -@Artifact -public class ClientProxyTest extends AbstractDeclarativeTest -{ - - @Test - @SpecAssertion(section = "5.4", id = "b") - public void testClientProxyUsedForNormalScope() - { - Tuna tuna = getCurrentManager().getInstanceByType(Tuna.class); - assert getCurrentConfiguration().getBeans().isProxy(tuna); - } - - @Test - @SpecAssertion(section = "5.4", id = "a") - public void testClientProxyNotUsedForPseudoScope() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - Bean<Fox> foxBean = getCurrentManager().resolveByType(Fox.class).iterator().next(); - Fox fox = getCurrentManager().getInstance(foxBean); - assert !getCurrentConfiguration().getBeans().isProxy(fox); - } - - }.run(); - } - - @Test(groups="incontainer-ri-broken") - @SpecAssertion(section = "5.4", id = "c") - public void testSimpleWebBeanClientProxyIsSerializable() throws IOException, ClassNotFoundException - { - TunedTuna tuna = getCurrentManager().getInstanceByType(TunedTuna.class); - assert getCurrentConfiguration().getBeans().isProxy(tuna); - byte[] bytes = serialize(tuna); - tuna = (TunedTuna) deserialize(bytes); - assert getCurrentConfiguration().getBeans().isProxy(tuna); - assert tuna.getState().equals("tuned"); - } - - @Test - @SpecAssertion(section = "5.4.2", id = "a") - public void testClientProxyInvocation() - { - Bean<TunedTuna> tunaBean = getCurrentManager().resolveByType(TunedTuna.class).iterator().next(); - TunedTuna tuna = getCurrentManager().getInstance(tunaBean); - assert getCurrentConfiguration().getBeans().isProxy(tuna); - assert tuna.getState().equals("tuned"); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Fox.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Fox.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.clientProxy; - -import javax.context.Dependent; - -@Dependent -class Fox -{ - - public String getName() - { - return "gavin"; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Tuna.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Tuna.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.clientProxy; - -import javax.context.RequestScoped; - -@RequestScoped -class Tuna -{ - - public String getName() - { - return "Ophir"; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/TunedTuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/TunedTuna.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/TunedTuna.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.clientProxy; - -import javax.context.RequestScoped; - -@RequestScoped -class TunedTuna -{ - public String getState() - { - return "tuned"; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/AnotherDeploymentType.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/AnotherDeploymentType.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface AnotherDeploymentType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - - -class BeanWithFinalBoundField_Broken -{ - - /*@Current*/ public final Tuna tuna = null; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - - -class BeanWithStaticBoundField_Broken -{ - - /*@Current*/ public static Tuna tuna; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/DeluxeHenHouse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/DeluxeHenHouse.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/DeluxeHenHouse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - - -public class DeluxeHenHouse extends HenHouse -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/Fox.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/Fox.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - -import javax.context.Dependent; - -@Dependent -class Fox -{ - - public String getName() - { - return "gavin"; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FoxRun.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FoxRun.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FoxRun.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - -import javax.inject.Current; - -class FoxRun -{ - - @Current - public Fox fox; - - @Current - public Fox anotherFox; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/HenHouse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/HenHouse.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/HenHouse.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - -import javax.inject.Current; - -public class HenHouse -{ - - @Current - public Fox fox; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,120 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - -import javax.context.ContextNotActiveException; -import javax.inject.DefinitionException; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -@Artifact -(a)BeansXml(&quot;beans.xml&quot;) -public class InjectionTest extends AbstractDeclarativeTest -{ - - @Test(groups = { "injection", "producerMethod" }) - @SpecAssertion(section = "5.2", id = "aa") - public void testInjectionPerformsBoxingIfNecessary() throws Exception - { - assert getCurrentManager().resolveByType(SpiderNest.class).size() == 1; - SpiderNest spiderNest = getCurrentManager().getInstanceByType(SpiderNest.class); - assert spiderNest.numberOfSpiders != null; - assert spiderNest.numberOfSpiders.equals(4); - } - - @Test(groups = { "injection", "clientProxy" }, expectedExceptions = ContextNotActiveException.class) - @SpecAssertion(section = "5.3", id = "a") - public void testInvokeNormalInjectedWebBeanWhenContextNotActive() - { - assert getCurrentManager().resolveByType(TunaFarm.class).size() == 1; - TunaFarm tunaFarm = getCurrentManager().getInstanceByType(TunaFarm.class); - assert tunaFarm.tuna != null; - getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getRequestContext()); - tunaFarm.tuna.getName(); - } - - @Test(groups = "injection") - @SpecAssertion(section = "5.3", id = "b") - public void testInvokeDependentScopeWhenContextNotActive() - { - assert getCurrentManager().resolveByType(FoxRun.class).size() == 1; - FoxRun foxRun = getCurrentManager().getInstanceByType(FoxRun.class); - assert foxRun.fox.getName().equals("gavin"); - } - - @Test @SpecAssertion(section="4.2", id = "a") - public void testFieldDeclaredInSuperclassInjected() throws Exception - { - - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - DeluxeHenHouse henHouse = getCurrentManager().getInstanceByType(DeluxeHenHouse.class); - assert henHouse.fox != null; - assert henHouse.fox.getName().equals("gavin"); - } - }.run(); - } - - @Test(groups = { "stub", "injection", "webbeansxml" }) - @SpecAssertion(section = "3.8.2", id = "a") - public void testInjectFieldsDeclaredInXml() - { - assert false; - } - - @Test(groups = { "stub", "injection", "webbeansxml" }) - @SpecAssertion(section = "3.8.2", id = "b") - public void testInjectedFieldDeclaredInXmlIgnoresJavaAnnotations() - { - assert false; - } - - @Test(groups = { "stub", "injection", "webbeansxml" }) - @SpecAssertion(section = "3.8.2", id = "c") - public void testInjectedFieldDeclaredInXmlAssumesCurrent() - { - assert false; - } - - @Test(groups = { "stub", "injection", "webbeansxml" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.8.2", id = "d") - public void testNonexistentFieldDefinedInXml() - { - assert false; - } - - @Test(groups = { "stub", "injection", "webbeansxml" }) - @SpecAssertion(section = "3.8.2", id = "e") - public void testInjectFieldsDeclaredInXmlAndJava() - { - assert false; - } - - - @Test(groups = {"injection", "underInvestigation"}) - @SpecAssertion(section = "3.8", id = "aa") - public void testInjectingStaticField() - { - assert getCurrentManager().resolveByType(BeanWithStaticBoundField_Broken.class).size() == 1; - assert getCurrentManager().getInstanceByType(BeanWithStaticBoundField_Broken.class).tuna == null; - } - - @Test(groups = {"injection", "underInvestigation"}) - @SpecAssertion(section = "3.8", id = "ab") - public void testInjectingFinalField() - { - assert getCurrentManager().resolveByType(BeanWithFinalBoundField_Broken.class).size() == 1; - assert getCurrentManager().getInstanceByType(BeanWithFinalBoundField_Broken.class).tuna == null; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/SpiderNest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/SpiderNest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/SpiderNest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - -import javax.inject.Initializer; - -class SpiderNest -{ - - public Integer numberOfSpiders; - - @Initializer - public SpiderNest(Integer numberOfSpiders) - { - this.numberOfSpiders = numberOfSpiders; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/SpiderProducer.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/SpiderProducer.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - -import javax.inject.Produces; - -@AnotherDeploymentType -class SpiderProducer -{ - - @Produces public int getWolfSpiderSize() - { - return 4; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/Tuna.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/Tuna.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - -import javax.context.RequestScoped; - -@AnotherDeploymentType -@RequestScoped -class Tuna -{ - - public String getName() - { - return "Ophir"; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/TunaFarm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/TunaFarm.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/TunaFarm.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - -import javax.inject.Current; -import javax.inject.Production; - -@Production -class TunaFarm -{ - - @SuppressWarnings("unused") - @Current - public Tuna tuna; - - public Tuna notInjectedTuna = new Tuna(); - - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/FishFarmOffice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/FishFarmOffice.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/FishFarmOffice.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.manager; - -import javax.inject.Current; -import javax.inject.manager.Manager; - -class FishFarmOffice -{ - - @Current public Manager manager; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/ManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/ManagerTest.java 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/ManagerTest.java 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,33 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.manager; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -@Artifact -public class ManagerTest extends AbstractDeclarativeTest -{ - @Test(groups={"manager", "injection", "deployment"}) - @SpecAssertion(section="5.7.2", id = "a") - public void testInjectingManager() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - FishFarmOffice fishFarmOffice = getCurrentManager().getInstanceByType(FishFarmOffice.class); - assert fishFarmOffice.manager != null; - } - - }.run(); - - } -} Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/dependent (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/dependent) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/dependent/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/dependent/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/dependent/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.context.dependent"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.context.dependent"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/passivating) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/passivating/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.context.passivating"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.context.passivating"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/beans.xml (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/beans.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,11 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.definition.deployment"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + <test:HornedAnimalDeploymentType /> + <test:NotInheritedDeploymentType /> + <test:InheritedDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/broken (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/broken) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/broken/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/broken/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/broken/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.definition.deployment"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.definition.deployment"> <Deploy> <Production /> </Deploy> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/custom (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/custom) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/custom/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/custom/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/custom/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.definition.deployment.custom"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.definition.deployment.custom"> <Deploy> <Standard /> <test:AnotherDeploymentType /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/beans.xml (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/beans.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,9 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.definition.stereotype"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + <test:HornedAnimalDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements) Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/defintion (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion) Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/beans.xml (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/beans.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.event"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/register/fires1 (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/register/fires1) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/register/fires1/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/register/fires1/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/event/register/fires1/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.event.register.fires1"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.event.register.fires1"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/definition) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.implementation.producer.field.definition"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.producer.field.definition"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/definition (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/definition) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.implementation.producer.method.definition"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.producer.method.definition"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.implementation.simple.lifecycle"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.simple.lifecycle"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/realization (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/realization) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/realization/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/realization/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/realization/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.realization"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.realization"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/beans.xml (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/beans.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendSimpleBean (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendSimpleBean) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendSimpleBean"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendSimpleBean"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.implementsInterfaceAndExtendsNothing"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.implementsInterfaceAndExtendsNothing"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/beans.xml (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/beans.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.producer.indirectOverride"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.producer.indirectOverride"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializesStaticMethod"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.producer.specializingAndSpecializedBeanHaveSameName"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.producer.specializingAndSpecializedBeanHaveSameName"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/beans.xml (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/beans.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.simple"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.names"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names"> <Deploy> <Standard /> <test:AnotherDeploymentType /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1 (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend1"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1"> <Deploy> <Standard /> <test:AnotherDeploymentType /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2 (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend2"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2"> <Deploy> <Standard /> <test:AnotherDeploymentType /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.two"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two"> <Deploy> <Standard /> <test:AnotherDeploymentType /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/byname (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/byname) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/byname/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/byname/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/byname/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.lookup.byname"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.lookup.byname"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/injection) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/injection/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.lookup.injection"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.lookup.injection"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation"> <Deploy> <Standard /> <Production /> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution (from rev 1737, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,5 +1,5 @@ <Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.lookup.typesafe.resolution"> + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.lookup.typesafe.resolution"> <Deploy> <Standard /> <Production /> Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,11 +0,0 @@ -<Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.definition.deployment"> - <Deploy> - <Standard /> - <Production /> - <test:AnotherDeploymentType /> - <test:HornedAnimalDeploymentType /> - <test:NotInheritedDeploymentType /> - <test:InheritedDeploymentType /> - </Deploy> -</Beans> Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,9 +0,0 @@ -<Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.definition.stereotype"> - <Deploy> - <Standard /> - <Production /> - <test:AnotherDeploymentType /> - <test:HornedAnimalDeploymentType /> - </Deploy> -</Beans> Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -<Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.event"> - <Deploy> - <Standard /> - <Production /> - <test:AnotherDeploymentType /> - </Deploy> -</Beans> Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -<Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise"> - <Deploy> - <Standard /> - <Production /> - <test:AnotherDeploymentType /> - </Deploy> -</Beans> Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -<Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method"> - <Deploy> - <Standard /> - <Production /> - <test:AnotherDeploymentType /> - </Deploy> -</Beans> Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/beans.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/beans.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -1,8 +0,0 @@ -<Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.simple"> - <Deploy> - <Standard /> - <Production /> - <test:AnotherDeploymentType /> - </Deploy> -</Beans> Modified: tck/trunk/impl/src/main/resources/tck-tests.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-tests.xml 2009-02-27 16:11:09 UTC (rev 1737) +++ tck/trunk/impl/src/main/resources/tck-tests.xml 2009-02-27 16:54:09 UTC (rev 1738) @@ -19,8 +19,7 @@ </run> </groups> <packages> - <package name="org.jboss.jsr299.tck.unit" /> - <package name="org.jboss.jsr299.tck.integration" /> + <package name="org.jboss.jsr299.tck.tests" /> </packages> </test>